[cig-commits] [commit] baagaard/fix-setup-darwin: Fix generation of setup.sh so that it uses DYLD_LIBRARY_PATH on darwin. (1cd4a9f)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/pylith_installer

On branch  : baagaard/fix-setup-darwin
Link       : https://github.com/geodynamics/pylith_installer/compare/0000000000000000000000000000000000000000...1cd4a9f5191db62d67df5e355597cd59d8dab2fa

>---------------------------------------------------------------

commit 1cd4a9f5191db62d67df5e355597cd59d8dab2fa
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Wed Nov 5 13:10:47 2014 -0800

    Fix generation of setup.sh so that it uses DYLD_LIBRARY_PATH on darwin.


>---------------------------------------------------------------

1cd4a9f5191db62d67df5e355597cd59d8dab2fa
 configure.ac | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 84bd7f8..3a51bca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -744,11 +744,19 @@ else
   echo "export PATH=$prefix/bin:\${PATH}" >> setup.sh
 fi
 
-if test "X${LD_LIBRARY_PATH}" = X ; then
-  echo "export LD_LIBRARY_PATH=$prefix/lib:$prefix/lib64" >> setup.sh
-else
-  echo "export LD_LIBRARY_PATH=$prefix/lib:$prefix/lib64:\${LD_LIBRARY_PATH}" >> setup.sh
-fi
+AC_CANONICAL_HOST
+case $host_os in
+  darwin*)
+    echo "export DYLD_LIBRARY_PATH=$prefix/lib" >> setup.sh
+    ;;
+  *)
+    if test "X${LD_LIBRARY_PATH}" = X ; then
+      echo "export LD_LIBRARY_PATH=$prefix/lib:$prefix/lib64" >> setup.sh
+    else
+      echo "export LD_LIBRARY_PATH=$prefix/lib:$prefix/lib64:\${LD_LIBRARY_PATH}" >> setup.sh
+    fi
+    ;;
+esac
 
 if test "X${PYTHONPATH}" = X ; then
   echo "export PYTHONPATH=$prefix/lib/python$PYTHON_VERSION/site-packages:$prefix/lib64/python$PYTHON_VERSION/site-packages" >> setup.sh