Merge from V6_main 11/02/2013

diff --git a/configure.ac b/configure.ac
index 81665bbb5f6c34616a6d9fc94f1fd9d411ecaff5..133e8adc01d2261a6ab2a608fc0e10263add704c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -259,6 +259,14 @@ if test "${HOMARD_WITH_GUI}" = "yes"; then
     fi
 fi
 
+echo
+echo ---------------------------------------------
+echo testing MPI
+echo ---------------------------------------------
+echo
+
+CHECK_MPI
+
 echo
 echo ---------------------------------------------
 echo testing HDF5
@@ -291,7 +299,6 @@ echo ---------------------------------------------
 echo
 
 CHECK_KERNEL
-CHECK_MPI
 
 echo
 echo ---------------------------------------------

diff --git a/src/HOMARDGUI/HOMARDGUI.cxx b/src/HOMARDGUI/HOMARDGUI.cxx
index 9b8d9b111b259defb415b5facb9289e8e1125243..23776674ed8dc26e1bc5ee931f32047b7217c0fd 100644 (file)
--- a/src/HOMARDGUI/HOMARDGUI.cxx
+++ b/src/HOMARDGUI/HOMARDGUI.cxx
@@ -82,8 +82,7 @@ static CORBA::ORB_var _orb;
 // purpose  : Constructor
 //=======================================================================
 HOMARDGUI::HOMARDGUI(const QString&) :
-           SalomeApp_Module( "HOMARD" ), // default name
-           LightApp_Module( "HOMARD" )
+           SalomeApp_Module( "HOMARD" ) // default name
 {
 }