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

Timestamp:

2016-10-26T18:39:50+13:00 (7 years ago)

Author:

ak19

Message:

New yaz 2.1.56 was needed to get GS2 compiling to work again on Macs after going from producing dynamic linked to statically linked gnome-lib libraries. The new yaz finally compiles (see recent and current commits). Tested z3950server (built by configuring with --enable-z3950) against built yaz-client, and tested GLI's use of yaz-client against Library of Congress' z3950 server. It all works. Need to test Windows next.

File:

• main/trunk/greenstone2/runtime-src/src/z3950/Makefile.in (modified) (3 diffs)

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

@@ -105 +105 @@
 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
-    $(MGPP_INCLUDES) -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/include \
-    -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/client -I$(RUNTIME_PACKAGES_DIR)/d2m
+    $(MGPP_INCLUDES) -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.56/include \
+    -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.56/client -I$(RUNTIME_PACKAGES_DIR)/d2m
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@
@@ -112 +112 @@
 # Need LIBS to contain all the dependencies for libyaz that yaz had worked out (from yaz's Makefile)
 # http://stackoverflow.com/questions/2019989/how-to-assign-the-output-of-a-command-to-a-makefile-variable
-YAZ_LIBS = $(shell egrep "^LIBS\s?=" $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/Makefile | sed 's/^LIBS\s\?=\s\?//')
+YAZ_LIBS = $(shell egrep "^LIBS\s?=" $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.56/Makefile | sed 's/^LIBS\s\?=\s\?//')
 LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
     $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \
@@ -182 +182 @@
 gsdlz3950.a: $(LIBRARY_OBJECTS)
     rm -f $(LIBRARY)
-    $(AR) cru $(LIBRARY) $(LIBRARY_OBJECTS) $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o
+    $(AR) cru $(LIBRARY) $(LIBRARY_OBJECTS) $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.56/client/tabcomplete.o
     $(RANLIB) $(LIBRARY)