From 1bb5d081a9c86d4d41ab2a6fe3cb4a9875b75704 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@d47fded2-66c1-406f-af09-4fc0800f9c6b>
Date: Wed, 8 May 2013 23:19:23 +0000
Subject: 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
---
 configure.sh | 13 ++++++-------
 1 file 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"
-- 
cgit v1.2.3