aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreschnett <eschnett@325d7946-0b50-4e3b-902a-3a8d69fbdfa6>2013-05-08 23:19:13 +0000
committereschnett <eschnett@325d7946-0b50-4e3b-902a-3a8d69fbdfa6>2013-05-08 23:19:13 +0000
commit6ebe51e287af881cd2d62e97d3f3a6083bb34ac6 (patch)
treec00bd99f65e1d82ece18ddd6d5536d19e1bce5d1
parentf80ce934382f0f17d4e73c2ec370dd625517135b (diff)
Don't set FFTW3_*_DIRS when NO_BUILD is used
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/FFTW3/trunk@25 325d7946-0b50-4e3b-902a-3a8d69fbdfa6
-rw-r--r--configure.sh11
1 files changed, 5 insertions, 6 deletions
diff --git a/configure.sh b/configure.sh
index 65fc198..c2825c8 100644
--- a/configure.sh
+++ b/configure.sh
@@ -166,12 +166,11 @@ fi
################################################################################
# Set options
-if [ "${FFTW3_DIR}" = '/usr' -o "${FFTW3_DIR}" = '/usr/local' ]; then
- FFTW3_INC_DIRS=''
- FFTW3_LIB_DIRS=''
-else
- FFTW3_INC_DIRS="${FFTW3_DIR}/include"
- FFTW3_LIB_DIRS="${FFTW3_DIR}/lib"
+if [ "${FFTW3_DIR}" != '/usr' -a "${FFTW3_DIR}" != '/usr/local' -a \
+ "${FFTW3_DIR}" != 'NO_BUILD' ]
+then
+ : ${FFTW3_INC_DIRS="${FFTW3_DIR}/include"}
+ : ${FFTW3_LIB_DIRS="${FFTW3_DIR}/lib"}
fi
: ${FFTW3_LIBS='fftw3'}