Changeset 23356 for main/trunk/greenstone2/runtime-src/configure.in
- Timestamp:
- 2010-11-29T16:49:14+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/configure.in
r22068 r23356 8 8 9 9 PACKAGE=gsdl 10 VERSION=2. 82-svn10 VERSION=2.x-svn 11 11 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") 12 12 AC_DEFINE_UNQUOTED(VERSION, "$VERSION") … … 73 73 74 74 dnl 75 dnl Disable all Java compilation 76 dnl 77 AC_ARG_ENABLE(java, [ --disable-java Disable Java compilation], ENABLE_JAVA=$enableval, ENABLE_JAVA=yes) 78 if 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 86 else 87 ENABLE_JAVA=0 88 fi 89 AC_SUBST(ENABLE_JAVA) 90 91 dnl 75 92 dnl Set use of JDBM (enabled by default) 76 93 dnl 77 94 AC_ARG_ENABLE(jdbm, [ --disable-jdbm Disable JDBM compilation], USE_JDBM=$enableval, USE_JDBM=yes) 78 if test $ USE_JDBM = "yes" -o $USE_JDBM = "1"; then95 if test $ENABLE_JAVA = "1" -a \( $USE_JDBM = "yes" -o $USE_JDBM = "1" \) ; then 79 96 USE_JDBM=1 80 97 AC_DEFINE(USE_JDBM,[]) … … 161 178 dnl 162 179 AC_ARG_ENABLE(lucene, [ --disable-lucene Disable Lucene compilation], ENABLE_LUCENE=$enableval, ENABLE_LUCENE=yes) 163 if test $ENABLE_ LUCENE = "yes" -o $ENABLE_LUCENE = "1"; then180 if test $ENABLE_JAVA = "1" -a \( $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" \) ; then 164 181 ENABLE_LUCENE=1 165 182 AC_DEFINE(ENABLE_LUCENE,[]) … … 181 198 AC_PROG_CC 182 199 AC_PROG_CXX 200 if test $ENABLE_JAVA = "1" ; then 201 AC_PROG_JAVAC 202 AC_PROG_JAVA 203 fi 183 204 AC_PROG_AWK 184 205 AC_PROG_YACC … … 461 482 src/recpt/Makefile \ 462 483 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" 464 487 465 488 AC_OUTPUT(packages/Makefile Makefile $srclist $moduleDirs)
Note:
See TracChangeset
for help on using the changeset viewer.