Merge from V6_4_BR 05/12/2011

diff --git a/clean_configure b/clean_configure
index 5860643846bc7bd8d365de9485f68c5013bc9576..7bb2643df79fc0a00bd1170c3f2d30a96945d657 100755 (executable)
--- a/clean_configure
+++ b/clean_configure
@@ -24,10 +24,5 @@ find . -name "*.pyc" -print -exec rm {} \;
 #exit
 # ==================== ON SORT AVANT
 
-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 b1c763d26baa9035efbebc4a2e0e0005d2dd994e..bdf724610b46da7711e143d1ae7598a02e5fa218 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
 # Modified by : Marc Tajchman (CEA)
 # Created from configure.in.base
 #
-AC_INIT([Salome2 Project PYHELLO module], [6.3.1], [webmaster.salome@opencascade.com], [SalomePYHELLO])
+AC_INIT([Salome2 Project PYHELLO module], [6.4.0], [webmaster.salome@opencascade.com], [SalomePYHELLO])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET