jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Look for Java in "c:\Program Files" on Windows and fixes for spaces in the path for Java installation

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6097 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2004-08-13 21:40:22 +00:00
commit b4c50d1819
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
configure.in
View file

@ -719,7 +719,7 @@ if test -z "$JAVAINCDIR"; then
# Add in default installation directory on Windows for Cygwin # Add in default installation directory on Windows for Cygwin
case $host in case $host in
*-*-cygwin* | *-*-mingw*) JAVAINCDIR="c:/j2sdk*/include d:/j2sdk*/include c:/jdk*/include d:/jdk*/include $JAVAINCDIR";; *-*-cygwin* | *-*-mingw*) JAVAINCDIR="c:/Program*Files/Java/jdk*/include d:/Program*Files/Java/jdk*/include c:/j2sdk*/include d:/j2sdk*/include c:/jdk*/include d:/jdk*/include $JAVAINCDIR";;
*-*-darwin*) JAVAINCDIR="/System/Library/Frameworks/JavaVM.framework/Headers $JAVAINCDIR";; *-*-darwin*) JAVAINCDIR="/System/Library/Frameworks/JavaVM.framework/Headers $JAVAINCDIR";;
*);; *);;
esac esac
@ -727,10 +727,10 @@ fi
JAVAINC="" JAVAINC=""
for d in $JAVAINCDIR ; do for d in $JAVAINCDIR ; do
if test -r $d/jni.h ; then if test -r "$d/jni.h" ; then
AC_MSG_RESULT($d) AC_MSG_RESULT($d)
JAVAINCDIR=$d JAVAINCDIR=$d
JAVAINC="-I$d" JAVAINC=-I\"$d\"
break break
fi fi
done done
@ -740,12 +740,12 @@ if test "$JAVAINC" = "" ; then
else else
# now look for <arch>/jni_md.h # now look for <arch>/jni_md.h
AC_MSG_CHECKING(for java include file jni_md.h) AC_MSG_CHECKING(for java include file jni_md.h)
JAVAMDDIR=`find $JAVAINCDIR -follow -name jni_md.h -print` JAVAMDDIR=`find "$JAVAINCDIR" -follow -name jni_md.h -print`
if test "$JAVAMDDIR" = "" ; then if test "$JAVAMDDIR" = "" ; then
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
else else
JAVAMDDIR=`dirname $JAVAMDDIR` JAVAMDDIR=`dirname "$JAVAMDDIR"`
JAVAINC="${JAVAINC} -I$JAVAMDDIR" JAVAINC="${JAVAINC} -I\"$JAVAMDDIR\""
AC_MSG_RESULT($JAVAMDDIR) AC_MSG_RESULT($JAVAMDDIR)
fi fi
fi fi