summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2005-09-29 04:57:44 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2005-09-29 04:57:44 (GMT)
commit412fbdfad3dffee714ac19e7beba3135dd33427a (patch)
treedff761b5c8082cbc9877e7fa7be81e40dca5b906
parent6baed67905135dcb3f86b5472a36c7c201e93921 (diff)
downloadhdf5-412fbdfad3dffee714ac19e7beba3135dd33427a.zip
hdf5-412fbdfad3dffee714ac19e7beba3135dd33427a.tar.gz
hdf5-412fbdfad3dffee714ac19e7beba3135dd33427a.tar.bz2
[svn-r11476] Purpose:
feature. Description: added the recognition of -lmpich as a form of MPI library. Platforms tested: Tested in heping. Real test will be in MCR.
-rwxr-xr-xconfigure87
-rw-r--r--configure.in7
2 files changed, 91 insertions, 3 deletions
diff --git a/configure b/configure
index 0fe169d..55b8da2 100755
--- a/configure
+++ b/configure
@@ -48234,7 +48234,7 @@ echo "${ECHO_T}skipped" >&6
echo "${ECHO_T}provided by compiler" >&6
PARALLEL=yes
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -48284,6 +48284,7 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+\
echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
@@ -48365,10 +48366,94 @@ _ACEOF
LIBS="-lmpi $LIBS"
else
+ \
+
+echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
+echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6
+if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmpich $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char MPI_Init ();
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+MPI_Init ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_mpich_MPI_Init=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_mpich_MPI_Init=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
+echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6
+if test $ac_cv_lib_mpich_MPI_Init = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBMPICH 1
+_ACEOF
+
+ LIBS="-lmpich $LIBS"
+
+else
PARALLEL=no
fi
fi
+
+fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
diff --git a/configure.in b/configure.in
index 2e366e9..4af6591 100644
--- a/configure.in
+++ b/configure.in
@@ -2152,8 +2152,11 @@ case "X-$enable_parallel" in
AC_MSG_RESULT([provided by compiler])
PARALLEL=yes
- dnl Try link a simple MPI program. If fail, try again with -lmpi.
- AC_TRY_LINK(, MPI_Init(),, AC_CHECK_LIB(mpi, MPI_Init,, PARALLEL=no))
+ dnl Try link a simple MPI program. If fail, try again with -lmpi and
+ dnl -lmpich.
+ AC_TRY_LINK(, MPI_Init(),, \
+ AC_CHECK_LIB(mpi, MPI_Init,, \
+ AC_CHECK_LIB(mpich, MPI_Init,, PARALLEL=no)))
dnl Then try link a simple MPI-IO program. If fail, try again with
dnl -lmpio.