From a0e26c22656110a79768fe24fe4e0aa3b3ed3a57 Mon Sep 17 00:00:00 2001 From: tradke Date: Mon, 28 Aug 2006 15:23:48 +0000 Subject: Check for lam_config.h in ${LAM_INC_DIR} if it is set. git-svn-id: http://svn.cactuscode.org/flesh/trunk@4366 17b73243-c579-4c4c-a9d2-2d5706c11dac --- lib/make/extras/MPI/LAM | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/make/extras/MPI/LAM b/lib/make/extras/MPI/LAM index ebf57fc4..2c28c315 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.13 2006-07-29 11:43:24 swhite Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/LAM,v 1.14 2006-08-28 15:23:48 tradke Exp $ # @@*/ echo ' LAM selected' @@ -89,7 +89,11 @@ else fi # if a LAM config header file exists, extract possible device libs and libdirs - lam_config_file="$LAM_DIR/include/lam_config.h" + if test -n "$LAM_INC_DIR"; then + lam_config_file="$LAM_INC_DIR/lam_config.h" + else + lam_config_file="$LAM_DIR/include/lam_config.h" + fi if test -r "$lam_config_file" ; then base_lib_list=`grep WRAPPER_EXTRA_LIBS $lam_config_file | perl -ne 's/WRAPPER_EXTRA_LIBS\s+"(.+)"/\1/; print'` base_libdir_list=`grep WRAPPER_EXTRA_LDFLAGS $lam_config_file | perl -ne 's/WRAPPER_EXTRA_LDFLAGS\s+"(.+)"/\1/; print'` -- cgit v1.2.3