summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2014-02-07 23:17:18 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2014-02-07 23:17:18 (GMT)
commitda04dd124470860ddc3128d179430a4b7e207a8a (patch) (side-by-side diff)
tree56bd6709569f5ab8fa12f979a11c9b43b291b4d0
parent548e46e7de424c06743d844fc35b091982d5bee5 (diff)
downloadcflow-da04dd124470860ddc3128d179430a4b7e207a8a.tar.gz
cflow-da04dd124470860ddc3128d179430a4b7e207a8a.tar.bz2
Fix bootstrap
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xbootstrap31
1 files changed, 1 insertions, 30 deletions
diff --git a/bootstrap b/bootstrap
index 34ea4a1..fdbcbb7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -788,36 +788,7 @@ find "$m4_base" "$source_base" \
-type l -xtype l -delete > /dev/null 2>&1
# Reconfigure, getting other files.
-
-# Skip autoheader if it's not needed.
-grep '^[ ]*AC_CONFIG_HEADERS\>' configure.ac >/dev/null ||
- AUTOHEADER=true
-
-aclocal_flags=`sed -n 's/ACLOCAL_AMFLAGS *=//p' Makefile.am`
-for command in \
- libtool \
- "${ACLOCAL-aclocal} --force $aclocal_flags" \
- "${AUTOCONF-autoconf} --force" \
- "${AUTOHEADER-autoheader} --force" \
- "${AUTOMAKE-automake} --add-missing --copy --force-missing"
-do
- if test "$command" = libtool; then
- use_libtool=0
- # We'd like to use grep -E, to see if any of LT_INIT,
- # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
- # but that's not portable enough (e.g., for Solaris).
- grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
- && use_libtool=1
- grep '^[ ]*LT_INIT' configure.ac >/dev/null \
- && use_libtool=1
- test $use_libtool = 0 \
- && continue
- command="${LIBTOOLIZE-libtoolize} -c -f"
- fi
- echo "$0: $command ..."
- $command || exit
-done
-
+autoreconf -f -i -s
# Get some extra files from gnulib, overriding existing files.
for file in $gnulib_extra_files; do

Return to:

Send suggestions and report system problems to the System administrator.