Changeset 22078 for main/trunk/greenstone2/runtime-src/src/recpt

Timestamp:

2010-05-12T20:33:31+12:00 (14 years ago)

Author:

ak19

Message:

1. Missing conditional LIBS or INCLUDES or DIR declaration for when USE_GDBM is switched on. Previously it used to always put these in the includes/libs, not it only does so on USE_GDBM.

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

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

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

@@ -85 +85 @@
 GDBM_DEFINES = -DUSE_GDBM
 GDBM_INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include
+GDBM_LIBS = $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
 else
 GDBM_DEFINES = 
 GDBM_INCLUDES = 
+GDBM_LIBS = 
 endif
 
@@ -155 +157 @@
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
-LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a \
+LIBS = @LIBS@ $(GDBM_LIBS) \
     $(COMMON_PACKAGES_DIR)/expat/lib/libexpat.a \
     $(ACCENTFOLD_LIBS) $(FASTCGI_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)

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

@@ -45 +45 @@
 ENABLE_ACCENTFOLD = 1
 USE_GDBM = 1
+USE_JDBM = 1
 USE_SQLITE = 1
+USE_MSSQL = 0
 ENABLE_MG = 1
 ENABLE_MGPP = 1
@@ -78 +80 @@
 !IF $(USE_GDBM)
 GDBM_DEFINES = -DUSE_GDBM
+GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"
 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
 !ELSE
 GDBM_DEFINES = 
+GDBM_LIBS = 
 GDBM_INCLUDES = 
+!ENDIF
+
+!IF $(USE_JDBM)
+JDBM_DEFINES = -DUSE_JDBM
+!ELSE
+JDBM_DEFINES = 
 !ENDIF
 
@@ -94 +104 @@
 SQL_OBJECTS =
 SQLITE_LIBS = 
+!ENDIF
+
+!IF $(USE_MSSQL)
+MSSQL_DEFINES = -DUSE_MSSQL
+!ELSE
+MSSQL_DEFINES = 
 !ENDIF
 
@@ -142 +158 @@
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
-        -DGSDL_NOCACHE $(GDBM_DEFINES) $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
+        -DGSDL_NOCACHE $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \
+    $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
     $(MG_INCLUDES) $(MGPP_INCLUDES) \
@@ -150 +167 @@
 LDFLAGS = 
 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
-        "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
+       $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
 
 !IF $(GSDL_VC4)