Changeset 22078 for main/trunk/greenstone2/runtime-src/src/z3950/Makefile.in

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/Makefile.in (modified) (3 diffs)

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

@@ -64 +64 @@
 USE_GDBM = @USE_GDBM@
 ifeq ($(USE_GDBM), 1)
+GDBM_LIBS = $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
 GDBM_DEFINES = -DUSE_GDBM
 else
+GDBM_LIBS =
 GDBM_DEFINES = 
 endif
@@ -92 +94 @@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CXXFLAGS@
-DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 
+DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
 GSDLOS = @gsdlos@
 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
@@ -100 +102 @@
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
+LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
     $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \
     $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2