Ignore:
Timestamp:
11/29/10 16:49:14 (10 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:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/configure.in

    r22068 r23356  
    88
    99PACKAGE=gsdl
    10 VERSION=2.82-svn
     10VERSION=2.x-svn
    1111AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
    1212AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
     
    7373
    7474dnl
     75dnl Disable all Java compilation
     76dnl
     77AC_ARG_ENABLE(java, [  --disable-java          Disable Java compilation], ENABLE_JAVA=$enableval, ENABLE_JAVA=yes)
     78if test $ENABLE_JAVA = "yes" -o $ENABLE_JAVA = "1" ; then
     79  ENABLE_JAVA=1
     80  if test "x$JAVA_HOME" != "x" ; then
     81    echo "Detected JAVA_HOME is set, however this will not be used during compilation"
     82    echo "To control the version of 'javac' and 'java' set environment variables JAVAC"
     83    echo "and JAVA respectively"
     84    export JAVA_HOME=
     85  fi
     86else
     87  ENABLE_JAVA=0
     88fi
     89AC_SUBST(ENABLE_JAVA)
     90
     91dnl
    7592dnl Set use of JDBM (enabled by default)
    7693dnl
    7794AC_ARG_ENABLE(jdbm, [  --disable-jdbm        Disable JDBM compilation], USE_JDBM=$enableval, USE_JDBM=yes)
    78 if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then
     95if test $ENABLE_JAVA = "1" -a \( $USE_JDBM = "yes" -o $USE_JDBM = "1" \) ; then
    7996  USE_JDBM=1
    8097  AC_DEFINE(USE_JDBM,[])
     
    161178dnl
    162179AC_ARG_ENABLE(lucene, [  --disable-lucene        Disable Lucene compilation], ENABLE_LUCENE=$enableval, ENABLE_LUCENE=yes)
    163 if test $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" ; then
     180if test $ENABLE_JAVA = "1" -a \( $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" \) ; then
    164181  ENABLE_LUCENE=1
    165182  AC_DEFINE(ENABLE_LUCENE,[])
     
    181198AC_PROG_CC
    182199AC_PROG_CXX
     200if test $ENABLE_JAVA = "1" ; then
     201  AC_PROG_JAVAC
     202  AC_PROG_JAVA
     203fi
    183204AC_PROG_AWK
    184205AC_PROG_YACC
     
    461482         src/recpt/Makefile \
    462483         src/oaiservr/Makefile \
    463          src/z3950/Makefile"
     484         src/z3950/Makefile \
     485         src/java/org/nzdl/gsdl/GsdlCollageApplet/Makefile \
     486         src/java/org/nzdl/gsdl/Phind/Makefile"
    464487
    465488AC_OUTPUT(packages/Makefile Makefile $srclist $moduleDirs)
Note: See TracChangeset for help on using the changeset viewer.