ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Propagate --with-jni down to RPM SPEC

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@348 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-02-06 15:51:27 +00:00
parent 1421a264e4
commit 1b0c3b01de
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -238,6 +238,7 @@ AC_ARG_WITH([jni],
AC_HELP_STRING([--with-jni],[Include JNI wrapper in the TurboJPEG/OSS library])) AC_HELP_STRING([--with-jni],[Include JNI wrapper in the TurboJPEG/OSS library]))
BUILDJNILIB=0 BUILDJNILIB=0
RPM_CONFIG_ARGS=
if test "x$with_jni" = "xyes"; then if test "x$with_jni" = "xyes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
@@ -263,11 +264,14 @@ if test "x$with_jni" = "xyes"; then
[AC_MSG_ERROR([Could not find JNI header file])]) [AC_MSG_ERROR([Could not find JNI header file])])
CPPFLAGS=${SAVE_CPPFLAGS} CPPFLAGS=${SAVE_CPPFLAGS}
AC_SUBST(JAVA_CFLAGS) AC_SUBST(JAVA_CFLAGS)
RPM_CONFIG_ARGS=--with-jni
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
AM_CONDITIONAL([WITH_JNI], [test "x$with_jni" = "xyes"]) AM_CONDITIONAL([WITH_JNI], [test "x$with_jni" = "xyes"])
AC_SUBST(BUILDJNILIB) AC_SUBST(BUILDJNILIB)
AC_SUBST(RPM_CONFIG_ARGS)
# SIMD is optional # SIMD is optional
AC_ARG_WITH([simd], AC_ARG_WITH([simd],

2
release/libjpeg-turbo.spec.in
View File

@@ -39,7 +39,7 @@ TurboJPEG/IPP. It is faster in some areas but slower in others.
#-->%setup -q #-->%setup -q
#-->%build #-->%build
#-->configure libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man JPEG_LIB_VERSION=@JPEG_LIB_VERSION@ SO_MAJOR_VERSION=@SO_MAJOR_VERSION@ SO_MINOR_VERSION=@SO_MINOR_VERSION@ --with-pic #-->configure libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man JPEG_LIB_VERSION=@JPEG_LIB_VERSION@ SO_MAJOR_VERSION=@SO_MAJOR_VERSION@ SO_MINOR_VERSION=@SO_MINOR_VERSION@ --with-pic @RPM_CONFIG_ARGS@
#-->make DESTDIR=$RPM_BUILD_ROOT libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man #-->make DESTDIR=$RPM_BUILD_ROOT libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man
%install %install