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

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

@@ -22 +22 @@
 ENVIRONMENT=""
 
+# GDBM support enabled by default, can switch it off with --disable-jdbm
+USE_GDBM=1
 # JDBM support enabled by default, can switch it off with --disable-jdbm
-ENABLE_JDBM=1
+USE_JDBM=1
 # SQLite support enabled by default, can switch it off with --disable-sqlite
 USE_SQLITE=true
@@ -51 +53 @@
         fi
         ;;
+    --disable-gdbm)
+        USE_GDBM=0
+        ;;
     --disable-jdbm)
-        ENABLE_JDBM=0
+        USE_JDBM=0
         ;;
     --disable-sqlite)
@@ -200 +205 @@
 echo ""
 echo "Configuring GDBM"
-echo ""
-cd "$PACKAGES/gdbm"
-
-echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix=$PACKAGES/gdbm $HOSTTARGETFLAGS $ENVIRONMENT
-
-cd "$PACKAGES/gdbm/gdbm-1.8.3" && \
-CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix=$PACKAGES/gdbm $HOSTTARGETFLAGS $ENVIRONMENT
-
+if test $USE_GDBM  ; 
+then
+    echo ""
+    cd "$PACKAGES/gdbm"
+
+    echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix=$PACKAGES/gdbm $HOSTTARGETFLAGS $ENVIRONMENT
+
+    cd "$PACKAGES/gdbm/gdbm-1.8.3" && \
+    CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix=$PACKAGES/gdbm $HOSTTARGETFLAGS $ENVIRONMENT
+else
+  echo " GDBM support disabled."
+  echo "  add '--enable-gdbm' to the configure command to include GDBM support."
+  echo ""
+fi
 
 # configure JDBM
 echo ""
 echo "Configuring JDBM"
-if test $ENABLE_JDBM  ; 
+if test $USE_JDBM  ; 
 then
   echo ""