Merge from V6_main (04/10/2012)

diff --git a/build_configure b/build_configure
index 0f0908e50957e15a905f07aca81f80e25e7742e6..b16377769276513d59137b6da2802b23f8bc5ef5 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -31,8 +31,8 @@ run() {
     echo "[  OK  ]"
 }
 
-run "libtoolize --force --copy --automake"
 run "aclocal -I m4"
+run "libtoolize --force --copy --automake"
 run "autoheader -I m4"
 run "autoconf"
 run "automake --add-missing --copy"

diff --git a/clean_configure b/clean_configure
index 02e09a07f0c98dbe0239891e8c86848ab1d5292e..d667650b8b511c6a575e3cbcf57bfc21fb96f6a9 100755 (executable)
--- a/clean_configure
+++ b/clean_configure
@@ -23,7 +23,8 @@
 # Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
 # ---
 #
-rm -rf autom4te.cache aclocal.m4 configure config.guess config.sub build_configure.log install-sh ltmain.sh missing depcomp
+rm -rf autom4te.cache aclocal.m4 configure build_configure.log
+( cd m4 && rm -rf l*.m4 config.guess config.sub install-sh ltmain.sh missing depcomp )
 rm -rf jobmanager_config.h.in INSTALL
 find . -name "*~" -print -exec rm {} \;
 find . -name "*.pyc" -print -exec rm {} \;

diff --git a/configure.ac b/configure.ac
index 621cb20d7cb5d24b72efc0635ef96fa1e1f334de..e1ecafc1d8b566d4abd4aa095ede26f37c17af67 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,7 @@
 # -----------------------------------------------------------------------------
 #
 AC_INIT([JOBMANAGER project], [7.0.0], [andre.ribes@edf.fr], [JobManager-Module])
+AC_CONFIG_AUX_DIR(m4)
 AM_INIT_AUTOMAKE([tar-pax])
 AC_CONFIG_HEADER(jobmanager_config.h)