From: vsr <vsr@opencascade.com>
Date: Mon, 8 Oct 2012 11:52:30 +0000 (+0000)
Subject: Merge from V6_main (04/10/2012)
X-Git-Tag: V7_0_0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bcdf6eaa650ab2a62feb15bb3b8037b51b94cb58;p=modules%2Fyacs.git

Merge from V6_main (04/10/2012)
---

diff --git a/build_configure b/build_configure
index c3e1b0d58..bab407558 100755
--- 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 cf5a09c44..aa98965bc 100755
--- 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 dd65c68f4..aebf91156 100644
--- 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)