Remove dependency to MED

diff --git a/Makefile.am b/Makefile.am
index 7019dc7ac4fba5d79bb5f8d585113613e8314bfb..3b3719c678e311c44e9ab3a795197c8397b3b7ee 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,14 +29,12 @@ if HEXABLOCKPLUGIN_ENABLE_GUI
   ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
                     -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
                     -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
-                    -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${HEXABLOCK_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
 else !HEXABLOCKPLUGIN_ENABLE_GUI
   ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
                     -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-                    -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${HEXABLOCK_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files

diff --git a/build_configure b/build_configure
index 63a41b2d164752fc9f99d3999fe1953646722ff9..0e8a7c87802db9d5bf5d95e6edf5748e4a2cbca7 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -51,14 +51,6 @@ if test ! -d "${HEXABLOCK_ROOT_DIR}"; then
     exit
 fi
 
-########################################################################
-# Test if the MED_ROOT_DIR is set correctly
-
-if test ! -d "${MED_ROOT_DIR}"; then
-    echo "failed : MED_ROOT_DIR variable is not correct !"
-    exit
-fi
-
 ########################################################################
 # Test if the SMESH_ROOT_DIR is set correctly
 
@@ -85,14 +77,12 @@ if test -d "${GUI_ROOT_DIR}"; then
   aclocal -I adm_local/unix/config_files \
           -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
           -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
-          -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
           -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
           -I ${HEXABLOCK_ROOT_DIR}/adm_local/unix/config_files \
           -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1
 else
   aclocal -I adm_local/unix/config_files \
           -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-          -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
           -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
           -I ${HEXABLOCK_ROOT_DIR}/adm_local/unix/config_files \
           -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1

diff --git a/configure.ac b/configure.ac
index f03ccaed50364957b8b65bc38e5a9e435fde35ba..93d3dfab224e10d8b606782336b90797156a927a 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -331,14 +331,6 @@ echo
 
 CHECK_GEOM
 
-echo
-echo ---------------------------------------------
-echo Testing Med
-echo ---------------------------------------------
-echo
-
-CHECK_MED
-
 echo
 echo ---------------------------------------------
 echo Testing SMesh
@@ -363,11 +355,11 @@ echo
 
 echo Configure
 if test "${gui_ok}" = "yes"; then
-  variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok OpenGL_ok qt_ok vtk_ok Kernel_ok gui_ok Geom_ok Med_ok SMesh_ok HEXABLOCK_ok"
+  variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok OpenGL_ok qt_ok vtk_ok Kernel_ok gui_ok Geom_ok SMesh_ok HEXABLOCK_ok"
 elif test "${SalomeGUI_need}" != "no"; then
-  variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok Kernel_ok gui_ok Geom_ok Med_ok SMesh_ok HEXABLOCK_ok"
+  variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok Kernel_ok gui_ok Geom_ok SMesh_ok HEXABLOCK_ok"
 else
-  variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok Kernel_ok Geom_ok Med_ok SMesh_ok HEXABLOCK_ok"
+  variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok Kernel_ok Geom_ok SMesh_ok HEXABLOCK_ok"
 fi
 
 for var in $variables

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index dfd1c18896ccbb42d3f8c350d45d14e23fec94c0..fd12b602e13f5b0e2d7f26aeff46abdf0ea39c9d 100755 (executable)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -42,7 +42,6 @@ libHEXABLOCKPluginGUI_la_CPPFLAGS =  \
        $(GUI_CXXFLAGS)       \
        $(GEOM_CXXFLAGS)      \
        $(HEXABLOCK_CXXFLAGS) \
-       $(MED_CXXFLAGS)       \
        $(SMESH_CXXFLAGS)     \
        $(BOOST_CPPFLAGS)     \
        $(CORBA_CXXFLAGS)     \
@@ -55,7 +54,6 @@ libHEXABLOCKPluginGUI_la_LDFLAGS  = \
        ../../idl/libSalomeIDLHEXABLOCKPLUGIN.la \
        $(QT_LIBS) \
        $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-       $(MED_LDFLAGS) -lSalomeIDLMED \
        $(SMESH_LDFLAGS) -lSMESH \
        $(GUI_LDFLAGS) -lsuit -lqtx -lSalomeApp \
        $(CAS_KERNEL)

diff --git a/src/HEXABLOCKPlugin/Makefile.am b/src/HEXABLOCKPlugin/Makefile.am
index ea8cee40b87cb486be4dd8570b1d902cd7028414..b5ccdea714a37ba8c6a69dfa0cb84d6901c1c6ee 100755 (executable)
--- a/src/HEXABLOCKPlugin/Makefile.am
+++ b/src/HEXABLOCKPlugin/Makefile.am
@@ -53,7 +53,6 @@ libHexaBlockEngine_la_CPPFLAGS =  \
         $(VTK_INCLUDES)       \
        $(GEOM_CXXFLAGS)      \
        $(HEXABLOCK_CXXFLAGS) \
-       $(MED_CXXFLAGS)       \
        $(SMESH_CXXFLAGS)     \
        $(BOOST_CPPFLAGS)     \
        $(CORBA_CXXFLAGS)     \
@@ -64,6 +63,5 @@ libHexaBlockEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLHEXABLOCKPLUGIN.la \
        $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo \
        $(HEXABLOCK_LDFLAGS) -lHEXABLOCKEngine \
-       $(MED_LDFLAGS) -lSalomeIDLMED \
        $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lSMESHDS -lSMDS \
        $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lSALOMEBasics