Show
Ignore:
Timestamp:
27.10.2016 15:51:32 (3 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/packages/yaz/README.gsdl

    r30954 r30961  
    22when acting as a z39.50 client. 
    33 
    4 4. We've moved to Yaz-2.1.56, ak19 
    5 End Oct 2016 
     45. #ifdef RL_MAJOR_VERSION test added 
     527 Oct 2016 
     6 
     7The above tweak is needed because the yaz-client code is written 
     8assuming you are linking against a fairly recent GNU readline (version 6  
     9is what we found on Ubuntu).  When compiling on MacOS, we found  
     10readline was not only the NetBSD version, but it was back at version 4.   
     11Inspection of the readline/readline.h file showed that the 
     12NetBSD version does not even define RL_MAJOR_VERSION, let alone 
     13set it to the value '4'.  This led us to conclude the above 
     14addition of the #ifdef check was sufficient to make it do 
     15the right thing, when compiling, on the various operating systems. 
     16 
     17OLD version of yaz-2.1.56/client/client.c: 
     18#if HAVE_READLINE_READLINE_H 
     19    rl_attempted_completion_function = (rl_completion_func_t*)readline_complete\ 
     20r; 
     21    //rl_attempted_completion_function = (CPPFunction*)readline_completer; 
     22#endif 
     23 
     24 
     25MODIFIED version of yaz-2.1.56/client/client.c: 
     26 
     27#if HAVE_READLINE_READLINE_H 
     28#ifdef RL_VERSION_MAJOR 
     29    rl_attempted_completion_function = (rl_completion_func_t*)readline_complete\ 
     30r; 
     31#else 
     32    rl_attempted_completion_function = (CPPFunction*)readline_completer; 
     33#endif 
     34#endif 
     35 
     36 
     374. We've moved to yaz-2.1.56, ak19 
     3826 Oct 2016 
    639 
    740EXPLANATION: 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.