0021481: [CEA 538] autoconf and med 3

diff --git a/configure.ac b/configure.ac
index f7569d1ce96b8d0bd5230f5afd55d64419d4320b..13a84e59a0f743f32eb5930943a2291313eafb30 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -345,11 +345,11 @@ CHECK_HDF5
 
 echo
 echo ---------------------------------------------
-echo testing MED2
+echo testing MED3
 echo ---------------------------------------------
 echo
 
-CHECK_MED2
+CHECK_MED3
 
 echo
 echo ---------------------------------------------
@@ -435,9 +435,9 @@ echo Configure
 if test "${gui_ok}" = "yes"; then
   variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok cgns_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok qwt_ok Kernel_ok Geom_ok Med_ok gui_ok"
 elif test "${SalomeGUI_need}" != "no"; then
-  variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok cgns_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok Geom_ok Med_ok gui_ok"
+  variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok cgns_ok med3_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok Geom_ok Med_ok gui_ok"
 else
-  variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok cgns_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok Geom_ok Med_ok"
+  variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok cgns_ok med3_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok Geom_ok Med_ok"
 fi
 
 for var in $variables

diff --git a/src/SMESHGUI/Makefile.am b/src/SMESHGUI/Makefile.am
index ba8b05170b02182984c70043386a32f9e5b85f4a..541933a885b665f886b26c4d424895411df21fcd 100644 (file)
--- a/src/SMESHGUI/Makefile.am
+++ b/src/SMESHGUI/Makefile.am
@@ -250,7 +250,7 @@ libSMESH_la_CPPFLAGS = \
        $(BOOST_CPPFLAGS) \
        $(CORBA_CXXFLAGS) \
        $(CORBA_INCLUDES) \
-       $(MED2_INCLUDES) \
+       $(MED3_INCLUDES) \
        $(HDF5_INCLUDES) \
        -I$(srcdir)/../OBJECT \
        -I$(srcdir)/../SMESHFiltersSelection \

diff --git a/src/Tools/MeshCut/Makefile.am b/src/Tools/MeshCut/Makefile.am
index c1cecffd9f5296ea9c94bcd433041b59f924ef8e..e191e4e01037d260c0643bc5bef2ff394517f7f4 100644 (file)
--- a/src/Tools/MeshCut/Makefile.am
+++ b/src/Tools/MeshCut/Makefile.am
@@ -38,9 +38,9 @@ MeshCut_SOURCES = \
   MeshCut_Cas.cxx \
   MeshCut_DC.cxx
 
-MeshCut_CPPFLAGS =  $(MED2_INCLUDES)
+MeshCut_CPPFLAGS =  $(MED3_INCLUDES)
 
-MeshCut_LDFLAGS =  $(MED2_LIBS) $(HDF5_LIBS)
+MeshCut_LDFLAGS =  $(MED3_LIBS) $(HDF5_LIBS)
 
 
 

diff --git a/src/Tools/padder/resources/padderexe/envPadder.sh.in b/src/Tools/padder/resources/padderexe/envPadder.sh.in
index 31c84a598870a9805f7ae7c8312cb5042319324d..521f577462293ec3601e192400700449fc6e9e25 100644 (file)
--- a/src/Tools/padder/resources/padderexe/envPadder.sh.in
+++ b/src/Tools/padder/resources/padderexe/envPadder.sh.in
@@ -2,7 +2,7 @@
 # This script defines the shell extension required for executing the
 # padder executable program on the localhost (for test purposes)
 
-MED_ROOT="@MED2HOME@"
+MED_ROOT="@MED3HOME@"
 HDF_ROOT="@HDF5HOME@"
 CGAL_ROOT="/usr"
 export LD_LIBRARY_PATH="$MED_ROOT/lib:$HDF_ROOT/lib:$CGAL_ROOT/lib:$LD_LIBRARY_PATH"