diff options
author | knarf <knarf@9e23cc15-e5c8-4d65-9080-beda90ea645b> | 2011-04-13 14:53:38 +0000 |
---|---|---|
committer | knarf <knarf@9e23cc15-e5c8-4d65-9080-beda90ea645b> | 2011-04-13 14:53:38 +0000 |
commit | 0820423a116a89f291a8a476e35b1291efdf8c83 (patch) | |
tree | e2c78089ffc065f0bbca333d756850e77041c9ae | |
parent | 957d06868d6f093dd3c3bd662b24b1ca975493cd (diff) |
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
-rw-r--r-- | GSL.sh | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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 |