Changeset 28576

Show
Ignore:
Timestamp:
31.10.2013 20:23:32 (6 years ago)
Author:
ak19
Message:

Apache-httpd on Mac Lion (and possible android systems where gnome-lib compiles up libiconv) is dependent on the libiconv dll located in the gnome-lib/OS/lib folder, so in such a case, we need to set up the (DY)LD_LIB_PATH environment before trying to stop or start the webserver.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/gsicontrol.sh

    r27521 r28576  
    366366# remove any extraneous double quotes 
    367367configfile=${configfile//\"/} 
     368 
     369# if there's a libiconv.dylib in gnome-lib-mimimal's lib folder, then apache-httpd would have been compiled dependent on it 
     370# in such a case, need to add it to the (DY)LD_LIBRARY_PATH. This happens with Mac Lion, may happen with andropid. 
     371if [ -f $GSDLHOME/ext/gnome-lib-minimal/$GSDLOS/lib/libiconv.dylib ] || [ -f $GSDLHOME/ext/gnome-lib/$GSDLOS/lib/libiconv.dylib ] ; then 
     372    if [ $GSDLOS = "darwin" ] ; then 
     373    DYLD_LIBRARY_PATH=$GSDLHOME/ext/gnome-lib-minimal/$GSDLOS/lib:$DYLD_LIBRARY_PATH 
     374        # DYLD_FALLBACK_LIB_PATH doesn't work with apache-httpd: 
     375    #DYLD_FALLBACK_LIBRARY_PATH=$GSDLHOME/ext/gnome-lib-minimal/$GSDLOS/lib:$DYLD_FALLBACK_LIBRARY_PATH 
     376    elif [ $GSDLOS = "linux" ] ; then 
     377    LD_LIBRARY_PATH=$GSDLHOME/ext/gnome-lib-minimal/$GSDLOS/lib:$LD_LIBRARY_PATH 
     378    fi 
     379fi 
    368380 
    369381case $target in