From 659ed703447881d817682b6915d816aa85e7d390 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 8 Oct 2012 13:26:39 +0000 Subject: [PATCH] Merge from V6_main (04/10/2012) --- build_configure | 2 +- clean_configure | 3 ++- configure.ac | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build_configure b/build_configure index 0f0908e..b163777 100755 --- 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 02e09a0..d667650 100755 --- 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 621cb20..e1ecafc 100644 --- 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) -- 2.39.2