This commit is contained in:
Vítor Santos Costa 2013-10-30 23:08:27 +00:00
parent 3bbc867611
commit 4b64eafc3d
1 changed files with 9 additions and 4 deletions

13
configure vendored
View File

@ -7630,9 +7630,9 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
ENABLE_JPL=""
if test "$yap_cv_java" != "yes"; then
JAVA_HOME=$yap_cv_java
JAVAPREFIX=$JAVA_HOME/bin
JAVAPREFIX="$JAVA_HOME"/bin
elif test -n "$JAVA_HOME"; then
JAVAPREFIX=$JAVA_HOME/bin
JAVAPREFIX="$JAVA_HOME"/bin
fi
@ -8539,8 +8539,13 @@ else
fi
case "$host_os" in
darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'`
_JINC="$_JTOPDIR/Headers";;
darwin*) _J2TOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'`
if test -d "$_J2TOPDIR/Headers"; then
_JINC="$_J2TOPDIR/Headers"
else
_JINC="$_JTOPDIR/include"
fi
;;
*) _JINC="$_JTOPDIR/include";;
esac
if test -f "$_JINC/jni.h"; then