Also search in $HOME for a LAM/MPICH/PACX installation.

git-svn-id: http://svn.cactuscode.org/flesh/trunk@3790 17b73243-c579-4c4c-a9d2-2d5706c11dac

3 files changed, 10 insertions, 10 deletions

diff --git a/lib/make/extras/MPI/LAM b/lib/make/extras/MPI/LAM
index b1061f9d..48f01253 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.6 2003-08-29 15:59:38 tradke Exp $
+#   @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/LAM,v 1.7 2004-06-25 16:13:04 tradke Exp $
 # @@*/
 
 echo '  LAM selected'
@@ -21,7 +21,7 @@ if test -z "$LAM_LIB_DIR" -o -z "$LAM_INC_DIR" ; then
       lam_libs='/usr/local/lib/lam'
       lam_includes='/usr/local/include/lam'
     else
-      CCTK_Search LAM_DIR '/usr /usr/local /usr/local/lam /usr/local/packages/lam /usr/local/apps/lam' include/lam_config.h
+      CCTK_Search LAM_DIR "/usr /usr/local /usr/local/lam /usr/local/packages/lam /usr/local/apps/lam $HOME" include/lam_config.h
       if test -z "$LAM_DIR" ; then
         echo '  Unable to locate LAM installation - please set LAM_DIR or {LAM_INC_DIR, LAM_LIB_DIR}'
         exit 2
diff --git a/lib/make/extras/MPI/MPICH b/lib/make/extras/MPI/MPICH
index 8e74471e..85af6f6c 100644
--- a/lib/make/extras/MPI/MPICH
+++ b/lib/make/extras/MPI/MPICH
@@ -6,7 +6,7 @@
 #   @desc
 #            Configuration options for MPI=MPICH
 #   @enddesc
-#   @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/MPICH,v 1.17 2004-05-14 13:58:34 tradke Exp $
+#   @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/MPICH,v 1.18 2004-06-25 16:13:04 tradke Exp $
 # @@*/
 
 
@@ -17,20 +17,20 @@ echo '  MPICH selected'
 # Find the directory.
 if test -z "$MPICH_DIR" ; then
    echo '  MPICH selected but no MPICH_DIR set. Checking some places...'
-   CCTK_Search MPICH_DIR '/usr /usr/local /usr/local/mpich /usr/local/packages/mpich /usr/local/apps/mpich /usr/lib/mpich /usr/local/lib/mpich' include/mpi_errno.h
+   CCTK_Search MPICH_DIR "/usr /usr/local /usr/local/mpich /usr/local/packages/mpich /usr/local/apps/mpich /usr/lib/mpich /usr/local/lib/mpich $HOME" include/mpi_errno.h
    if test -z "$MPICH_DIR" ; then
      if test -n "$MPICH_ARCH" ; then
-       CCTK_Search MPICH_DIR "/usr/local/mpich/$MPICH_ARCH /usr/local/packages/mpich/$MPICH_ARCH /usr/local/apps/mpich/$MPICH_ARCH /usr/lib/mpich/$MPICH_ARCH /usr/local/lib/mpich/$MPICH_ARCH" include/mpi_errno.h
+       CCTK_Search MPICH_DIR "/usr/local/mpich/$MPICH_ARCH /usr/local/packages/mpich/$MPICH_ARCH /usr/local/apps/mpich/$MPICH_ARCH /usr/lib/mpich/$MPICH_ARCH /usr/local/lib/mpich/$MPICH_ARCH $HOME/$MPICH_ARCH" include/mpi_errno.h
        if test -z "$MPICH_DIR" ; then
          if test -n "$MPICH_DEVICE" ; then
-           CCTK_Search MPICH_DIR "/usr/local/mpich/$MPICH_ARCH/$MPICH_DEVICE /usr/local/packages/mpich/$MPICH_ARCH/$MPICH_DEVICE /usr/local/apps/mpich/$MPICH_ARCH/$MPICH_DEVICE /usr/lib/mpich/$MPICH_ARCH/$MPICH_DEVICE /usr/local/lib/mpich/$MPICH_ARCH/$MPICH_DEVICE" include/mpi_errno.h
+           CCTK_Search MPICH_DIR "/usr/local/mpich/$MPICH_ARCH/$MPICH_DEVICE /usr/local/packages/mpich/$MPICH_ARCH/$MPICH_DEVICE /usr/local/apps/mpich/$MPICH_ARCH/$MPICH_DEVICE /usr/lib/mpich/$MPICH_ARCH/$MPICH_DEVICE /usr/local/lib/mpich/$MPICH_ARCH/$MPICH_DEVICE $HOME/$MPICH_ARCH/$MPICH_DEVICE" include/mpi_errno.h
            if test -z "$MPICH_DIR" ; then
-             CCTK_Search MPICH_DIR "/usr/local/mpich/$MPICH_DEVICE /usr/local/packages/mpich/$MPICH_DEVICE /usr/local/apps/mpich/$MPICH_DEVICE /usr/lib/mpich/$MPICH_DEVICE /usr/local/lib/mpich/$MPICH_DEVICE" include/mpi_errno.h
+             CCTK_Search MPICH_DIR "/usr/local/mpich/$MPICH_DEVICE /usr/local/packages/mpich/$MPICH_DEVICE /usr/local/apps/mpich/$MPICH_DEVICE /usr/lib/mpich/$MPICH_DEVICE /usr/local/lib/mpich/$MPICH_DEVICE $HOME/$MPICH_DEVICE" include/mpi_errno.h
            fi
          fi
        fi
      else
-       CCTK_Search MPICH_DIR "/usr/local/mpich/$MPICH_DEVICE /usr/local/packages/mpich/$MPICH_DEVICE /usr/local/apps/mpich/$MPICH_DEVICE /usr/lib/mpich/$MPICH_DEVICE /usr/local/lib/mpich/$MPICH_DEVICE" include/mpi_errno.h
+       CCTK_Search MPICH_DIR "/usr/local/mpich/$MPICH_DEVICE /usr/local/packages/mpich/$MPICH_DEVICE /usr/local/apps/mpich/$MPICH_DEVICE /usr/lib/mpich/$MPICH_DEVICE /usr/local/lib/mpich/$MPICH_DEVICE $HOME/$MPICH_DEVICE" include/mpi_errno.h
 
      fi
    fi
diff --git a/lib/make/extras/MPI/PACX b/lib/make/extras/MPI/PACX
index a95bada5..bfdb09f7 100644
--- a/lib/make/extras/MPI/PACX
+++ b/lib/make/extras/MPI/PACX
@@ -6,7 +6,7 @@
 #   @desc
 #            Configuration options for MPI=PACX
 #   @enddesc
-#   @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/PACX,v 1.2 2003-08-29 15:59:38 tradke Exp $
+#   @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/PACX,v 1.3 2004-06-25 16:13:04 tradke Exp $
 # @@*/
 
 echo '  PACX selected'
@@ -34,7 +34,7 @@ fi
 
 if test -z "$PACX_DIR" ; then
    echo '  PACX selected but no PACX_DIR set. Checking some places...'
-   CCTK_Search PACX_DIR '/usr /usr/local /usr/local/pacx /usr/local/packages/pacx /usr/local/apps/pacx' include/pacx.h
+   CCTK_Search PACX_DIR "/usr /usr/local /usr/local/pacx /usr/local/packages/pacx /usr/local/apps/pacx $HOME" include/pacx.h
    if test -z "$PACX_DIR" ; then
        echo '  Unable to locate the PACX directory - please set PACX_DIR'
        exit 2