Changeset 23356 for main/trunk/greenstone2/runtime-src/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/runtime-src/configure.in (modified) (5 diffs)

main/trunk/greenstone2/runtime-src/configure.in

@@ -8 +8 @@
 
 PACKAGE=gsdl
-VERSION=2.82-svn
+VERSION=2.x-svn
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
@@ -73 +73 @@
 
 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)
+
+dnl
 dnl Set use of JDBM (enabled by default)
 dnl
 AC_ARG_ENABLE(jdbm, [  --disable-jdbm        Disable JDBM compilation], USE_JDBM=$enableval, USE_JDBM=yes)
-if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then
+if test $ENABLE_JAVA = "1" -a \( $USE_JDBM = "yes" -o $USE_JDBM = "1" \) ; then
   USE_JDBM=1
   AC_DEFINE(USE_JDBM,[])
@@ -161 +178 @@
 dnl
 AC_ARG_ENABLE(lucene, [  --disable-lucene        Disable Lucene compilation], ENABLE_LUCENE=$enableval, ENABLE_LUCENE=yes)
-if test $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" ; then
+if test $ENABLE_JAVA = "1" -a \( $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" \) ; then
   ENABLE_LUCENE=1
   AC_DEFINE(ENABLE_LUCENE,[])
@@ -181 +198 @@
 AC_PROG_CC
 AC_PROG_CXX
+if test $ENABLE_JAVA = "1" ; then
+  AC_PROG_JAVAC
+  AC_PROG_JAVA
+fi
 AC_PROG_AWK
 AC_PROG_YACC
@@ -461 +482 @@
          src/recpt/Makefile \
          src/oaiservr/Makefile \
-         src/z3950/Makefile"
+         src/z3950/Makefile \
+         src/java/org/nzdl/gsdl/GsdlCollageApplet/Makefile \
+         src/java/org/nzdl/gsdl/Phind/Makefile"
 
 AC_OUTPUT(packages/Makefile Makefile $srclist $moduleDirs)