Changeset 28576 for main/trunk/greenstone2/gsicontrol.sh

Timestamp:

2013-10-31T20:23:32+13:00 (10 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.

File:

• main/trunk/greenstone2/gsicontrol.sh (modified) (1 diff)

main/trunk/greenstone2/gsicontrol.sh

@@ -366 +366 @@
 # remove any extraneous double quotes
 configfile=${configfile//\"/}
+
+# if there's a libiconv.dylib in gnome-lib-mimimal's lib folder, then apache-httpd would have been compiled dependent on it
+# in such a case, need to add it to the (DY)LD_LIBRARY_PATH. This happens with Mac Lion, may happen with andropid.
+if [ -f $GSDLHOME/ext/gnome-lib-minimal/$GSDLOS/lib/libiconv.dylib ] || [ -f $GSDLHOME/ext/gnome-lib/$GSDLOS/lib/libiconv.dylib ] ; then
+    if [ $GSDLOS = "darwin" ] ; then
+    DYLD_LIBRARY_PATH=$GSDLHOME/ext/gnome-lib-minimal/$GSDLOS/lib:$DYLD_LIBRARY_PATH
+        # DYLD_FALLBACK_LIB_PATH doesn't work with apache-httpd:
+    #DYLD_FALLBACK_LIBRARY_PATH=$GSDLHOME/ext/gnome-lib-minimal/$GSDLOS/lib:$DYLD_FALLBACK_LIBRARY_PATH
+    elif [ $GSDLOS = "linux" ] ; then
+    LD_LIBRARY_PATH=$GSDLHOME/ext/gnome-lib-minimal/$GSDLOS/lib:$LD_LIBRARY_PATH
+    fi
+fi
 
 case $target in