Merge from V6_main (04/10/2012)

diff --git a/build_configure b/build_configure
index c3e1b0d580c7c6dc16066612b4a2f2efda219ba6..bab4075589de81852cea69db170ee727c032ae06 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -48,8 +48,8 @@ cat configure.in.base >> configure.in
 
 # --
 
-run "libtoolize --force --copy --automake"
 run "aclocal -I adm/unix/config_files"
+run "libtoolize --force --copy --automake"
 run "autoheader -I adm/unix/config_files"
 run "autoconf"
 run "automake --add-missing --copy"

diff --git a/clean_configure b/clean_configure
index cf5a09c44e9e6fb17a3d7f5542fbe3b0116e2e46..aa98965bc11020b42ce09a993fe4884b10be0d0b 100755 (executable)
--- a/clean_configure
+++ b/clean_configure
@@ -28,23 +28,12 @@ TO_CLEAN=${TO_CLEAN}' aclocal.m4'
 TO_CLEAN=${TO_CLEAN}' autom4te*'
 TO_CLEAN=${TO_CLEAN}' configure'
 TO_CLEAN=${TO_CLEAN}' configure.in'
-TO_CLEAN=${TO_CLEAN}' missing'
-TO_CLEAN=${TO_CLEAN}' install-sh'
-TO_CLEAN=${TO_CLEAN}' ltmain.sh'
-TO_CLEAN=${TO_CLEAN}' config.guess'
-TO_CLEAN=${TO_CLEAN}' config.sub'
-TO_CLEAN=${TO_CLEAN}' depcomp'
 TO_CLEAN=${TO_CLEAN}' yacs_config.h.in'
 
 rm -rf $TO_CLEAN > /dev/null
 
-l=`find . -name "Makefile.in" -or -name "*~"`
-
-if test X"$l" != X ; then
-    rm -f $l
-fi
-
-find . -name "semantic.cache" -print -exec rm {} \;
-find . -name "*.pyc" -print -exec rm {} \;
+find . -name "Makefile.in" -or -name "*~" -exec rm -f {} \;
+find . -name "semantic.cache" -exec rm {} \;
+find . -name "*.pyc" -exec rm {} \;
 rm -f src/salomegui_swig/doc.i
-rm -f adm/unix/config_files/l*.m4
+( cd adm/unix/config_files && rm -f l*.m4 config.guess config.sub depcomp install-sh ltmain.sh missing py-compile )

diff --git a/configure.in.base b/configure.in.base
index dd65c68f429f701b5d533caa0c487be5fb821ef3..aebf911563479386322fb2f23973c6bce88d1456 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -23,6 +23,7 @@
 # -----------------------------------------------------------------------------
 #
 AC_INIT([Salome2 Project], [7.0.0], [paul.rascle@edf.fr], [SalomeYacs])
+AC_CONFIG_AUX_DIR(adm/unix/config_files)
 AM_INIT_AUTOMAKE([tar-pax])
 AC_CONFIG_HEADER(yacs_config.h)