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

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

@@ -81 +81 @@
 endif
 
-# Currently not configurable, and always on
-USE_GDBM = 1
+USE_GDBM = @USE_GDBM@
 ifeq ($(USE_GDBM), 1)
 GDBM_DEFINES = -DUSE_GDBM
@@ -89 +88 @@
 GDBM_DEFINES = 
 GDBM_INCLUDES = 
+endif
+
+USE_JDBM = @USE_JDBM@
+ifeq ($(USE_JDBM), 1)
+JDBM_DEFINES = -DUSE_JDBM
+else
+JDBM_DEFINES = 
 endif
 
@@ -95 +101 @@
 SQLITE_DEFINES = -DUSE_SQLITE
 SQLITE_LIBS = $(COMMON_PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread
+SQL_SOURCES = sqlqueryaction.cpp
+SQL_OBJECTS = sqlqueryaction.o
 else
 SQLITE_DEFINES =
 SQLITE_LIBS = 
-endif
-
-ifeq ($(USE_SQLITE), 1)
-SQL_SOURCES = sqlqueryaction.cpp
-SQL_OBJECTS = sqlqueryaction.o
-else
 SQL_SOURCES =
 SQL_OBJECTS =
@@ -146 +148 @@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
-DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(GDBM_DEFINES) $(SQLITE_DEFINES) $(Z3950_DEFS)
+DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(Z3950_DEFS)
 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \
         -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \