From 4a498a1656a467eafad461c8484e6891d666070b Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 1 Mar 2011 12:30:49 +0000 Subject: [PATCH] move CHECK_MPI out of body of 'if' since CHECK_MPI defines AM_CONDITIONAL --- salome_adm/unix/config_files/check_hdf5.m4 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/salome_adm/unix/config_files/check_hdf5.m4 b/salome_adm/unix/config_files/check_hdf5.m4 index d827d3f73..2df4ab0bf 100644 --- a/salome_adm/unix/config_files/check_hdf5.m4 +++ b/salome_adm/unix/config_files/check_hdf5.m4 @@ -65,22 +65,20 @@ else fi fi -hdf5_parallel=0 +CHECK_MPI if test "x$hdf5_ok" = "xno" then if test -e "$HDF5HOME/include/hdf5.h" then - AC_MSG_NOTICE(Checking if hdf5 is parallel and thus needs mpi...) + AC_MSG_CHECKING(if hdf5 is parallel and thus needs mpi) hdf5_parallel=`grep "#define H5_HAVE_PARALLEL" $HDF5HOME/include/H5pubconf.h | awk '{i=3 ; print $i}'` if test "x$hdf5_parallel" = "x1" then - AC_MSG_RESULT(***** Yes: checking MPI...******) - CHECK_MPI - AC_MSG_RESULT(***** Checking MPI done...******) LOCAL_INCLUDES="-DOMPI_SKIP_MPICXX $MPI_INCLUDES $LOCAL_INCLUDES" + AC_MSG_RESULT(yes) else - AC_MSG_RESULT(No,hdf5 seems serial) + AC_MSG_RESULT(no,hdf5 seems serial) fi else AC_MSG_WARN(File $HDF5HOME/include/hdf5.h not present) -- 2.39.2