Changeset 26707

Timestamp:

2013-01-13T14:49:59+13:00 (11 years ago)

Author:

davidb

Message:

Minor adjustment to JDK test

File:

• main/trunk/greenstone3/src/packages/javagdbm/configure.in (modified) (1 diff)

main/trunk/greenstone3/src/packages/javagdbm/configure.in

@@ -73 +73 @@
 AC_MSG_CHECKING([for the JDK])
 if test "z$JAVA_HOME" != z &&
-   test -d $JAVA_HOME && 
-   (test -d $JAVA_HOME/include || test -d $JAVA_HOME/../Headers)
+   test -d $JAVA_HOME &&
+  (test -d $JAVA_HOME/bin)
+# The following used to be the test, but failed on newer versions of MacOS
+# Cut back to something simpler, and rely on the later tests for JNIINC to confirm
+# files like 'jni.h' can be found
+#   test -d $JAVA_HOME && 
+#   (test -d $JAVA_HOME/include || test -d $JAVA_HOME/../Headers)
 then
     AC_SUBST(JAVA_HOME)