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

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/protocol

Files:

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

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

@@ -33 +33 @@
 COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
 
+ENABLE_MGPP = @ENABLE_MGPP@
+ifeq ($(ENABLE_MGPP), 1)
+MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text
+else
+MGPP_INCLUDES =
+endif
 
 AR = ar
@@ -40 +46 @@
 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \
-    -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text
+    -I$(COLSERVR_DIR) $(MGPP_INCLUDES)
 RANLIB = @RANLIB@
 

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

@@ -38 +38 @@
 DLL = 0
 DLLDEBUG = 0
+ENABLE_MGPP = 1
 
 !IF $(DEBUG)
@@ -59 +60 @@
 !ENDIF
 
+!IF $(ENABLE_MGPP) == "0"
+MGPP_INCLUDES =
+!ELSE
+MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text"
+!ENDIF
 
 AR = lib
@@ -64 +70 @@
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
-INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \
+INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" $(MGPP_INCLUDES) \
      -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm"