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

OS X Tiger requires that JNI libraries have the extension .jnilib, so create a sym link to make it happy

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@343 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-02-05 04:41:36 +00:00
parent 285bbef159
commit 25c58709e3
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -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"]) AM_CONDITIONAL([WITH_ARITH], [test "x$with_arith_dec" != "xno" -o "x$with_arith_enc" != "xno"])
BUILDJNILIB=0
case $host_os in case $host_os in
darwin*) darwin*)
DEFAULT_JAVA_CFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers DEFAULT_JAVA_CFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers
BUILDJNILIB=1
;; ;;
solaris*) solaris*)
DEFAULT_JAVA_CFLAGS='-I/usr/java/include -I/usr/java/include/solaris' DEFAULT_JAVA_CFLAGS='-I/usr/java/include -I/usr/java/include/solaris'
@@ -263,6 +265,7 @@ else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
AM_CONDITIONAL([WITH_JNI], [test "x$with_jni" = "xyes"]) AM_CONDITIONAL([WITH_JNI], [test "x$with_jni" = "xyes"])
AC_SUBST(BUILDJNILIB)
# SIMD is optional # SIMD is optional
AC_ARG_WITH([simd], AC_ARG_WITH([simd],

4
release/makemacpkg.in
View File

@@ -28,6 +28,7 @@ VERSION=@VERSION@
BUILD=@BUILD@ BUILD=@BUILD@
SRCDIR=@srcdir@ SRCDIR=@srcdir@
BUILDDIR32=@srcdir@/osxx86 BUILDDIR32=@srcdir@/osxx86
BUILDJNILIB=@BUILDJNILIB@
if [ $# -gt 0 ]; then if [ $# -gt 0 ]; then
if [ "$1" = "universal" ]; then if [ "$1" = "universal" ]; then
UNIVERSAL=1 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/include/turbojpeg.h $PKGROOT/opt/$PACKAGE_NAME/include/
ln -fs /usr/lib/libturbojpeg.a $PKGROOT/opt/$PACKAGE_NAME/lib/ 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 if [ ! -h $PKGROOT/opt/$PACKAGE_NAME/lib32 ]; then
ln -fs lib $PKGROOT/opt/$PACKAGE_NAME/lib32 ln -fs lib $PKGROOT/opt/$PACKAGE_NAME/lib32
fi fi