Changeset 21324 for main/trunk/greenstone2/runtime-src/src/z3950

Timestamp:

2009-12-09T21:41:14+13:00 (14 years ago)

Author:

ak19

Message:

Changes to makefiles, configure files, and source code to work with the new configure flags that allow indexers to be individually compiled up by setting each indexer to be enabled or disabled (enable-mg, enable-mgpp, enable-lucene)

Location:

main/trunk/greenstone2/runtime-src/src/z3950

Files:

• Makefile.in (modified) (3 diffs)
• win32.mak (modified) (4 diffs)

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

@@ -43 +43 @@
 endif
 
+
+ENABLE_MG = @ENABLE_MG@
+ifeq ($(ENABLE_MG), 1)
+MG_INDEXERS_LIBS = $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
+    $(INDEXERS_DIR)/mg/lib/libmglib.a
+else
+MG_INDEXERS_LIBS =
+endif
+
+ENABLE_MGPP = @ENABLE_MGPP@
+ifeq ($(ENABLE_MGPP), 1)
+MGPP_INDEXERS_LIBS = $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
+    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
+MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text 
+else
+MGPP_INDEXERS_LIBS =
+MGPP_INCLUDES =
+endif
+
+
 USE_SQLITE = @USE_SQLITE@
 ifeq ($(USE_SQLITE), 1)
@@ -61 +81 @@
 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
-    -I$(INDEXERS_DIR)/mgpp/text -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/include \
+    $(MGPP_INCLUDES) -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/include \
     -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/client -I$(RUNTIME_PACKAGES_DIR)/d2m
 INSTALL = @INSTALL@
@@ -118 +138 @@
     $(PROTOCOL_DIR)/gsdlprotocol.a \
     $(COLSERVR_DIR)/gsdlcolservr.a \
-    $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
-    $(INDEXERS_DIR)/mg/lib/libmglib.a \
-    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
-    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
+    $(MG_INDEXERS_LIBS) \
+    $(MGPP_INDEXERS_LIBS) \
     $(COMMON_DIR)/src/lib/gsdllib.a
 

main/trunk/greenstone2/runtime-src/src/z3950/win32.mak

@@ -42 +42 @@
 ENABLE_ACCENTFOLD = 1
 USE_SQLITE = 1
+ENABLE_MG = 1
+ENABLE_MGPP = 1
+ENABLE_LUCENE = 1
 
 !IF $(DEBUG)
@@ -69 +72 @@
 !ENDIF
 
-!IF $(USE_SQLITE)
+!IF "$(USE_SQLITE)" == "0"
+SQLITE_LIBS = 
+!ELSE
 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
-!ELSE
-SQLITE_LIBS = 
 !ENDIF
 
+!IF "$(ENABLE_MG)" == "0"
+MG_LIBS =
+!ELSE
+MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
+    "$(INDEXERS_DIR)\mg\lib\libmglib.lib"
+!ENDIF
+
+!IF "$(ENABLE_MGPP)" == "0"
+MGPP_LIBS =
+MGPP_INCLUDES =
+!ELSE
+MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
+    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib"
+MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text"
+!ENDIF
 
 AR = lib
@@ -81 +99 @@
 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
-    -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \
+    $(MGPP_INCLUDES) -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \
     -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \
     -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
@@ -142 +160 @@
     $(PROTOCOL_DIR)\gsdlprotocol.lib \
     $(COLSERVR_DIR)\gsdlcolservr.lib \
-    $(INDEXERS_DIR)\mg/src/text/libmgtext.lib \
-    $(INDEXERS_DIR)\mg/lib/libmglib.lib \
-    $(INDEXERS_DIR)\mgpp/text/libmgpptext.lib \
-    $(INDEXERS_DIR)\mgpp/lib/libmgpplib.lib \
+    $(MG_LIBS) \
+    $(MGPP_LIBS) \
     $(COMMON_DIR)\src\lib\gsdllib.lib