Changeset 15503

Timestamp:

2008-05-15T16:03:58+12:00 (16 years ago)

Author:

mdewsnip

Message:

Some fixes to avoid errors when the Z39.50 stuff ISN'T enabled.

File:

• gsdl/trunk/src/z3950/Makefile.in (modified) (3 diffs)

gsdl/trunk/src/z3950/Makefile.in

@@ -40 +40 @@
 USE_Z3950 = @USE_Z3950@
 ifeq ($(USE_Z3950), 1)
-Z3950_INCLUDES = -I$(GSDL_DIR)/packages/yaz/yaz-2.1.4/include -I$(GSDL_DIR)/packages/yaz/yaz-2.1.4/client \
-     -I$(GSDL_DIR)/packages/d2m
-Z3950_LIBS = $(GSDL_DIR)/packages/yaz/lib/libyaz.a $(GSDL_DIR)/packages/d2m/libd2m.a -lxml2
-else
-Z3950_INCLUDES = 
-Z3950_LIBS = 
-endif
-
-
 AR = ar
 CC = @CC@
@@ -58 +49 @@
 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
 INCLUDES = -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
-    -I$(INDEXERS_DIR)/mgpp/text $(Z3950_INCLUDES)
+    -I$(INDEXERS_DIR)/mgpp/text -I$(GSDL_DIR)/packages/yaz/yaz-2.1.4/include \
+    -I$(GSDL_DIR)/packages/yaz/yaz-2.1.4/client -I$(GSDL_DIR)/packages/d2m
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(GSDL_DIR)/packages/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(Z3950_LIBS)
+LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(GSDL_DIR)/packages/expat/lib -lexpat $(ACCENTFOLD_LIBS) \
+    $(GSDL_DIR)/packages/yaz/lib/libyaz.a $(GSDL_DIR)/packages/d2m/libd2m.a -lxml2
 RANLIB = @RANLIB@
 
@@ -147 +140 @@
 depend:
     makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES)
+
+else
+all:
+endif