From c8a75dd80564d3e93a392d6bcedfd41be0080301 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@d47fded2-66c1-406f-af09-4fc0800f9c6b>
Date: Sat, 1 Nov 2014 01:11:43 +0000
Subject: Update handling standard include/library paths

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/zlib/trunk@44 d47fded2-66c1-406f-af09-4fc0800f9c6b
---
 configure.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.sh b/configure.sh
index 80aeec0..775a6fe 100644
--- a/configure.sh
+++ b/configure.sh
@@ -98,7 +98,7 @@ then
     # Set locations
     THORN=zlib
     NAME=zlib-1.2.8
-    SRCDIR=$(dirname $0)
+    SRCDIR="$(dirname $0)"
     BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
     if [ -z "${ZLIB_INSTALL_DIR}" ]; then
         INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
@@ -187,17 +187,17 @@ fi
 ################################################################################
 
 # Set options
-if [ "${ZLIB_DIR}" != '/usr' -a "${ZLIB_DIR}" != '/usr/local' -a        \
-     "${ZLIB_DIR}" != 'NO_BUILD' ]
-then
+if [ "${ZLIB_DIR}" != 'NO_BUILD' ]; then
     : ${ZLIB_INC_DIRS="${ZLIB_DIR}/include"}
     : ${ZLIB_LIB_DIRS="${ZLIB_DIR}/lib"}
 fi
 : ${ZLIB_LIBS='z'}
 
+ZLIB_INC_DIRS="$(${CCTK_HOME}/lib/sbin/strip-incdirs.sh ${ZLIB_INC_DIRS})"
+ZLIB_LIB_DIRS="$(${CCTK_HOME}/lib/sbin/strip-libdirs.sh ${ZLIB_LIB_DIRS})"
+
 # Pass options to Cactus
 echo "BEGIN MAKE_DEFINITION"
-echo "HAVE_ZLIB     = 1"
 echo "ZLIB_DIR      = ${ZLIB_DIR}"
 echo "ZLIB_INC_DIRS = ${ZLIB_INC_DIRS}"
 echo "ZLIB_LIB_DIRS = ${ZLIB_LIB_DIRS}"
-- 
cgit v1.2.3