From eaf13fc4dd8089979b72059a73242dd5052f31c2 Mon Sep 17 00:00:00 2001 From: inv Date: Wed, 8 Aug 2012 07:05:48 +0000 Subject: [PATCH] Fix problem with compilation of the module on some platforms when sources are obtained with 'make dist', due to mismatch of distributed libtool files with native ones. --- 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 c3640f9..1192121 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,7 @@ # ----------------------------------------------------------------------------- # AC_INIT([JOBMANAGER project], [6.5.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