contrib system adapted for BeOS (need to set LIBRARY_PATH and BELIBRARIES)

diff --git a/bootstrap b/bootstrap
index 09304f8b979f09f7d5edee09156688296be0ce35..6fe1f89e0853299a0232e1afdf76828928c2b4ea 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -34,9 +34,14 @@ ACLOCAL_ARGS="-I m4"
 # Check for contrib directory
 if test -d extras/contrib/bin; then
   export PATH=./extras/contrib/bin:$PATH
-  export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
-  export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
   ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
+  if test ".`uname -s`" = ".Darwin"; then
+    export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
+    export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
+  elif test ".`uname -s`" = ".BeOS"; then
+    export LIBRARY_PATH=./extras/contrib/lib:$LIBRARY_PATH
+    export BELIBRARIES=./extras/contrib/lib:$BELIBRARIES
+  fi
 fi
 
 # Check for automake

diff --git a/configure.ac b/configure.ac
index c95380c4ac879afb737d802253276ded06ab46eb..2ace4444930fff5e4db6942a6117b305ff82a4a9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -69,8 +69,6 @@ dnl
 topdir="`pwd`"
 if test -d ${topdir}/extras/contrib/lib; then
   export PATH=${topdir}/extras/contrib/bin:$PATH
-  export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH
-  export DYLD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$DYLD_LIBRARY_PATH
   CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include"
   CPPFLAGS_save="${CPPFLAGS_save} -I${topdir}/extras/contrib/include"
   CFLAGS="${CFLAGS} -I${topdir}/extras/contrib/include"
@@ -87,6 +85,13 @@ if test -d ${topdir}/extras/contrib/lib; then
   LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib"
   with_livedotcom_tree=${topdir}/extras/contrib/src/live
   with_goom_tree=${topdir}/extras/contrib/src/goom
+  if test ".`uname -s`" = ".Darwin"; then
+    export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH
+    export DYLD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$DYLD_LIBRARY_PATH
+  elif test ".`uname -s`" = ".BeOS"; then
+    export LIBRARY_PATH=${topdir}/extras/contrib/lib:$LIBRARY_PATH
+    export BELIBRARIES=${topdir}/extras/contrib/lib:$BELIBRARIES
+  fi
 fi
 
 dnl