Merge from V6_main 15/03/2013

[modules/smesh.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 65f1a6852c8515c434dd4dd21953b13fc564ff68..98147ad5870864b28081da3d3db898c7e81c1e55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 # Created from configure.in.base
 #
-AC_INIT([Salome2 Project SMESH module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeSMESH])
+AC_INIT([Salome2 Project SMESH module], [7.0.0], [webmaster.salome@opencascade.com], [SalomeSMESH])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -537,6 +537,7 @@ AC_OUTPUT([ \
   doc/docutils/Makefile \
   doc/docutils/conf.py \
   doc/salome/Makefile \
+  doc/salome/examples/Makefile \
   doc/salome/gui/Makefile \
   doc/salome/gui/SMESH/Makefile \
   doc/salome/gui/SMESH/doxyfile \
@@ -553,6 +554,7 @@ AC_OUTPUT([ \
   src/DriverMED/Makefile \
   src/DriverSTL/Makefile \
   src/DriverUNV/Makefile \
+  src/DriverGMF/Makefile \
   src/DriverCGNS/Makefile \
   src/MEFISTO2/Makefile \
   src/OBJECT/Makefile \
@@ -573,6 +575,7 @@ AC_OUTPUT([ \
   src/SMESH_PY/Makefile \
   src/Tools/Makefile \
   src/Tools/MeshCut/Makefile \
+  src/Tools/YamsPlug/Makefile \
   src/Tools/padder/Makefile \
   src/Tools/padder/meshjob/Makefile \
   src/Tools/padder/meshjob/idl/Makefile \
@@ -586,8 +589,7 @@ AC_OUTPUT([ \
   src/Tools/padder/resources/appligen/Makefile \
   src/Tools/padder/resources/appligen/appligen.sh \
   src/Tools/padder/resources/appligen/config_appli.xml \
-  src/Tools/padder/resources/padderexe/Makefile \
-  src/Tools/padder/resources/padderexe/envPadder.sh \
+  src/Tools/padder/resources/testdata/Makefile \
   src/Tools/padder/unittests/Makefile \
   src/Tools/padder/unittests/autotest.sh \
   src/Tools/padder/doc/Makefile \