diff options
| author | eschnett <eschnett@ba58616d-3abc-4c77-8745-3ba8ad4a582f> | 2014-11-01 00:55:40 +0000 |
|---|---|---|
| committer | eschnett <eschnett@ba58616d-3abc-4c77-8745-3ba8ad4a582f> | 2014-11-01 00:55:40 +0000 |
| commit | 9f4bb29a3c6330f5a1cef2124e55a02c0a12afd9 (patch) | |
| tree | f42ddf0a5242dd755b0ed9de0a19c758115a6f29 | |
| parent | 6da5dad34897af73fa633f83223c954ffd35da71 (diff) | |
Update handling standard include/library paths
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/libjpeg/trunk@43 ba58616d-3abc-4c77-8745-3ba8ad4a582f
| -rwxr-xr-x | configure.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/configure.sh b/configure.sh index d46fbcb..d236c87 100755 --- a/configure.sh +++ b/configure.sh @@ -97,7 +97,7 @@ then # Set locations THORN=libjpeg NAME=jpeg-8c - SRCDIR=$(dirname $0) + SRCDIR="$(dirname $0)" BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} if [ -z "${LIBJPEG_INSTALL_DIR}" ]; then INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} @@ -180,18 +180,15 @@ fi ################################################################################ # Set options -if [ "${LIBJPEG_DIR}" = '/usr' -o "${LIBJPEG_DIR}" = '/usr/local' ]; then - LIBJPEG_INC_DIRS='' - LIBJPEG_LIB_DIRS='' -else - LIBJPEG_INC_DIRS="${LIBJPEG_DIR}/include" - LIBJPEG_LIB_DIRS="${LIBJPEG_DIR}/lib" -fi +LIBJPEG_INC_DIRS="${LIBJPEG_DIR}/include" +LIBJPEG_LIB_DIRS="${LIBJPEG_DIR}/lib" LIBJPEG_LIBS='jpeg' +LIBJPEG_INC_DIRS="$(${CCTK_HOME}/lib/sbin/strip-incdirs.sh ${LIBJPEG_INC_DIRS})" +LIBJPEG_LIB_DIRS="$(${CCTK_HOME}/lib/sbin/strip-libdirs.sh ${LIBJPEG_LIB_DIRS})" + # Pass options to Cactus echo "BEGIN MAKE_DEFINITION" -echo "HAVE_LIBJPEG = 1" echo "LIBJPEG_DIR = ${LIBJPEG_DIR}" echo "LIBJPEG_INC_DIRS = ${LIBJPEG_INC_DIRS}" echo "LIBJPEG_LIB_DIRS = ${LIBJPEG_LIB_DIRS}" |