Changeset 23356 for main/trunk/greenstone2/common-src/indexers/mgpp/configure.in

Timestamp:

2010-11-29T16:49:14+13:00 (13 years ago)

Author:

sjm84

Message:

Updated several configure scripts and Makefiles to make use of the JAVA, JAVAC and JAVACFLAGS environment variables, also added a --disable-java option to several of the configure scripts

File:

• main/trunk/greenstone2/common-src/indexers/mgpp/configure.in (modified) (2 diffs)

main/trunk/greenstone2/common-src/indexers/mgpp/configure.in

@@ -17 +17 @@
 AC_SUBST(VERSION)
 
+dnl
+dnl Disable all Java compilation
+dnl
+AC_ARG_ENABLE(java, [  --disable-java          Disable Java compilation], ENABLE_JAVA=$enableval, ENABLE_JAVA=yes)
+if test $ENABLE_JAVA = "yes" -o $ENABLE_JAVA = "1" ; then
+  ENABLE_JAVA=1
+  if test "x$JAVA_HOME" != "x" ; then
+    echo "Detected JAVA_HOME is set, however this will not be used during compilation"
+    echo "To control the version of 'javac' and 'java' set environment variables JAVAC"
+    echo "and JAVA respectively"
+    export JAVA_HOME=
+  fi
+else
+  ENABLE_JAVA=0
+fi
+AC_SUBST(ENABLE_JAVA)
 
 AC_MSG_CHECKING(to see if architecture is 64-bit)
@@ -59 +75 @@
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
+if test $ENABLE_JAVA = "1" ; then
+  AC_PROG_JAVA
+  AC_PROG_JAVAC
+fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.