autoconf
This commit is contained in:
parent
3bbc867611
commit
4b64eafc3d
13
configure
vendored
13
configure
vendored
@ -7630,9 +7630,9 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
|
|||||||
ENABLE_JPL=""
|
ENABLE_JPL=""
|
||||||
if test "$yap_cv_java" != "yes"; then
|
if test "$yap_cv_java" != "yes"; then
|
||||||
JAVA_HOME=$yap_cv_java
|
JAVA_HOME=$yap_cv_java
|
||||||
JAVAPREFIX=$JAVA_HOME/bin
|
JAVAPREFIX="$JAVA_HOME"/bin
|
||||||
elif test -n "$JAVA_HOME"; then
|
elif test -n "$JAVA_HOME"; then
|
||||||
JAVAPREFIX=$JAVA_HOME/bin
|
JAVAPREFIX="$JAVA_HOME"/bin
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -8539,8 +8539,13 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'`
|
darwin*) _J2TOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'`
|
||||||
_JINC="$_JTOPDIR/Headers";;
|
if test -d "$_J2TOPDIR/Headers"; then
|
||||||
|
_JINC="$_J2TOPDIR/Headers"
|
||||||
|
else
|
||||||
|
_JINC="$_JTOPDIR/include"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
*) _JINC="$_JTOPDIR/include";;
|
*) _JINC="$_JTOPDIR/include";;
|
||||||
esac
|
esac
|
||||||
if test -f "$_JINC/jni.h"; then
|
if test -f "$_JINC/jni.h"; then
|
||||||
|
Reference in New Issue
Block a user