Merge from V6_4_BR 05/12/2011

diff --git a/clean_configure b/clean_configure
index f58689caef9ae57508e4c197d50d50e6f6d99344..3b0f72837017d54831201f47d579c1dc86e75bef 100755 (executable)
--- a/clean_configure
+++ b/clean_configure
@@ -29,10 +29,5 @@ find . -name "*.pyc" -print -exec rm {} \;
 
 # ... 
 
-find bin -name Makefile.in | xargs rm -f
-find doc -name Makefile.in | xargs rm -f
-find idl -name Makefile.in | xargs rm -f
-find resources -name Makefile.in | xargs rm -f
-find salome_adm -name Makefile.in | xargs rm -f
-find src -name Makefile.in | xargs rm -f
-rm -f Makefile.in
+find . -name Makefile.in | xargs rm -f
+( cd adm_local/unix/config_files && rm -f config.* depcomp install-sh ltmain.sh missing py-compile )

diff --git a/configure.ac b/configure.ac
index 10fa8d43670d8bfc12e3f9f08f88fd742e5bcff3..da1226f5c56782d0534f922c06dec39a9b39783b 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.3.1], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN])
+AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [6.4.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET