diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-02-04 22:16:41 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-02-04 22:16:41 +0000 |
| commit | 063ab496030c0fd07d512e6a575d68f17de14fb6 (patch) | |
| tree | e8e86eab7dbb755d9d75204a7cc39563bf65fdc2 | |
| parent | 9af1aedcdb4c145dd26350161714d35f30d9dc57 (diff) | |
| download | libjpeg-turbo-063ab496030c0fd07d512e6a575d68f17de14fb6.tar.gz | |
Detect jni.h; Provide mechanism for adding include paths necessary to find it; Set intelligent defaults for Linux/Mac/Solaris
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@341 632fc199-4ca6-4c93-a231-07263d6284db
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index aedec6d5..ef4983df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,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} TJMAPFILE = turbojpeg-mapfile.jni else diff --git a/configure.ac b/configure.ac index d558276f..b95a85e8 100644 --- a/configure.ac +++ b/configure.ac @@ -231,11 +231,34 @@ 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"]) +case $host_os in + darwin*) + DEFAULT_JAVA_CFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers + ;; + 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)]) +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_ARG_WITH([jni], AC_HELP_STRING([--with-jni],[Include JNI wrapper in the TurboJPEG/OSS library])) if test "x$with_jni" = "xyes"; then AC_MSG_RESULT(yes) + SAVE_CPPFLAGS=${CPPFLAGS} + CPPFLAGS="${CPPFLAGS} ${JAVA_CFLAGS}" + AC_CHECK_HEADERS([jni.h], [DUMMY=1], + [AC_MSG_ERROR([Could not find JNI header file])]) + CPPFLAGS=${SAVE_CPPFLAGS} + AC_SUBST(JAVA_CFLAGS) else AC_MSG_RESULT(no) fi |