Changeset 21328 for main/trunk/greenstone2/common-src/indexers/configure

Timestamp:

2009-12-09T21:49:32+13:00 (14 years ago)

Author:

ak19

Message:

Changes to makefiles, configure files, and source code to work with the new configure flags that allow indexers to be individually compiled up by setting each indexer to be enabled or disabled (enable-mg, enable-mgpp, enable-lucene).

File:

• main/trunk/greenstone2/common-src/indexers/configure (modified) (9 diffs)

main/trunk/greenstone2/common-src/indexers/configure

@@ -272 +272 @@
 PACKAGE_BUGREPORT=
 
-ac_unique_file="mgpp/text/MGQuery.cpp"
 ac_subdirs_all="$ac_subdirs_all packages/unac"
-ac_subdirs_all="$ac_subdirs_all mg mgpp"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ENABLE_ACCENTFOLD COMPAT32BITFLAGS JAVAC JAVA uudecode subdirs LIBOBJS LTLIBOBJS'
+ac_subdirs_all="$ac_subdirs_all mg"
+ac_subdirs_all="$ac_subdirs_all mgpp"
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ENABLE_ACCENTFOLD ENABLE_MG ENABLE_MGPP ENABLE_LUCENE COMPAT32BITFLAGS JAVAC JAVA uudecode subdirs LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -786 +786 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-accentfold    Disable Accent Folding support
+  --disable-accentfolding    Disable Accent Folding support
+  --disable-mg        Disable MG compilation
+  --disable-mgpp        Disable MGPP compilation
+  --disable-lucene        Disable Lucene compilation
 
 Optional Packages:
@@ -1242 +1245 @@
 
 
+
+# Check whether --enable-mg or --disable-mg was given.
+if test "${enable_mg+set}" = set; then
+  enableval="$enable_mg"
+  ENABLE_MG=$enableval
+else
+  ENABLE_MG=yes
+fi;
+if test $ENABLE_MG = "yes" -o $ENABLE_MG = "1" ; then
+  ENABLE_MG=1
+  cat >>confdefs.h <<\_ACEOF
+#define ENABLE_MG
+_ACEOF
+
+else
+  ENABLE_MG=0
+fi
+
+
+
+# Check whether --enable-mgpp or --disable-mgpp was given.
+if test "${enable_mgpp+set}" = set; then
+  enableval="$enable_mgpp"
+  ENABLE_MGPP=$enableval
+else
+  ENABLE_MGPP=yes
+fi;
+if test $ENABLE_MGPP = "yes" -o $ENABLE_MGPP = "1" ; then
+  ENABLE_MGPP=1
+  cat >>confdefs.h <<\_ACEOF
+#define ENABLE_MGPP
+_ACEOF
+
+else
+  ENABLE_MGPP=0
+fi
+
+
+# Check whether --enable-lucene or --disable-lucene was given.
+if test "${enable_lucene+set}" = set; then
+  enableval="$enable_lucene"
+  ENABLE_LUCENE=$enableval
+else
+  ENABLE_LUCENE=yes
+fi;
+if test $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" ; then
+  ENABLE_LUCENE=1
+  cat >>confdefs.h <<\_ACEOF
+#define ENABLE_LUCENE
+_ACEOF
+
+else
+  ENABLE_LUCENE=0
+fi
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define COMPAT32BITFLAGS $COMPAT32BITFLAGS
@@ -1348 +1408 @@
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 1350 "configure" */
+/* #line 1410 "configure" */
 public class Test {
 }
@@ -1518 +1578 @@
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 1520: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 1580: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
@@ -1636 +1696 @@
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 1638 "configure" */
+/* #line 1698 "configure" */
 public class Test {
 }
@@ -1673 +1733 @@
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 1675 "configure" */
+/* [#]line 1735 "configure" */
 public class Test {
 public static void main (String args[]) {
@@ -1765 +1825 @@
 
 
-
-subdirs="$subdirs mg mgpp"
-
+if test $ENABLE_MG = 1; then
+if test ! -d mg; then
+echo "***** Folder mg does not exist, cannot ENABLE_MG.";
+exit 1;
+fi
+
+
+subdirs="$subdirs mg"
+
+fi
+
+if test $ENABLE_MGPP = 1; then
+if test ! -d mgpp; then
+echo "***** Folder mgpp does not exist, cannot ENABLE_MGPP.";
+exit 1;
+fi
+
+
+subdirs="$subdirs mgpp"
+
+fi
+
+if test $ENABLE_LUCENE = 1; then
+if test ! -d lucene-gs; then
+echo "***** Folder lucene-gs does not exist, cannot ENABLE_LUCENE.";
+exit 1;
+fi
+fi
 
           ac_config_files="$ac_config_files Makefile"
@@ -2405 +2490 @@
 s,@LIBS@,$LIBS,;t t
 s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
+s,@ENABLE_MG@,$ENABLE_MG,;t t
+s,@ENABLE_MGPP@,$ENABLE_MGPP,;t t
+s,@ENABLE_LUCENE@,$ENABLE_LUCENE,;t t
 s,@COMPAT32BITFLAGS@,$COMPAT32BITFLAGS,;t t
 s,@JAVAC@,$JAVAC,;t t