diff options
| author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2011-03-31 08:03:26 +0000 |
|---|---|---|
| committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2011-03-31 08:03:26 +0000 |
| commit | 86ebd7288b86a335492911d6a59a117c70205a14 (patch) | |
| tree | 2a979c18cd47929c3e333860d271f7aec0e9ce76 /trunk/configure.ac | |
| parent | a24cfdf1fdd7622a137c56e8b31219cf1477f3d2 (diff) | |
"JAVA_CFLAGS"="JNI_CFLAGS"
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@543 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/configure.ac')
| -rw-r--r-- | trunk/configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/trunk/configure.ac b/trunk/configure.ac index ac87743..c3d6829 100644 --- a/trunk/configure.ac +++ b/trunk/configure.ac @@ -196,7 +196,7 @@ AM_CONDITIONAL([WITH_ARITH_DEC], [test "x$with_arith_dec" != "xno"]) AM_CONDITIONAL([WITH_ARITH], [test "x$with_arith_dec" != "xno" -o "x$with_arith_enc" != "xno"]) -AC_ARG_VAR(JAVA_CFLAGS, [Compiler flags needed to find jni.h (default: -I/System/Library/Frameworks/JavaVM.framework/Headers on OS X, '-I/usr/java/include -I/usr/java/include/solaris' on Solaris, and '-I/usr/java/default/include -I/usr/java/default/include/linux' on Linux)]) +AC_ARG_VAR(JNI_CFLAGS, [Compiler flags needed to find jni.h (default: -I/System/Library/Frameworks/JavaVM.framework/Headers on OS X, '-I/usr/java/include -I/usr/java/include/solaris' on Solaris, and '-I/usr/java/default/include -I/usr/java/default/include/linux' on Linux)]) AC_MSG_CHECKING([whether to include JNI wrapper in TurboJPEG/OSS]) AC_ARG_WITH([jni], @@ -209,26 +209,26 @@ if test "x$with_jni" = "xyes"; then case $host_os in darwin*) - DEFAULT_JAVA_CFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers + DEFAULT_JNI_CFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers BUILDJNILIB=1 ;; solaris*) - DEFAULT_JAVA_CFLAGS='-I/usr/java/include -I/usr/java/include/solaris' + DEFAULT_JNI_CFLAGS='-I/usr/java/include -I/usr/java/include/solaris' ;; linux*) - DEFAULT_JAVA_CFLAGS='-I/usr/java/default/include -I/usr/java/default/include/linux' + DEFAULT_JNI_CFLAGS='-I/usr/java/default/include -I/usr/java/default/include/linux' ;; esac - if test "x$JAVA_CFLAGS" = "x"; then - JAVA_CFLAGS=$DEFAULT_JAVA_CFLAGS + if test "x$JNI_CFLAGS" = "x"; then + JNI_CFLAGS=$DEFAULT_JNI_CFLAGS fi SAVE_CPPFLAGS=${CPPFLAGS} - CPPFLAGS="${CPPFLAGS} ${JAVA_CFLAGS}" + CPPFLAGS="${CPPFLAGS} ${JNI_CFLAGS}" AC_CHECK_HEADERS([jni.h], [DUMMY=1], [AC_MSG_ERROR([Could not find JNI header file])]) CPPFLAGS=${SAVE_CPPFLAGS} - AC_SUBST(JAVA_CFLAGS) + AC_SUBST(JNI_CFLAGS) RPM_CONFIG_ARGS=--with-jni else |