diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-09-17 14:48:08 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-09-17 14:48:08 +0000 |
| commit | fbc5448aaf10561d160df0d9e969904e1af50287 (patch) | |
| tree | 83cde26a15b8c30232d13b4a9c40a157fa8be76f /lib/make/extras | |
| parent | 8b1c026c557982ece7021bd35be0e50ba6acd61a (diff) | |
Don't set "/usr/include", "/usr/local/include", "/usr/lib", and "/usr/local/lib"
as explicit include/library search paths.
This closes PR Cactus-1846: "/usr/include in include path due to LAM in /usr".
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3864 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/extras')
| -rw-r--r-- | lib/make/extras/MPI/LAM | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/lib/make/extras/MPI/LAM b/lib/make/extras/MPI/LAM index 48f01253..91c97ba9 100644 --- a/lib/make/extras/MPI/LAM +++ b/lib/make/extras/MPI/LAM @@ -6,7 +6,7 @@ # @desc # Configure Cactus to compile with the LAM version of MPI. # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/LAM,v 1.7 2004-06-25 16:13:04 tradke Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/LAM,v 1.8 2004-09-17 14:48:08 tradke Exp $ # @@*/ echo ' LAM selected' @@ -42,16 +42,37 @@ if test -z "$LAM_LIB_DIR" -o -z "$LAM_INC_DIR" ; then lam_cxx_includes="$lam_includes/../mpi2c++" fi fi - LAM_INC_DIR="$lam_includes $lam_cxx_includes" + + # don't explicitely add standard include search paths + if test "$lam_includes" != '/usr/include' -a "$lam_includes" != '/usr/local/include'; then + LAM_INC_DIR="$lam_includes" + fi + if test -n "$lam_cxx_includes"; then + LAM_INC_DIR="$LAM_INC_DIR $lam_cxx_includes" + fi fi # set LAM_LIB_DIR if not already set - : ${lam_libs="$LAM_DIR/lib"} - : ${LAM_LIB_DIR="$lam_libs"} + if test -z "$LAM_LIB_DIR" ; then + lam_libs="$LAM_DIR/lib" + + # don't add standard library search paths + if test "$lam_libs" != '/usr/lib' -a "$lam_libs" != '/usr/local/lib'; then + LAM_LIB_DIR="$lam_libs" + fi + fi - echo " Using \"$LAM_INC_DIR\" as LAM include path" - echo " Using \"$LAM_LIB_DIR\" as LAM library path" + if test -z "$LAM_INC_DIR"; then + echo " Using no explicit LAM include path" + else + echo " Using \"$LAM_INC_DIR\" as LAM include path" + fi + if test -z "$LAM_LIB_DIR"; then + echo " Using no explicit LAM library path" + else + echo " Using \"$LAM_LIB_DIR\" as LAM library path" + fi fi # LAM libs changed in versions newer than 6.4 |