Changeset 22058 for main/trunk/greenstone2/runtime-src/src/colservr/Makefile.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/runtime-src/src/colservr/Makefile.in (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/colservr/Makefile.in

@@ -81 +81 @@
 
 
-# Currently not configurable, and always on
-USE_GDBM = 1
+USE_GDBM = @USE_GDBM@
 ifeq ($(USE_GDBM), 1)
 GDBM_DEFINES = -DUSE_GDBM
@@ -92 +91 @@
 
 
-# Currently not configurable, and always on
-USE_JDBM = 1
+USE_JDBM = @USE_JDBM@
 ifeq ($(USE_JDBM), 1)
 JDBM_DEFINES = -DUSE_JDBM