diff options
author | Jim Meyering <meyering@redhat.com> | 2011-12-17 16:38:23 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2011-12-17 16:38:23 +0100 |
commit | e71f0d9df3c782386b364b6a53dcdaadaaef81b5 (patch) | |
tree | 65e2f9f5ca6346be33cad75649e4d3eced87b1cd | |
parent | cfe1040c093be1c1a9b2403e713f1d1c2242a4bc (diff) | |
download | coreutils-e71f0d9df3c782386b364b6a53dcdaadaaef81b5.tar.xz |
build: merge in bootstrap changes from gnulib
* bootstrap: Pull in the combination of gnulib's "bootstrap: detect
tools required by gnulib-tool" patch and the related fix.
-rwxr-xr-x | bootstrap | 28 |
1 files changed, 27 insertions, 1 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2011-11-24.20; # UTC +scriptversion=2011-12-17.15; # UTC # Bootstrap this package from checked-out sources. @@ -477,6 +477,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*) ;; + *) buildreq="automake 1.9 +$buildreq" ;; +esac +case $buildreq in + *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*) ;; + *) buildreq="patch - +$buildreq" ;; + esac +fi + if ! printf "$buildreq" | check_versions; then echo >&2 if test -f README-prereq; then |