summaryrefslogtreecommitdiff
path: root/build-aux/bootstrap
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2011-12-17 16:28:55 +0100
committerJim Meyering <meyering@redhat.com>2011-12-17 16:28:55 +0100
commitae92f6e5746d1eacc77af8f3ee568cc8205f5dea (patch)
treec31c03ee64acb573fb569ae3f5fe099a10cfe765 /build-aux/bootstrap
parentfeaf4df70588cf1ee30b4879a1048cc143135a67 (diff)
downloadgnulib-ae92f6e5746d1eacc77af8f3ee568cc8205f5dea.tar.gz
bootstrap: correct the recent buildreq change
The 2011-12-07 commit, 39f5f1e4, omitted some '*'s, and thus had no effect. * build-aux/bootstrap (buildreq): Bracket each search term with "*...*", so that the shell "case" statement works as intended. Add comments.
Diffstat (limited to 'build-aux/bootstrap')
-rwxr-xr-xbuild-aux/bootstrap14
1 files changed, 10 insertions, 4 deletions
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 61e11852d0..2a83f43f40 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2011-12-07.20; # UTC
+scriptversion=2011-12-17.15; # UTC
# Bootstrap this package from checked-out sources.
@@ -478,26 +478,32 @@ if test $use_libtool = 1; then
find_tool LIBTOOLIZE glibtoolize libtoolize
fi
+# gnulib-tool requires at least automake and autoconf.
+# If either is not listed, add it (with minimum version) as a prerequisite.
case $buildreq in
- automake) ;;
+ *automake*) ;;
*) buildreq="automake 1.9
$buildreq" ;;
esac
case $buildreq in
- autoconf) ;;
+ *autoconf*) ;;
*) buildreq="autoconf 2.59
$buildreq" ;;
esac
+
+# When we can deduce that gnulib-tool will require patch,
+# and when patch is not already listed as a prerequisite, add it, too.
if test ! -d "$local_gl_dir" \
|| find "$local_gl_dir" -name '*.diff' -exec false {} +; then
:
else
case $buildreq in
- patch) ;;
+ *patch*) ;;
*) buildreq="patch -
$buildreq" ;;
esac
fi
+
if ! printf "$buildreq" | check_versions; then
echo >&2
if test -f README-prereq; then