diff options
| author | eschnett <eschnett@325d7946-0b50-4e3b-902a-3a8d69fbdfa6> | 2014-11-01 00:51:28 +0000 |
|---|---|---|
| committer | eschnett <eschnett@325d7946-0b50-4e3b-902a-3a8d69fbdfa6> | 2014-11-01 00:51:28 +0000 |
| commit | f38aebf8962e76a83bb3348f929654e67a236ac9 (patch) | |
| tree | 3ebd85a493c18056d1f6a49d31917494f2c47d90 | |
| parent | 5521229b1dcbd064dcbe782b76778bc2d47e380a (diff) | |
Update handling standard include/library paths
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/FFTW3/trunk@38 325d7946-0b50-4e3b-902a-3a8d69fbdfa6
| -rw-r--r-- | configure.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.sh b/configure.sh index 2f49d0a..0343a5b 100644 --- a/configure.sh +++ b/configure.sh @@ -99,7 +99,7 @@ then # Set locations THORN=FFTW3 NAME=fftw-3.3.3 - SRCDIR=$(dirname $0) + SRCDIR="$(dirname $0)" BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} if [ -z "${FFTW3_INSTALL_DIR}" ]; then INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} @@ -133,8 +133,8 @@ then cd ${SCRATCH_BUILD} # Set up environment - export LDFLAGS=$(echo $LDFLAGS $(for libdir in $LIBDIRS; do echo '' -L$libdir; done | sed -e 's/ -L-/ -/g')) - export LIBS=$(echo $(for lib in $LIBS; do echo '' -l$lib; done | sed -e 's/ -l-/ -/g')) + export LDFLAGS="$(echo $LDFLAGS $(for libdir in $LIBDIRS; do echo '' -L$libdir; done | sed -e 's/ -L-/ -/g'))" + export LIBS="$(echo $(for lib in $LIBS; do echo '' -l$lib; done | sed -e 's/ -l-/ -/g'))" unset RPATH if echo '' ${ARFLAGS} | grep 64 >/dev/null 2>&1; then export OBJECT_MODE=64 @@ -183,17 +183,17 @@ fi ################################################################################ # Set options -if [ "${FFTW3_DIR}" != '/usr' -a "${FFTW3_DIR}" != '/usr/local' -a \ - "${FFTW3_DIR}" != 'NO_BUILD' ] -then +if [ "${FFTW3_DIR}" != 'NO_BUILD' ]; then : ${FFTW3_INC_DIRS="${FFTW3_DIR}/include"} : ${FFTW3_LIB_DIRS="${FFTW3_DIR}/lib"} fi : ${FFTW3_LIBS='fftw3'} +FFTW3_INC_DIRS="$(${CCTK_HOME}/lib/sbin/strip-incdirs.sh ${FFTW3_INC_DIRS})" +FFTW3_LIB_DIRS="$(${CCTK_HOME}/lib/sbin/strip-libdirs.sh ${FFTW3_LIB_DIRS})" + # Pass options to Cactus echo "BEGIN MAKE_DEFINITION" -echo "HAVE_FFTW3 = 1" echo "FFTW3_DIR = ${FFTW3_DIR}" echo "FFTW3_INC_DIRS = ${FFTW3_INC_DIRS}" echo "FFTW3_LIB_DIRS = ${FFTW3_LIB_DIRS}" |