diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-07-23 20:46:58 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-07-23 20:46:58 +0000 |
| commit | d92415fee9c3abb3a81cf1898732241797544c5f (patch) | |
| tree | ea7287ac0c3121fc89bb893575e17b4cb7a3987f /lib/make/extras/MPI | |
| parent | 17d4b583e0f8cffc5a8c5fe7f112a8406a2b27aa (diff) | |
Added a check to see if the pthread library should be added to the globus libraries.
Change GLOBUS_DIR to GLOBUS_LIB_DIR to make it explicit that this is the
directory in which the appropriate globus libraries are.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@774 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/extras/MPI')
| -rw-r--r-- | lib/make/extras/MPI/MPICH | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/make/extras/MPI/MPICH b/lib/make/extras/MPI/MPICH index 3f7faff1..41d99dc7 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.1 1999-07-21 12:25:02 goodale Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/MPICH,v 1.2 1999-07-23 20:46:58 goodale Exp $ # @@*/ @@ -50,11 +50,11 @@ fi case "$MPICH_DEVICE" in globus) - if test -z "$GLOBUS_DIR" ; then - echo "GLOBUS selected, but GLOBUS_DIR not set !" + if test -z "$GLOBUS_LIB_DIR" ; then + echo "GLOBUS selected, but GLOBUS_LIB_DIR not set !" exit 2 fi - MPICH_DEVICE_LIB_DIR="$GLOBUS_DIR" + MPICH_DEVICE_LIB_DIR="$GLOBUS_LIB_DIR" MPICH_DEVICE_LIBS="globus_common globus_dc globus_duct_control \ globus_duct_runtime globus_duroc_bootstrap globus_duroc_control\ globus_duroc_runtime globus_gass_cache globus_gass_client \ @@ -62,6 +62,9 @@ case "$MPICH_DEVICE" in globus_gram_client globus_gram_myjob globus_gss globus_gss_assist \ globus_hbm_client globus_hbm_datacollector globus_mp globus_nexus \ globus_rsl globus_utp lber ldap ldif netperf" + if test -n "`echo $GLOBUS_LIB_DIR | grep -i pthreads`" ; then + MPICH_DEVICE_LIBS="$MPICH_DEVICE_LIBS pthread" + fi ;; *) MPICH_DEVICE_LIB_DIR="" |