diff options
| author | Eric Blake <eblake@redhat.com> | 2011-12-07 09:51:21 -0700 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2011-12-07 13:55:08 -0700 |
| commit | 39f5f1e49c6e50e4f9ec81455253227d8a37f22d (patch) | |
| tree | 75dca0e41e16ebe2df0769a2725c63ada3e7893b | |
| parent | bb052d4a7416accaad0747e84bd2a0accbfcf923 (diff) | |
| download | gnulib-39f5f1e49c6e50e4f9ec81455253227d8a37f22d.tar.gz | |
bootstrap: detect tools required by gnulib-tool
List tools needed by gnulib-tool, whether or not the project
also requires the tools in cfg.mk $buildreq. In particular,
detect if the project uses gnulib-local diffs, in which case
patch is a prerequisite.
* build-aux/bootstrap (buildreq): Provide minimum implicit
dependencies.
* DEPENDENCIES: Mention patch as a prereq.
Signed-off-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | DEPENDENCIES | 10 | ||||
| -rwxr-xr-x | build-aux/bootstrap | 22 |
3 files changed, 38 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2011-12-07 Eric Blake <eblake@redhat.com> + + bootstrap: detect tools required by gnulib-tool + * build-aux/bootstrap (buildreq): Provide minimum implicit + dependencies. + * DEPENDENCIES: Mention patch as a prereq. + 2011-12-04 Bruno Haible <bruno@clisp.org> sethostname: Port to Windows platforms. diff --git a/DEPENDENCIES b/DEPENDENCIES index f025ab2d5c..91cd6c543d 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -81,6 +81,16 @@ at any time. http://ftp.gnu.org/gnu/diffutils/ ftp://ftp.gnu.org/gnu/diffutils/ +* The patch utility 'patch'. + + Mandatory if you use gnulib-local diffs. Using the platform's native + utilities gives good portability exposure, but you can also use GNU + patch. + + Homepage: + http://www.gnu.org/software/patch/ + + Download: + http://ftp.gnu.org/gnu/patch/ + ftp://ftp.gnu.org/gnu/patch/ + * Grep. + Mandatory. Using the platform's native grep gives good portability exposure, but you can also use GNU grep. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index f76db9aea2..3c39f4a524 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2011-08-11.17; # UTC +scriptversion=2011-12-07.20; # UTC # Bootstrap this package from checked-out sources. @@ -473,6 +473,26 @@ if test $use_libtool = 1; then find_tool LIBTOOLIZE glibtoolize libtoolize fi +case $buildreq in + automake) ;; + *) buildreq="automake 1.9 +$buildreq" ;; +esac +case $buildreq in + autoconf) ;; + *) buildreq="autoconf 2.59 +$buildreq" ;; +esac +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 |