Remove /usr/lib etc. from search paths

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/GSL/trunk@26 9e23cc15-e5c8-4d65-9080-beda90ea645b

1 files changed, 6 insertions, 5 deletions

diff --git a/GSL.sh b/GSL.sh
index 0354017..dc0911a 100644
--- a/GSL.sh
+++ b/GSL.sh
@@ -147,11 +147,12 @@ fi
 
 # Set options
 if [ -x ${GSL_DIR}/bin/gsl-config ]; then
-  if [ "${GSL_DIR}" != '/usr' -a "${GSL_DIR}" != '/usr/local' ]; then
-      GSL_INC_DIRS=`${GSL_DIR}/bin/gsl-config --cflags | sed -e 's/ \+-[^I][^ ]\+//g;s/^ *-[^I][^ ]\+ *//g;s/ \+-I/ /g;s/^ *-I//g'`;
-      GSL_LIB_DIRS=`${GSL_DIR}/bin/gsl-config --libs   | sed -e 's/ \+-[^L][^ ]\+//g;s/^ *-[^L][^ ]\+ *//g;s/ \+-L/ /g;s/^ *-L//g'`;
-  fi
-  GSL_LIBS=`${GSL_DIR}/bin/gsl-config --libs       | sed -e 's/ \+-[^l][^ ]\+//g;s/^ *-[^l][^ ]\+ *//g;s/ \+-l/ /g;s/^ *-l//g'`;
+    # Obtain configuration options from GSL's configuration
+    GSL_INC_DIRS="$(echo '' $(${GSL_DIR}/bin/gsl-config --cflags) '' | sed -e 's/ -I/ /g' | sed -e 's+ -L/include + +g;s+ -L/usr/include + +g;s+ -L/usr/local/include + +g')"
+    # Don't try to split library directories and libraries -- just put
+    # everything into "libraries"
+    GSL_LIB_DIRS=''
+    GSL_LIBS="$(echo '' $(${GSL_DIR}/bin/gsl-config --libs) '' | sed -e 's/ -l/ /g' | sed -e 's+ -L/lib + +g;s+ -L/lib64 + +g;s+ -L/usr/lib + +g;s+ -L/usr/lib64 + +g;s+ -L/usr/local/lib + +g;s+ -L/usr/local/lib64 + +g')"
 fi
 
 # Pass options to Cactus