Changeset 23661 for main/trunk

Timestamp:

2011-02-02T15:36:01+13:00 (13 years ago)

Author:

ak19

Message:

GSIControl.sh also needs to set (DY)LD_LIBRARY_PATH so that the Mac can find the libiconv(2).dylib that apache needs.

File:

• main/trunk/greenstone2/gsicontrol.sh (modified) (2 diffs)

main/trunk/greenstone2/gsicontrol.sh

@@ -3 +3 @@
 testdone=0
 
+# Setup.bash needs to be sourced
+# On MAC, need to tell apache to find and use its own libiconv<num>.dylib
+# If gs2-server.sh is run from GLI, we can't just test for the existence
+# of "apache-httpd", so use the full path (from GSDLHOME) to test it exists
 function test-gsdlhome {
     if [ $testdone == "0" ] ; then
@@ -16 +20 @@
         echo "  GSDLHOME = $GSDLHOME" ;
         echo "  GSDLOS   = $GSDLOS" ; 
+        if test -e "$GSDLHOME/apache-httpd" ; then
+        echo "+Adding in executable path for apache-httpd"
+        PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH
+        export PATH
+        
+        if test "$GSDLOS" = "linux" ; then
+            LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH"
+            export LD_LIBRARY_PATH
+        elif test "$GSDLOS" = "darwin" ; then      
+            DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH"
+            export DYLD_LIBRARY_PATH
+        fi
+        fi
         fi
     testdone=1