Show
Ignore:
Timestamp:
20.01.2011 18:26:36 (9 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/gs2-server.sh

    r23603 r23620  
    11#!/bin/bash 
     2 
     3if test -e apache-httpd ; then 
     4  echo "+Adding in executable path for apache-httpd" 
     5  PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH 
     6  export PATH 
     7 
     8  if test "$GSDLOS" = "linux" ; then 
     9      LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH" 
     10      export LD_LIBRARY_PATH 
     11 
     12  elif test "$GSDLOS" = "darwin" ; then 
     13      DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH" 
     14      export DYLD_LIBRARY_PATH 
     15  fi 
     16fi 
     17 
     18 
    219if [ -z "$serverlang" ]; then 
    320    serverlang=en