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

Timestamp:

2016-10-26T18:39:50+13:00 (8 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.

Location:

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

Files:

• Makefile.in (modified) (1 diff)
• win32.mak (modified) (1 diff)

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

@@ -136 +136 @@
 # 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\?//')
 Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(YAZ_LIBS)
 else

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

@@ -129 +129 @@
 Z3950_DEFS = -DUSE_Z3950
 Z3950_INCLUDES = -I$(Z3950_DIR)
-Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib
+Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1.56\lib\yaz.lib
 !ELSE
 Z3950_DEFS =