Changeset 21472 for main/trunk/greenstone2/runtime-src/src/colservr/Makefile.in

Timestamp:

2010-01-15T15:16:03+13:00 (14 years ago)

Author:

mdewsnip

Message:

Created USE_GDBM and USE_JDBM defines that work similar to USE_SQLITE and USE_MSSQL for controlling which infodb types are compiled in. Currently these are not configurable through the configure scripts and are always on.

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
+ifeq ($(USE_GDBM), 1)
+GDBM_DEFINES = -DUSE_GDBM
+GDBM_INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include
+else
+GDBM_DEFINES = 
+GDBM_INCLUDES = 
+endif
+
+
+# Currently not configurable, and always on
+USE_JDBM = 1
+ifeq ($(USE_JDBM), 1)
+JDBM_DEFINES = -DUSE_JDBM
+else
+JDBM_DEFINES = 
+endif
+
+
 USE_SQLITE = @USE_SQLITE@
 ifeq ($(USE_SQLITE), 1)
@@ -96 +116 @@
 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
-DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(SQLITE_DEFINES)
+DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
-INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \
+INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \
     $(MG_INCLUDES) \
     $(MGPP_INCLUDES) \
-    -I$(COMMON_PACKAGES_DIR)/expat/include $(SQLITE_INCLUDES)
+    -I$(COMMON_PACKAGES_DIR)/expat/include $(GDBM_INCLUDES) $(SQLITE_INCLUDES)
 RANLIB = @RANLIB@