Changeset 20832 for gsdl/trunk/setup.bash

Timestamp:

2009-10-21T16:47:07+13:00 (15 years ago)

Author:

ak19

Message:

Libiconv and libexpat are now compiled up during configure time rather than during Make. Committing files affected with adjustments related to this change, of which setup.bash adds the lib folder in common-src packages (generated by compiling libiconv) to the LD_LIBRARY_PATH for now. The last is probably not necessary since libiconv is generated as a static library (not shared).

File:

• gsdl/trunk/setup.bash (modified) (1 diff)

gsdl/trunk/setup.bash

@@ -248 +248 @@
 
   if test "$GSDLOS" = "linux" ; then
-      LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH"
+      LD_LIBRARY_PATH="$GSDLHOME/common-src/iconv/lib:$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"
+      DYLD_LIBRARY_PATH="$GSDLHOME/common-src/iconv/lib:$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH"
       export DYLD_LIBRARY_PATH
   fi