From 32c5072fd65f4692a728c802adb403ccf5c8d7e9 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 17 May 2016 23:01:28 -0400
Subject: bootstrap: switch to autoreconf

This is simpler and handles all the right subtools for us.
---
 bootstrap.sh | 45 +++++++++------------------------------------
 1 file changed, 9 insertions(+), 36 deletions(-)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index dac639e..b814ae7 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -6,48 +6,21 @@
 # dists should include the docs so that end users don't need to
 # install naturaldocs.  At the same time, we tolerate it being missing
 # so that random hackers don't need it just to build the code.
-if which naturaldocs > /dev/null; then
-    echo "Generation user docs:"
-    (cd docs/naturaldocs; bash run_docs.sh)
+if which naturaldocs >/dev/null 2>&1 ; then
+	echo "Generation user docs:"
+	(cd docs/naturaldocs; bash run_docs.sh)
 else
-    echo "Can't find naturaldocs; not generating user manual."
+	echo "Can't find naturaldocs; not generating user manual."
 fi
 
 
-# allow importing from the environment, e.g.
-# "AUTOCONF=autoconf259 ... ./bootstrap.sh"
-if echo $OSTYPE | grep -q '^darwin' ; then 
-	echo Having trouble on OS X? Try brew install autoconf libtool automake gettext apple-gcc42 pkg-config cmake
-	LIBTOOLIZE=${LIBTOOLIZE:-glibtoolize}
+if echo "${OSTYPE:-$(uname)}" | grep -q '^darwin' ; then
+	echo "Having trouble on OS X? Try: brew install autoconf libtool automake gettext apple-gcc42 pkg-config cmake"
 fi
-ACLOCAL=${ACLOCAL:-aclocal}
-AUTOCONF=${AUTOCONF:-autoconf}
-AUTOHEADER=${AUTOHEADER:-autoheader}
-AUTOMAKE=${AUTOMAKE:-automake}
-LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
 
-# might handle this differently
-AUTOMAKE_FLAGS="--add-missing --copy"
-
-#
-CLEANFILES="Makefile.in aclocal.m4 autom4te.cache configure libtool config/Makefile.in \
-tests/Makefile.in src/Makefile.in"
-
-#
-rm -rf ${CLEANFILES}
-
-#
-if ${ACLOCAL} -I m4 \
-   && ${LIBTOOLIZE} --automake --copy --force \
-   && ${ACLOCAL} -I m4 \
-   && ${AUTOHEADER} \
-   && ${AUTOMAKE} ${AUTOMAKE_FLAGS} \
-   && ${AUTOCONF} --force && [ -f configure ]
-then
-  echo Now run configure and make
-else
-  echo Failed
-  exit 1
+echo "autoreconf -f -i"
+if ! autoreconf -f -i ; then
+	exit 1
 fi
 
 exit 0
-- 
cgit v1.2.1