From 884ca4a054de72ac3682c74a32ce22deb268d83b Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@53307013-940b-43fa-b11d-2c2b05dfe90d>
Date: Sat, 1 Nov 2014 00:51:10 +0000
Subject: Update handling standard include/library paths

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/BLAS/trunk@49 53307013-940b-43fa-b11d-2c2b05dfe90d
---
 configure.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.sh b/configure.sh
index 77189c0..6e2d22e 100644
--- a/configure.sh
+++ b/configure.sh
@@ -77,7 +77,7 @@ then
     THORN=BLAS
     NAME=blas-3.4.2
     TARNAME=lapack-3.4.2
-    SRCDIR=$(dirname $0)
+    SRCDIR="$(dirname $0)"
     BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
     if [ -z "${BLAS_INSTALL_DIR}" ]; then
         INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
@@ -184,17 +184,17 @@ fi
 ################################################################################
 
 # Set options
-if [ "${BLAS_DIR}" != '/usr/lib' -a "${BLAS_DIR}" != '/usr/local/lib' -a \
-     "${BLAS_DIR}" != 'NO_BUILD' ]
-then
+if [ "${BLAS_DIR}" != 'NO_BUILD' ]; then
     : ${BLAS_INC_DIRS=}
     : ${BLAS_LIB_DIRS="${BLAS_DIR}"}
 fi
 : ${BLAS_LIBS='blas'}
 
+BLAS_INC_DIRS="$(${CCTK_HOME}/lib/sbin/strip-incdirs.sh ${BLAS_INC_DIRS})"
+BLAS_LIB_DIRS="$(${CCTK_HOME}/lib/sbin/strip-libdirs.sh ${BLAS_LIB_DIRS})"
+
 # Pass options to Cactus
 echo "BEGIN MAKE_DEFINITION"
-echo "HAVE_BLAS     = 1"
 echo "BLAS_DIR      = ${BLAS_DIR}"
 echo "BLAS_INC_DIRS = ${BLAS_INC_DIRS}"
 echo "BLAS_LIB_DIRS = ${BLAS_LIB_DIRS}"
-- 
cgit v1.2.3