diff options
author | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-11-24 15:31:28 +0000 |
---|---|---|
committer | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-11-24 15:31:28 +0000 |
commit | 2c7556db01d25ee1c7dde4a8186164e7f607c9a7 (patch) | |
tree | 0b92dfb1e11a03d28229363122cac9473f5024c5 /lib | |
parent | fdd0f2a3e49ca49e4b2d6ecd3214a90b10477112 (diff) |
Do not add standard directories to the include and library paths.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3916 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/make/extras/BLAS/setup.sh | 4 | ||||
-rwxr-xr-x | lib/make/extras/FFTW/setup.sh | 8 | ||||
-rwxr-xr-x | lib/make/extras/HDF5/setup.sh | 1 | ||||
-rwxr-xr-x | lib/make/extras/LAPACK/setup.sh | 4 |
4 files changed, 14 insertions, 3 deletions
diff --git a/lib/make/extras/BLAS/setup.sh b/lib/make/extras/BLAS/setup.sh index 93837aa9..ef81ceb6 100755 --- a/lib/make/extras/BLAS/setup.sh +++ b/lib/make/extras/BLAS/setup.sh @@ -29,6 +29,10 @@ if test "X$choose_blas" = 'Xyes' ; then exit 2 fi echo "Found a BLAS package in $BLAS_DIR" + # don't explicitely add standard include and library search paths + if [ "$BLAS_DIR" = '/usr/lib' -o "$BLAS_DIR" = '/usr/local/lib' ]; then + BLAS_DIR='' + fi elif test "$BLAS_DIR" = 'none'; then # user doesn't want the library path added BLAS_DIR='' diff --git a/lib/make/extras/FFTW/setup.sh b/lib/make/extras/FFTW/setup.sh index 6d2e3dbe..cbc0e751 100755 --- a/lib/make/extras/FFTW/setup.sh +++ b/lib/make/extras/FFTW/setup.sh @@ -40,8 +40,12 @@ else fi # Set the FFTW libs, libdirs and includedirs -FFTW_LIB_DIRS='$(FFTW_DIR)/lib' -FFTW_INC_DIRS='$(FFTW_DIR)/include' + +# don't explicitely add standard include and library search paths +if [ "$FFTW_DIR" != '/usr' -a "$FFTW_DIR" != '/usr/local' ]; then + FFTW_LIB_DIRS="$FFTW_DIR/lib" + FFTW_INC_DIRS="$FFTW_DIR/include" +fi # Write the data out to the header and make files. diff --git a/lib/make/extras/HDF5/setup.sh b/lib/make/extras/HDF5/setup.sh index 173829a2..f34c1a31 100755 --- a/lib/make/extras/HDF5/setup.sh +++ b/lib/make/extras/HDF5/setup.sh @@ -182,7 +182,6 @@ CCTK_WriteLine make.extra.defn "HDF5_LIB_DIRS = $HDF5_LIB_DIRS" CCTK_WriteLine make.extra.defn "HDF5_INC_DIRS = $HDF5_INC_DIRS" CCTK_WriteLine make.extra.defn '' -CCTK_WriteLine make.extra.defn '' CCTK_WriteLine make.extra.defn 'LIBS += $(HDF5_LIBS)' CCTK_WriteLine make.extra.defn 'LIBDIRS += $(HDF5_LIB_DIRS)' diff --git a/lib/make/extras/LAPACK/setup.sh b/lib/make/extras/LAPACK/setup.sh index 52fc6c1b..63af83f9 100755 --- a/lib/make/extras/LAPACK/setup.sh +++ b/lib/make/extras/LAPACK/setup.sh @@ -26,6 +26,10 @@ if test "X$choose_lapack" = "Xyes" ; then exit 2 fi echo " Found a LAPACK package in $LAPACK_DIR" + # don't explicitely add standard include and library search paths + if [ "$LAPACK_DIR" = '/usr/lib' -o "$LAPACK_DIR" = '/usr/local/lib' ]; then + LAPACK_DIR='' + fi elif test "$LAPACK_DIR" = 'none'; then # user doesn't want the library path added LAPACK_DIR='' |