diff --git a/configure.ac b/configure.ac index b95a85e8..73adc925 100644 --- a/configure.ac +++ b/configure.ac @@ -231,9 +231,11 @@ 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"]) +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' @@ -263,6 +265,7 @@ else AC_MSG_RESULT(no) fi AM_CONDITIONAL([WITH_JNI], [test "x$with_jni" = "xyes"]) +AC_SUBST(BUILDJNILIB) # SIMD is optional AC_ARG_WITH([simd], diff --git a/release/makemacpkg.in b/release/makemacpkg.in index e285e6b2..5f5e2b44 100644 --- a/release/makemacpkg.in +++ b/release/makemacpkg.in @@ -28,6 +28,7 @@ VERSION=@VERSION@ BUILD=@BUILD@ SRCDIR=@srcdir@ BUILDDIR32=@srcdir@/osxx86 +BUILDJNILIB=@BUILDJNILIB@ if [ $# -gt 0 ]; then if [ "$1" = "universal" ]; then UNIVERSAL=1 @@ -118,6 +119,9 @@ install_name_tool -id libturbojpeg.dylib $PKGROOT/usr/lib/libturbojpeg.dylib ln -fs /usr/include/turbojpeg.h $PKGROOT/opt/$PACKAGE_NAME/include/ ln -fs /usr/lib/libturbojpeg.a $PKGROOT/opt/$PACKAGE_NAME/lib/ +if [ $BUILDJNILIB = 1 ]; then + ln -fs libturbojpeg.dylib $PKGROOT/usr/lib/libturbojpeg.jnilib +fi if [ ! -h $PKGROOT/opt/$PACKAGE_NAME/lib32 ]; then ln -fs lib $PKGROOT/opt/$PACKAGE_NAME/lib32 fi