0021196: [CEA 456] Integration and merge modification for debian packages

  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.

diff --git a/configure.ac b/configure.ac
index d7ab30eb8a3a862b7ad1aad9b9d8ecf121e62999..40711182ffe3c6bbbc31580700c9c0efc08bfdef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
@@ -549,6 +549,7 @@ AC_OUTPUT([ \
   doc/salome/gui/doxyfile \
   doc/salome/gui/static/header.html \
   doc/docutils/Makefile \
+  doc/docutils/conf.py \
   idl/Makefile \
   idl/Calcium_Ports.idl \
   resources/Makefile \

diff --git a/salome_adm/unix/config_files/check_hdf5.m4 b/salome_adm/unix/config_files/check_hdf5.m4
index c76cb563bc530b6a706e648bd3e79a373a8f8490..e062d22a3a6f0c012ff6bbfecbfd6a14c15cc5f6 100644 (file)
--- a/salome_adm/unix/config_files/check_hdf5.m4
+++ b/salome_adm/unix/config_files/check_hdf5.m4
@@ -66,7 +66,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"
 
@@ -77,7 +77,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"
 
@@ -85,9 +85,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"