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

Don't set BUILDJNILIB=1 or default JAVA_CFLAGS unless --with-jni is specified

Browse Source
This commit is contained in:
DRC
2011-02-06 15:35:38 +00:00
parent 74ff1aac8e
commit a117c67704
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
configure.ac
View File

@@ -231,30 +231,32 @@ 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"]) AM_CONDITIONAL([WITH_ARITH], [test "x$with_arith_dec" != "xno" -o "x$with_arith_enc" != "xno"])
BUILDJNILIB=0
case $host_os in
darwin*)
DEFAULT_JAVA_CFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers
BUILDJNILIB=1
;;
solaris*)
DEFAULT_JAVA_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'
;;
esac
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(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)])
if test "x$JAVA_CFLAGS" = "x"; then
JAVA_CFLAGS=$DEFAULT_JAVA_CFLAGS
fi
AC_MSG_CHECKING([whether to include JNI wrapper in TurboJPEG/OSS]) AC_MSG_CHECKING([whether to include JNI wrapper in TurboJPEG/OSS])
AC_ARG_WITH([jni], 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
if test "x$with_jni" = "xyes"; then if test "x$with_jni" = "xyes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
case $host_os in
darwin*)
DEFAULT_JAVA_CFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers
BUILDJNILIB=1
;;
solaris*)
DEFAULT_JAVA_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'
;;
esac
if test "x$JAVA_CFLAGS" = "x"; then
JAVA_CFLAGS=$DEFAULT_JAVA_CFLAGS
fi
SAVE_CPPFLAGS=${CPPFLAGS} SAVE_CPPFLAGS=${CPPFLAGS}
CPPFLAGS="${CPPFLAGS} ${JAVA_CFLAGS}" CPPFLAGS="${CPPFLAGS} ${JAVA_CFLAGS}"
AC_CHECK_HEADERS([jni.h], [DUMMY=1], AC_CHECK_HEADERS([jni.h], [DUMMY=1],