Synchronise with v3.10-rc1

[kconfig-frontends] / bootstrap

diff --git a/bootstrap b/bootstrap
index 004202002bb47948b1a26c884da6d1e3f5affdde..4dd9407e790ab387996f542e7770ec7e43193fcc 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,20 +1,17 @@
 #!/bin/sh
 set -e
 
-printf "Running libtoolize...\n"
-libtoolize --copy --force
+printf "Creating macrodir...\n"
+macrodir="$( sed    -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"
-mkdir -p scripts
-automake --foreign --add-missing --copy -Wall --force
+# Cleanup the useless stuff... :-(
+rm -rf autom4te.cache
 
 printf "Done. You may now run:\n    ./configure\n"