diff options
author | Albert Cheng <acheng@hdfgroup.org> | 2005-09-29 20:00:06 (GMT) |
---|---|---|
committer | Albert Cheng <acheng@hdfgroup.org> | 2005-09-29 20:00:06 (GMT) |
commit | 246fb66cd819d7639fe9d94bfb6a6a542e01d099 (patch) | |
tree | 19b1fcdc871af5eede2b209eae547ab6539626a6 | |
parent | 235ad61cdef961d30b199b0884c28dc2df3bbfaf (diff) | |
download | hdf5-246fb66cd819d7639fe9d94bfb6a6a542e01d099.zip hdf5-246fb66cd819d7639fe9d94bfb6a6a542e01d099.tar.gz hdf5-246fb66cd819d7639fe9d94bfb6a6a542e01d099.tar.bz2 |
[svn-r11482] Purpose:
feature.
Description:
added the recognition of -lmpich as a form of MPI library.
Platforms tested:
v1.7 tested out fine. Folded this to v1.6.
Document:
RELEASE.txt updated.
-rwxr-xr-x | configure | 79 | ||||
-rw-r--r-- | configure.in | 7 | ||||
-rw-r--r-- | release_docs/RELEASE.txt | 2 | ||||
-rw-r--r-- | src/H5config.h.in | 3 |
4 files changed, 88 insertions, 3 deletions
@@ -35091,7 +35091,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 @@ -35133,6 +35133,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 @@ -35206,10 +35207,86 @@ _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 (); +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 48ff7f4..093bc6e 100644 --- a/configure.in +++ b/configure.in @@ -1935,8 +1935,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. diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 7a2a72e..12ad40a 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -162,6 +162,8 @@ Bug Fixes since HDF5-1.6.4 release Configuration ------------- + - Configure can recognize -lmpich as a form of MPI library. -AKC- + 2005/9/28. - Changed default C++ compiler for the IA64 platform from icc to icpc which is the preferred compiler for Intel Compiler version 8. AKC - 2005/09/02 diff --git a/src/H5config.h.in b/src/H5config.h.in index 5ada6e9..763c1b2 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -163,6 +163,9 @@ /* Define to 1 if you have the `mpi' library (-lmpi). */ #undef HAVE_LIBMPI +/* Define to 1 if you have the `mpich' library (-lmpich). */ +#undef HAVE_LIBMPICH + /* Define to 1 if you have the `mpio' library (-lmpio). */ #undef HAVE_LIBMPIO |