Merge from V6_6_BR (V6_6_0rc2) 11/12/2012

diff --git a/configure.ac b/configure.ac
index e5bd0bc10cc6706d643603424ce39b2da43399c0..b4089e5e045b5bb145c0fc8c5e87ca832ba9aaec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
 # ---
 #
-AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN])
+AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [6.6.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET

diff --git a/src/tepal2med/Makefile.am b/src/tepal2med/Makefile.am
index bafa2f1cc30ce3a935086e2ab1c406353b4bf795..9a48661faf459d05ae0a1e925ac80db7b1b88aee 100644 (file)
--- a/src/tepal2med/Makefile.am
+++ b/src/tepal2med/Makefile.am
@@ -45,4 +45,4 @@ nodist_tepal2med_SOURCES = $(MOC_FILES) $(UIC_FILES)
 
 tepal2med_CPPFLAGS = -I. $(QT_INCLUDES) $(MED3_INCLUDES) $(HDF5_INCLUDES) $(LIBXML_INCLUDES)
 
-tepal2med_LDADD = $(QT_LIBS) $(MED3_LIBS) $(HDF5_LIBS) $(LIBXML_LIBS)
+tepal2med_LDADD = $(QT_LIBS) $(MED3_LIBS_C_ONLY) $(HDF5_LIBS) $(LIBXML_LIBS)