From 3725e3bdd06fedde30c9b12b81ecd1411fd127b9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 13 Jan 2013 23:01:40 +0100 Subject: [PATCH] configure: use autoreconf in bootstrap Thanks to Jan, let's use autoreconf in bootstrap, instead of our canned sequence. Signed-off-by: "Yann E. MORIN" Cc: Jan Engelhardt --- bootstrap | 23 +++++++++-------------- configure.ac | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/bootstrap b/bootstrap index b9dcbaf..ef523d3 100755 --- a/bootstrap +++ b/bootstrap @@ -1,22 +1,17 @@ #!/bin/sh set -e -printf "Running libtoolize...\n" -libtoolize --copy --force +printf "Creating macrodir...\n" +macrodir="$( sed -r -e '/^AC_CONFIG_MACRO_DIR\(\[(.*)\]\)/!d;' \ + -e 's//\1/;' \ + configure.ac \ + )" +mkdir -p "${macrodir}" -printf "Running aclocal...\n" -aclocal -Wall --force +printf "Running autoreconf...\n" +autoreconf -f -i -Wall -printf "Running autoconf...\n" -autoconf -Wall --force - -printf "Running autoheader...\n" -autoheader -Wall --force - -printf "Running automake...\n" -automake --foreign --add-missing --copy -Wall --force - -# Cleanup the mess... :-( +# Cleanup the useless stuff... :-( rm -rf autom4te.cache printf "Done. You may now run:\n ./configure\n" diff --git a/configure.ac b/configure.ac index 8896d25..e035b37 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AS_IF( [test "$program_prefix" = NONE], [program_prefix=kconfig-]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) AS_IF( [test "$(${srcdir}/scripts/version.sh --internal)" = "hg"], -- 2.39.5