From: vsr Date: Tue, 11 Dec 2012 12:04:59 +0000 (+0000) Subject: Merge from V6_6_BR (V6_6_0rc2) 11/12/2012 X-Git-Tag: V6_main_FINAL~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FBR_PORTING_VTK6;p=plugins%2Fghs3dprlplugin.git Merge from V6_6_BR (V6_6_0rc2) 11/12/2012 --- diff --git a/configure.ac b/configure.ac index e5bd0bc..b4089e5 100644 --- 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 bafa2f1..9a48661 100644 --- 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)