From: vsr <vsr@opencascade.com>
Date: Tue, 24 Jan 2012 15:01:43 +0000 (+0000)
Subject: 0021481: [CEA 538] autoconf and med 3
X-Git-Tag: V6_5_0a1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a3d50e8c0e472957eddcfae3e4b024ac13acd0ec;p=modules%2Fhomard.git

0021481: [CEA 538] autoconf and med 3
---

diff --git a/configure.ac b/configure.ac
index b38d37f4..076a2ef0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,11 +293,11 @@ CHECK_MPI
 
 echo
 echo ---------------------------------------------
-echo Testing Med
+echo Testing Med library
 echo ---------------------------------------------
 echo
 
-CHECK_MED2
+CHECK_MED3
 
 
 echo
@@ -334,7 +334,7 @@ echo
 
 echo Configure
 if test "${HOMARD_WITH_GUI}" = "yes"; then
-variables="cc_ok fortran_ok boost_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok  hdf5_ok omniORB_ok Kernel_ok med2_ok SalomeGUI_ok Med_ok SMesh_ok  sphinx_ok"
+variables="cc_ok fortran_ok boost_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok  hdf5_ok omniORB_ok Kernel_ok med3_ok SalomeGUI_ok Med_ok SMesh_ok  sphinx_ok"
 fi
 
 if test "${HOMARD_WITH_GUI}" = "no"; then
diff --git a/src/HOMARDGUI/Makefile.am b/src/HOMARDGUI/Makefile.am
index ca05fa95..cc2b2561 100644
--- a/src/HOMARDGUI/Makefile.am
+++ b/src/HOMARDGUI/Makefile.am
@@ -100,7 +100,7 @@ libHOMARD_la_CPPFLAGS =          \
 	$(QT_INCLUDES)           \
 	$(CAS_CPPFLAGS)          \
 	$(PYTHON_INCLUDES)       \
-	$(MED2_INCLUDES)         \
+	$(MED3_INCLUDES)         \
 	$(HDF5_INCLUDES)         \
 	$(BOOST_CPPFLAGS)        \
 	$(CORBA_CXXFLAGS)        \
@@ -119,7 +119,7 @@ libHOMARD_la_LDFLAGS  =                 \
 	../../idl/libSalomeIDLHOMARD.la \
 	../HOMARD_I/libHOMARDEngine.la  \
 	$(KERNEL_LDFLAGS)               \
-	$(MED2_LIBS)                    \
+	$(MED3_LIBS)                    \
         -lSalomeLifeCycleCORBA          \
 	$(GUI_LDFLAGS)                  \
 	-lSalomeApp                     \
diff --git a/src/HOMARD_I/Makefile.am b/src/HOMARD_I/Makefile.am
index dc8a80d1..23eaf28d 100644
--- a/src/HOMARD_I/Makefile.am
+++ b/src/HOMARD_I/Makefile.am
@@ -54,7 +54,7 @@ libHOMARDEngine_la_CPPFLAGS = 		      \
 	$(CORBA_CXXFLAGS) 		      \
 	$(CORBA_INCLUDES)		      \
 	$(KERNEL_CXXFLAGS)		      \
-	$(MED2_INCLUDES)		      \
+	$(MED3_INCLUDES)		      \
 	$(SMESH_CXXFLAGS) 		      \
 	$(GEOM_CXXFLAGS) 		      \
 	-I$(srcdir)/../HOMARD 		      \
@@ -70,7 +70,7 @@ libHOMARDEngine_la_LDFLAGS  =            \
 	../../idl/libSalomeIDLHOMARD.la  \
 	../HOMARD/libHOMARDImpl.la       \
 	$(KERNEL_LDFLAGS)                \
-	$(MED2_LIBS)                     \
+	$(MED3_LIBS)                     \
 	-lSalomeContainer                \
 	-lSalomeNS                       \
 	-lRegistry                       \