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" <yann.morin.1998@free.fr>
Cc: Jan Engelhardt <jengelh@inai.de>

diff --git a/bootstrap b/bootstrap
index b9dcbaf6229be8c6ee1378eea0000a6bcebb0046..ef523d377b7065e110fe49c40e6f793dbc452c73 100755 (executable)
--- 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 8896d258edaf4f20e208990b62403b5c8f2b32c1..e035b37754f3131346f54c600506b102cdfde828 100644 (file)
--- 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"],