Changeset 22058 for main/trunk/greenstone2/common-src/configure.in

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/configure.in (modified) (2 diffs)

main/trunk/greenstone2/common-src/configure.in

@@ -73 +73 @@
 AC_SUBST(USE_YAZ)
 
+dnl
+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
+  USE_JDBM=1
+  AC_DEFINE(USE_JDBM,[])
+else
+  USE_JDBM=0
+fi
+AC_SUBST(USE_JDBM)
+
+dnl
+dnl Set use of GDBM (enabled by default)
+dnl
+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
+  AC_DEFINE(USE_GDBM,[])
+else
+  USE_GDBM=0
+fi
+AC_SUBST(USE_GDBM)
+
 dnl 
 dnl disable compilation of accent folding stuff for mgpp (and one day mg)
@@ -85 +109 @@
 AC_SUBST(ENABLE_ACCENTFOLD)
 
-dnl
-dnl Set use of JDBM (enabled by default)
-dnl
-AC_ARG_ENABLE(jdbm, [  --disable-jdbm        Disable JDBM compilation], ENABLE_JDBM=$enableval, ENABLE_JDBM=yes)
-if test $ENABLE_JDBM = "yes" -o $ENABLE_JDBM = "1" ; then
-  ENABLE_JDBM=1
-  AC_DEFINE(ENABLE_JDBM,[])
-else
-  ENABLE_JDBM=0
-fi
-AC_SUBST(ENABLE_JDBM)
 
 dnl