Add the Globus include dirs to the MPI include path.

Needed for Gordon's code which makes use of the Globus API.


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

1 files changed, 13 insertions, 9 deletions

diff --git a/lib/make/extras/MPI/MPICH b/lib/make/extras/MPI/MPICH
index 59f15989..c0442219 100644
--- a/lib/make/extras/MPI/MPICH
+++ b/lib/make/extras/MPI/MPICH
@@ -6,7 +6,7 @@
 #   @desc 
 #   
 #   @enddesc
-#   @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/MPICH,v 1.13 2001-08-27 16:22:11 tradke Exp $
+#   @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/MPICH,v 1.14 2001-09-13 10:35:40 tradke Exp $
 # @@*/
 
 
@@ -81,23 +81,28 @@ case "$MPICH_DEVICE" in
 
   globus)
 ############################# Globus device ##################################
-# We use the Makefile.mpich to obtain the library paths and libs for Globus.
-# These are already prefixed by -L and -l resp. so we have to get rid of these.
-# The Cactus makefile will add them later again.
+# We use the Makefile.mpich to obtain the include and library paths and libs
+# for Globus. These are already prefixed by -I, -L, and -l resp. so we have to
+# get rid of these. The Cactus makefile will add them later again.
    if test -z "$GLOBUS_LIB_DIR" ; then
      echo "GLOBUS selected, but GLOBUS_LIB_DIR not set !"
      exit 2
    fi
-   if ! test -r "$GLOBUS_LIB_DIR/../etc/Makefile.mpich" ; then
-     echo "No Makefile.mpich found in \$GLOBUS_LIB_DIR/../etc/ !"
+   GLOBUS_MPICH_MAKEFILE="$GLOBUS_LIB_DIR/../etc/Makefile.mpich"
+   if ! test -r "$GLOBUS_MPICH_MAKEFILE" ; then
+     echo "No Makefile \"$GLOBUS_MPICH_MAKEFILE\" found !"
      echo "Did you set GLOBUS_LIB_DIR correctly ?"
      exit 2
    fi
 
-   GLOBUS_LIB_DIRS=`${MAKE-make} -s -f $GLOBUS_LIB_DIR/../etc/Makefile.mpich userlibpath`
+   GLOBUS_INC_DIRS=`${MAKE-make} -s -f $GLOBUS_MPICH_MAKEFILE userincdir`
+   GLOBUS_INC_DIRS=`echo " $GLOBUS_INC_DIRS" | sed -e 's/ -I/ /g'`
+   MPICH_INC_DIRS="$MPICH_INC_DIRS $GLOBUS_INC_DIRS"
+
+   GLOBUS_LIB_DIRS=`${MAKE-make} -s -f $GLOBUS_MPICH_MAKEFILE userlibpath`
    MPICH_DEVICE_LIB_DIR=`echo " $GLOBUS_LIB_DIRS" | sed -e 's/ -L/ /g'`
 
-   GLOBUS_LIBS=`${MAKE-make} -s -f $GLOBUS_LIB_DIR/../etc/Makefile.mpich userlib`
+   GLOBUS_LIBS=`${MAKE-make} -s -f $GLOBUS_MPICH_MAKEFILE userlib`
    MPICH_DEVICE_LIBS=`echo " $GLOBUS_LIBS" | sed -e 's/ -l/ /g'`
    ;;
 
@@ -140,4 +145,3 @@ MPI_VERSION="MPICH_$MPICH_DEVICE"
 MPI_LIBS="$MPICH_LIB $MPICH_DEVICE_LIBS" 
 MPI_LIB_DIRS="$MPICH_DEVICE_LIB_DIR $MPICH_LIB_DIR"
 MPI_INC_DIRS="$MPICH_INC_DIRS"
-