"JAVA_CFLAGS"="JNI_CFLAGS"

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@543 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/Makefile.am b/Makefile.am
index 064114c30af45f7cc63ce3c60745f1935047dbc9..e8a84af2e99db147a3664d4727428af210ebde9d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpegl.c turbojpeg.h \
 if WITH_JNI
 
 libturbojpeg_la_SOURCES += turbojpeg-jni.c
-libturbojpeg_la_CFLAGS = ${JAVA_CFLAGS}
+libturbojpeg_la_CFLAGS = ${JNI_CFLAGS}
 TJMAPFILE = turbojpeg-mapfile.jni
 
 else

diff --git a/configure.ac b/configure.ac
index ac877430bc0d36ff1c207f2b9bbcae6b5f9d565f..c3d682953436b482169f6ffe35a9ce267886516a 100644 (file)
--- a/configure.ac
+++ b/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