diff --git a/configure.ac b/configure.ac index 85858230..23c80ee9 100644 --- a/configure.ac +++ b/configure.ac @@ -238,6 +238,7 @@ AC_ARG_WITH([jni], AC_HELP_STRING([--with-jni],[Include JNI wrapper in the TurboJPEG/OSS library])) BUILDJNILIB=0 +RPM_CONFIG_ARGS= if test "x$with_jni" = "xyes"; then AC_MSG_RESULT(yes) @@ -263,11 +264,14 @@ if test "x$with_jni" = "xyes"; then [AC_MSG_ERROR([Could not find JNI header file])]) CPPFLAGS=${SAVE_CPPFLAGS} AC_SUBST(JAVA_CFLAGS) + + RPM_CONFIG_ARGS=--with-jni else AC_MSG_RESULT(no) fi AM_CONDITIONAL([WITH_JNI], [test "x$with_jni" = "xyes"]) AC_SUBST(BUILDJNILIB) +AC_SUBST(RPM_CONFIG_ARGS) # SIMD is optional AC_ARG_WITH([simd], diff --git a/release/libjpeg-turbo.spec.in b/release/libjpeg-turbo.spec.in index e911ad56..a9e04df2 100644 --- a/release/libjpeg-turbo.spec.in +++ b/release/libjpeg-turbo.spec.in @@ -39,7 +39,7 @@ TurboJPEG/IPP. It is faster in some areas but slower in others. #-->%setup -q #-->%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 %install