aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2014-02-08 01:17:18 +0200
committerSergey Poznyakoff <gray@gnu.org>2014-02-08 01:17:18 +0200
commitda04dd124470860ddc3128d179430a4b7e207a8a (patch)
tree56bd6709569f5ab8fa12f979a11c9b43b291b4d0
parent548e46e7de424c06743d844fc35b091982d5bee5 (diff)
downloadcflow-da04dd124470860ddc3128d179430a4b7e207a8a.tar.gz
cflow-da04dd124470860ddc3128d179430a4b7e207a8a.tar.bz2
Fix bootstrap
-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" \
788 -type l -xtype l -delete > /dev/null 2>&1 788 -type l -xtype l -delete > /dev/null 2>&1
789 789
790# Reconfigure, getting other files. 790# Reconfigure, getting other files.
791 791autoreconf -f -i -s
792# Skip autoheader if it's not needed.
793grep '^[ ]*AC_CONFIG_HEADERS\>' configure.ac >/dev/null ||
794 AUTOHEADER=true
795
796aclocal_flags=`sed -n 's/ACLOCAL_AMFLAGS *=//p' Makefile.am`
797for command in \
798 libtool \
799 "${ACLOCAL-aclocal} --force $aclocal_flags" \
800 "${AUTOCONF-autoconf} --force" \
801 "${AUTOHEADER-autoheader} --force" \
802 "${AUTOMAKE-automake} --add-missing --copy --force-missing"
803do
804 if test "$command" = libtool; then
805 use_libtool=0
806 # We'd like to use grep -E, to see if any of LT_INIT,
807 # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
808 # but that's not portable enough (e.g., for Solaris).
809 grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
810 && use_libtool=1
811 grep '^[ ]*LT_INIT' configure.ac >/dev/null \
812 && use_libtool=1
813 test $use_libtool = 0 \
814 && continue
815 command="${LIBTOOLIZE-libtoolize} -c -f"
816 fi
817 echo "$0: $command ..."
818 $command || exit
819done
820
821 792
822# Get some extra files from gnulib, overriding existing files. 793# Get some extra files from gnulib, overriding existing files.
823for file in $gnulib_extra_files; do 794for file in $gnulib_extra_files; do

Return to:

Send suggestions and report system problems to the System administrator.