From: Andrew R. <and...@us...> - 2004-06-30 17:43:01
|
Update of /cvsroot/plplot/plplot/cf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13055/cf Modified Files: java.ac Log Message: Add --with-java-home and --with-java-incdir options to configure script to replace env variables JAVA_HOME and JAVA_INCDIR. (Although the latter will still work). Index: java.ac =================================================================== RCS file: /cvsroot/plplot/plplot/cf/java.ac,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- java.ac 29 Jun 2004 14:51:16 -0000 1.9 +++ java.ac 30 Jun 2004 17:42:52 -0000 1.10 @@ -38,11 +38,21 @@ fi +# Check for setting of java-home and java-incdir +PL_ARG_WITH(java-home, [User-specified path to the top directory of the java SDK],[]) +PL_ARG_WITH(java-incdir, [User-specified path to the java header files],[]) + if test "$enable_java" = "yes"; then - # Check usual search path - AC_CHECK_HEADERS([jni.h],[AC_MSG_RESULT(yes);jni_in_system=yes],[AC_MSG_RESULT(no);jni_in_system=no]) - # Check in JAVA_HOME subdirs + if test -n "$with_java_incdir" ; then + JAVAINCDIR=$with_java_incdir + fi + + if test -n "$with_java_home" ; then + JAVA_HOME=$with_java_home + fi + + # Check in with_java_home subdirs AC_MSG_CHECKING([for jni.h (Java Native Interface)]) if test -n "$JAVA_HOME"; then if test -r "$JAVA_HOME/include/jni.h"; then @@ -53,6 +63,10 @@ fi fi + # Check usual search path + AC_CHECK_HEADERS([jni.h],[AC_MSG_RESULT(yes);jni_in_system=yes],[AC_MSG_RESULT(no);jni_in_system=no]) + + # Let's assume if jni.h is in standard search path then we # don't need to look for jni_md.h as well # gcj for one does not have a jni_md.h anyway. |