Changeset 23620 for main/trunk/greenstone2/gs2-server.sh

Timestamp:

2011-01-20T18:26:36+13:00 (13 years ago)

Author:

ak19

Message:

Implemented Dr Bainbridge and Sam's solution to the libiconv/wvware/gnome/apache problem: apache's lib folder (containing its own libiconv) is no longer set in the DYLD_LIBRARY_PATH exported from GS2's setup.bash, but is now set specifically for the web-server in gs2-server.sh

File:

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

main/trunk/greenstone2/gs2-server.sh

@@ -1 +1 @@
 #!/bin/bash
+
+if test -e 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
+
+
 if [ -z "$serverlang" ]; then
     serverlang=en