Changeset 22078 for main/trunk/greenstone2/runtime-src/src/z3950/win32.mak

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.

File:

• main/trunk/greenstone2/runtime-src/src/z3950/win32.mak (modified) (4 diffs)

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

@@ -41 +41 @@
 DLLDEBUG = 0
 ENABLE_ACCENTFOLD = 1
+USE_GDBM = 1
+USE_JDBM = 1
 USE_SQLITE = 1
+USE_MSSQL = 0
 ENABLE_MG = 1
 ENABLE_MGPP = 1
@@ -72 +75 @@
 !ENDIF
 
+!IF $(USE_GDBM)
+GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \
+    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
+GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"
+GDBM_DEFINES = -DUSE_GDBM
+!ELSE
+GDBM_INCLUDES = 
+GDBM_LIBS = 
+GDBM_DEFINES =
+!ENDIF
+
+!IF $(USE_JDBM)
+JDBM_DEFINES = -DUSE_JDBM
+!ELSE
+JDBM_DEFINES =
+!ENDIF
+
 !IF $(USE_SQLITE)
-SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
+SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib
+SQLITE_DEFINES = -DUSE_SQLITE
 !ELSE
 SQLITE_LIBS = 
+SQLITE_DEFINES =
+!ENDIF
+
+!IF $(USE_MSSQL)
+MSSQL_DEFINES = -DUSE_MSSQL
+!ELSE
+MSSQL_DEFINES =
 !ENDIF
 
@@ -107 +135 @@
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
+    $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \
     $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
@@ -112 +141 @@
     $(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"
+    $(GDBM_INCLUDES)
 LDFLAGS = 
-LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" \
+LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \
         "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \
     $(SQLITE_LIBS)