Changeset 22058 for main/trunk/greenstone2/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/configure (modified) (5 diffs)

main/trunk/greenstone2/configure

@@ -312 +312 @@
 ac_subdirs_all="$ac_subdirs_all build-src"
 ac_subdirs_all="$ac_subdirs_all runtime-src"
-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 PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_ACCENTFOLD ENABLE_JDBM USE_SQLITE USE_APACHE_HTTPD ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs 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 PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ USE_JDBM USE_GDBM ENABLE_ACCENTFOLD USE_SQLITE USE_APACHE_HTTPD ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs LTLIBOBJS'
 ac_subst_files=''
 
@@ -859 +859 @@
   --enable-z3950          Enable Z39.50 client support
   --disable-yaz           Disable YAZ compilation
+  --disable-jdbm        Disable JDBM compilation
+  --disable-gdbm        Disable GDBM compilation
   --disable-accentfold    Disable Accent Folding for MGPP
-  --disable-jdbm        Disable JDBM compilation
   --disable-sqlite        Disable SQLite support
   --enable-apache-httpd  Enable Apache httpd support
@@ -1427 +1428 @@
 
 
+# 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
@@ -1442 +1479 @@
 else
   ENABLE_ACCENTFOLD=0
-fi
-
-
-# Check whether --enable-jdbm or --disable-jdbm was given.
-if test "${enable_jdbm+set}" = set; then
-  enableval="$enable_jdbm"
-  ENABLE_JDBM=$enableval
-else
-  ENABLE_JDBM=yes
-fi;
-if test $ENABLE_JDBM = "yes" -o $ENABLE_JDBM = "1" ; then
-  ENABLE_JDBM=1
-  cat >>confdefs.h <<\_ACEOF
-#define ENABLE_JDBM
-_ACEOF
-
-else
-  ENABLE_JDBM=0
 fi
 
@@ -8008 +8027 @@
 s,@USE_Z3950@,$USE_Z3950,;t t
 s,@USE_YAZ@,$USE_YAZ,;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_JDBM@,$ENABLE_JDBM,;t t
 s,@USE_SQLITE@,$USE_SQLITE,;t t
 s,@USE_APACHE_HTTPD@,$USE_APACHE_HTTPD,;t t