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

main/trunk/greenstone2/configure.in

@@ -6 +6 @@
 
 PACKAGE=gsdl
-VERSION=2.82-svn
+VERSION=2.x-svn
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
@@ -48 +48 @@
 
 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 z39.50
 dnl
@@ -74 +91 @@
 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
+AC_ARG_ENABLE(jdbm, [  --disable-jdbm          Disable JDBM compilation], USE_JDBM=$enableval, USE_JDBM=yes)
+if test $ENABLE_JAVA = "1" -a \( $USE_JDBM = "yes" -o $USE_JDBM = "1" \) ; then
   USE_JDBM=1
   AC_DEFINE(USE_JDBM,[])
@@ -86 +103 @@
 dnl Set use of GDBM (enabled by default)
 dnl
-AC_ARG_ENABLE(gdbm, [  --disable-gdbm        Disable GDBM compilation], USE_GDBM=$enableval, USE_GDBM=yes)
+AC_ARG_ENABLE(gdbm, [  --disable-gdbm          Disable GDBM compilation], USE_GDBM=$enableval, USE_GDBM=yes)
 if test $USE_GDBM = "yes" -o $USE_GDBM = "1" ; then
   USE_GDBM=1
@@ -123 +140 @@
 dnl
 if test -d runtime-src; then
-   AC_ARG_ENABLE(apache-httpd, [  --enable-apache-httpd  Enable Apache httpd support], USE_APACHE_HTTPD=$enableval, USE_APACHE_HTTPD=no)
+   AC_ARG_ENABLE(apache-httpd, [  --enable-apache-httpd   Enable Apache httpd support], USE_APACHE_HTTPD=$enableval, USE_APACHE_HTTPD=no)
    if test $USE_APACHE_HTTPD = "yes" -o $USE_APACHE_HTTPD = "1" ; then
      USE_APACHE_HTTPD=1
@@ -136 +153 @@
 dnl Set compilation of JNI parts of MG and MGPP indexers (disabled by default, which is GS2's default behaviour)
 dnl
-AC_ARG_ENABLE(jni, [  --enable-jni    Enable JNI compilation], ENABLE_JNI=$enableval, ENABLE_JNI=no)
-if test $ENABLE_JNI = "yes" -o $ENABLE_JNI = "1" ; then
+AC_ARG_ENABLE(jni, [  --enable-jni            Enable JNI compilation], ENABLE_JNI=$enableval, ENABLE_JNI=no)
+if test $ENABLE_JAVA = "1" -a \( $ENABLE_JNI = "yes" -o $ENABLE_JNI = "1" \) ; then
   ENABLE_JNI=1
   AC_DEFINE(ENABLE_JNI,[])
@@ -148 +165 @@
 dnl Set compilation of MG (enabled by default)
 dnl
-AC_ARG_ENABLE(mg, [  --disable-mg    Disable MG compilation], ENABLE_MG=$enableval, ENABLE_MG=yes)
+AC_ARG_ENABLE(mg, [  --disable-mg            Disable MG compilation], ENABLE_MG=$enableval, ENABLE_MG=yes)
 if test $ENABLE_MG = "yes" -o $ENABLE_MG = "1" ; then
   ENABLE_MG=1
@@ -161 +178 @@
 dnl Set compilation of MGPP (enabled by default)
 dnl
-AC_ARG_ENABLE(mgpp, [  --disable-mgpp        Disable MGPP compilation], ENABLE_MGPP=$enableval, ENABLE_MGPP=yes)
+AC_ARG_ENABLE(mgpp, [  --disable-mgpp          Disable MGPP compilation], ENABLE_MGPP=$enableval, ENABLE_MGPP=yes)
 if test $ENABLE_MGPP = "yes" -o $ENABLE_MGPP = "1" ; then
   ENABLE_MGPP=1
@@ -174 +191 @@
 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,[])