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

Timestamp:

2010-05-06T21:23:54+12:00 (14 years ago)

Author:

ak19

Message:

Changes to makefiles to 1. incorporate USE_GDBM and USE_JDBM flags (and USE_SQLITE) in most places so that the DEFINES variable is set at all times. This is necessary to ensure that all classes that contain objects with gdbm and jdbm members are of a consistent size. Else we've had experience with Greenstone crashing with memory errors (to do with the similar ENABLE_indexer flags). 2. ENABLE_JDBM is now USE_JDBM. 3. Not everything works now. It still compiles the default way, but the disable-gdbm flag is causing trouble when compiling argdb in recpt since it uses that.

File:

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

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

@@ -275 +275 @@
 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_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE COMPAT32BITFLAGS JAVAC JAVA uudecode subdirs LIBOBJS LTLIBOBJS'
+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 USE_JDBM USE_GDBM ENABLE_ACCENTFOLD ENABLE_JNI 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-accentfolding    Disable Accent Folding support
+  --disable-jdbm        Disable JDBM compilation
+  --disable-gdbm        Disable GDBM compilation
+  --disable-accentfold    Disable Accent Folding for MGPP
   --enable-jni    Enable JNI compilation
   --disable-mg        Disable MG compilation
@@ -1233 +1235 @@
 
 
-# Check whether --enable-accentfolding or --disable-accentfolding was given.
-if test "${enable_accentfolding+set}" = set; then
-  enableval="$enable_accentfolding"
+
+# Check whether --enable-jdbm or --disable-jdbm was given.
+if test "${enable_jdbm+set}" = set; then
+  enableval="$enable_jdbm"
+  USE_JDBM=$enableval
+else
+  USE_JDBM=yes
+fi;
+if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then
+  USE_JDBM=1
+  cat >>confdefs.h <<\_ACEOF
+#define USE_JDBM
+_ACEOF
+
+else
+  USE_JDBM=0
+fi
+
+
+# Check whether --enable-gdbm or --disable-gdbm was given.
+if test "${enable_gdbm+set}" = set; then
+  enableval="$enable_gdbm"
+  USE_GDBM=$enableval
+else
+  USE_GDBM=yes
+fi;
+if test $USE_GDBM = "yes" -o $USE_GDBM = "1" ; then
+  USE_GDBM=1
+  cat >>confdefs.h <<\_ACEOF
+#define USE_GDBM
+_ACEOF
+
+else
+  USE_GDBM=0
+fi
+
+
+
+# Check whether --enable-accentfold or --disable-accentfold was given.
+if test "${enable_accentfold+set}" = set; then
+  enableval="$enable_accentfold"
+  ENABLE_ACCENTFOLD=$enableval
+else
+  ENABLE_ACCENTFOLD=yes
+fi;
+if test $ENABLE_ACCENTFOLD = "yes" -o $ENABLE_ACCENTFOLD = "1" ; then
+  ENABLE_ACCENTFOLD=1
+  cat >>confdefs.h <<\_ACEOF
+#define ENABLE_ACCENTFOLD
+_ACEOF
+
+else
   ENABLE_ACCENTFOLD=0
-else
-  ENABLE_ACCENTFOLD=1
-fi;
-cat >>confdefs.h <<_ACEOF
-#define ENABLE_ACCENTFOLD $ENABLE_ACCENTFOLD
-_ACEOF
-
+fi
 
 
@@ -1428 +1473 @@
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 1430 "configure" */
+/* #line 1475 "configure" */
 public class Test {
 }
@@ -1598 +1643 @@
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 1600: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 1645: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
@@ -1716 +1761 @@
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 1718 "configure" */
+/* #line 1763 "configure" */
 public class Test {
 }
@@ -1753 +1798 @@
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 1755 "configure" */
+/* [#]line 1800 "configure" */
 public class Test {
 public static void main (String args[]) {
@@ -2509 +2554 @@
 s,@ECHO_T@,$ECHO_T,;t t
 s,@LIBS@,$LIBS,;t t
+s,@USE_JDBM@,$USE_JDBM,;t t
+s,@USE_GDBM@,$USE_GDBM,;t t
 s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
 s,@ENABLE_JNI@,$ENABLE_JNI,;t t