diff options
| author | eschnett <eschnett@d47fded2-66c1-406f-af09-4fc0800f9c6b> | 2013-05-08 23:19:23 +0000 |
|---|---|---|
| committer | eschnett <eschnett@d47fded2-66c1-406f-af09-4fc0800f9c6b> | 2013-05-08 23:19:23 +0000 |
| commit | 1bb5d081a9c86d4d41ab2a6fe3cb4a9875b75704 (patch) | |
| tree | bf08effe170a1674d788b9db0898620dd4cc3bdd | |
| parent | 21b335ebdcd6854534d3af091d1ef73244e82ab6 (diff) | |
Don't set ZLIB_*_DIRS when NO_BUILD is used
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/zlib/trunk@27 d47fded2-66c1-406f-af09-4fc0800f9c6b
| -rw-r--r-- | configure.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/configure.sh b/configure.sh index 0e811ab..9092d7c 100644 --- a/configure.sh +++ b/configure.sh @@ -170,14 +170,13 @@ fi ################################################################################ # Set options -if [ "${ZLIB_DIR}" = '/usr' -o "${ZLIB_DIR}" = '/usr/local' ]; then - ZLIB_INC_DIRS='' - ZLIB_LIB_DIRS='' -else - ZLIB_INC_DIRS="${ZLIB_DIR}/include" - ZLIB_LIB_DIRS="${ZLIB_DIR}/lib" +if [ "${ZLIB_DIR}" != '/usr' -a "${ZLIB_DIR}" = '/usr/local' -a \ + "${ZLIB_DIR}" != 'NO_BUILD'] +then + : ${ZLIB_INC_DIRS="${ZLIB_DIR}/include"} + : ${ZLIB_LIB_DIRS="${ZLIB_DIR}/lib"} fi -ZLIB_LIBS='z' +: ${ZLIB_LIBS='z'} # Pass options to Cactus echo "BEGIN MAKE_DEFINITION" |