Changeset 30961 for main/trunk/greenstone2/runtime-src

Timestamp:

2016-10-27T15:51:32+13:00 (7 years ago)

Author:

ak19

Message:

Dr Bainbridge got the new yaz to compile on the Mac Mountain Lion again.

Location:

main/trunk/greenstone2/runtime-src/packages/yaz

Files:

• README.gsdl (modified) (1 diff)
• yaz-2.1.56.tar.gz (modified) ( previous)

main/trunk/greenstone2/runtime-src/packages/yaz/README.gsdl

@@ -2 +2 @@
 when acting as a z39.50 client.
 
-4. We've moved to Yaz-2.1.56, ak19
-End Oct 2016
+5. #ifdef RL_MAJOR_VERSION test added
+27 Oct 2016
+
+The above tweak is needed because the yaz-client code is written
+assuming you are linking against a fairly recent GNU readline (version 6 
+is what we found on Ubuntu).  When compiling on MacOS, we found 
+readline was not only the NetBSD version, but it was back at version 4.  
+Inspection of the readline/readline.h file showed that the
+NetBSD version does not even define RL_MAJOR_VERSION, let alone
+set it to the value '4'.  This led us to conclude the above
+addition of the #ifdef check was sufficient to make it do
+the right thing, when compiling, on the various operating systems.
+
+OLD version of yaz-2.1.56/client/client.c:
+#if HAVE_READLINE_READLINE_H
+    rl_attempted_completion_function = (rl_completion_func_t*)readline_complete\
+r;
+    //rl_attempted_completion_function = (CPPFunction*)readline_completer;
+#endif
+
+
+MODIFIED version of yaz-2.1.56/client/client.c:
+
+#if HAVE_READLINE_READLINE_H
+#ifdef RL_VERSION_MAJOR
+    rl_attempted_completion_function = (rl_completion_func_t*)readline_complete\
+r;
+#else
+    rl_attempted_completion_function = (CPPFunction*)readline_completer;
+#endif
+#endif
+
+
+4. We've moved to yaz-2.1.56, ak19
+26 Oct 2016
 
 EXPLANATION: We've moved to this slightly newer version, the newest in 2.1.* but without changing major version numbers, in order to get a version of yaz that compiles on Macs after changes to make (gnome-lib) libraries statically linked rather than dymamically linked libraries needed for El Capitan.