Changeset 23663

Timestamp:

2011-02-02T20:29:43+13:00 (13 years ago)

Author:

ak19

Message:

Moved Sam's suggested changes committed with Revision 23660 into gsicontrol.sh so that they are always in effect when the apache web server is run (even if run directly from gsicontrol.sh).

File:

• main/trunk/greenstone2/gs2-server.sh (modified) (1 diff)

main/trunk/greenstone2/gs2-server.sh

@@ -62 +62 @@
   source ./setup.bash
   popd > /dev/null
-fi
-
-# 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
-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