]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
0021196: [CEA 456] Integration and merge modification for debian packages
authoreap <eap@opencascade.com>
Tue, 1 Mar 2011 12:40:12 +0000 (12:40 +0000)
committereap <eap@opencascade.com>
Tue, 1 Mar 2011 12:40:12 +0000 (12:40 +0000)
  The HDF5 library requires MPI in order to work, so the MPI check needs to go
  first, and the MPI variables need to be in the HDF5 check.

configure.ac
salome_adm/unix/config_files/check_hdf5.m4

index f751526a177e79b7a93b1d70bf14d0f8d3918c6c..99a4114764236ce38a7211872ffeec181d6e260a 100644 (file)
@@ -229,6 +229,14 @@ echo
 
 CHECK_LIBXML
 
+echo
+echo ---------------------------------------------
+echo checking if MPI is requested by user
+echo ---------------------------------------------
+echo
+
+CHECK_MPI
+
 if test x$with_onlylauncher = xno; then
 echo
 echo ---------------------------------------------
@@ -308,14 +316,6 @@ echo testing parallel products
 echo ============================================================
 echo
 
-echo
-echo ---------------------------------------------
-echo checking if MPI is requested by user
-echo ---------------------------------------------
-echo
-
-CHECK_MPI
-
 echo
 echo ---------------------------------------------
 echo checking if PaCO++ is requested by user
index 2df4ab0bf744af32b14932ff62dceb7d7859396f..a5f40547fbdafeadcd55535990cd13b729fd88a5 100644 (file)
@@ -88,7 +88,7 @@ fi
 dnl hdf5 headers
 
 CPPFLAGS_old="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES"
+CPPFLAGS="$CPPFLAGS $MPI_INCLUDES $LOCAL_INCLUDES"
 AC_CHECK_HEADER(hdf5.h,hdf5_ok=yes ,hdf5_ok=no)
 CPPFLAGS="$CPPFLAGS_old"
 
@@ -99,7 +99,7 @@ then
 dnl hdf5 library
 
   LIBS_old="$LIBS"
-  LIBS="$LIBS $LOCAL_LIBS"
+  LIBS="$LIBS $MPI_LIBS $LOCAL_LIBS"
   AC_CHECK_LIB(hdf5,H5open,hdf5_ok=yes,hdf5_ok=no)
   LIBS="$LIBS_old"
 
@@ -107,9 +107,9 @@ fi
 
 if  test "x$hdf5_ok" = "xyes"
 then
-  HDF5_INCLUDES="$LOCAL_INCLUDES"
-  HDF5_LIBS="$LOCAL_LIBS -lhdf5 $LOCAL_RLIBS"
-  HDF5_MT_LIBS="$LOCAL_LIBS -lhdf5 $LOCAL_RLIBS"
+  HDF5_INCLUDES="$MPI_INCLUDES $LOCAL_INCLUDES"
+  HDF5_LIBS="$MPI_LIBS $LOCAL_LIBS -lhdf5 $LOCAL_RLIBS"
+  HDF5_MT_LIBS="$MPI_LIBS $LOCAL_LIBS -lhdf5 $LOCAL_RLIBS"
 fi
 
 if  test "x$hdf5_ok" = "xyes"