From 0820423a116a89f291a8a476e35b1291efdf8c83 Mon Sep 17 00:00:00 2001 From: knarf Date: Wed, 13 Apr 2011 14:53:38 +0000 Subject: don't set GSL_LIB_DIRS to /usr/lib git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/GSL/trunk@17 9e23cc15-e5c8-4d65-9080-beda90ea645b --- GSL.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/GSL.sh b/GSL.sh index 6ad488e..ae80640 100644 --- a/GSL.sh +++ b/GSL.sh @@ -133,9 +133,11 @@ fi # Set options if [ -x ${GSL_DIR}/bin/gsl-config ]; 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'`; - GSL_LIBS=`${GSL_DIR}/bin/gsl-config --libs | sed -e 's/ \+-[^l][^ ]\+//g;s/^ *-[^l][^ ]\+ *//g;s/ \+-l/ /g;s/^ *-l//g'`; + 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'`; fi # Pass options to Cactus -- cgit v1.2.3