bootstrap: allow FreeBSD gzip

$ gzip --version > /dev/null
FreeBSD gzip 20100407

* build-aux/bootstrap (get_version): Parse FreeBSD gzip version,
which has no '.' and goes to stderr.
* build-aux/bootstrap.conf (buildreq): Improve the sample file.
Reported by Matthias Bolte.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index e348fe28a317e08a9f0314042546e39777f06ac9..8a9d7b665d886e4f7faed07afd1d6f27b1f92602 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-11-12  Eric Blake  <eblake@redhat.com>
 
+       bootstrap: allow FreeBSD gzip
+       * build-aux/bootstrap (get_version): Parse FreeBSD gzip version,
+       which has no '.' and goes to stderr.
+       * build-aux/bootstrap.conf (buildreq): Improve the sample file.
+       Reported by Matthias Bolte.
+
        maintainer-makefile: check for i18n setup
        * top/maint.mk (sc_bindtextdomain): Check for evidence that _()
        will likely work.

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 8c8d777da147b4369cb6d5910c9b148985cad78c..5278e8eb1f1e5e866afa1758fbf696d706ba9b77 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-10-08.16; # UTC
+scriptversion=2010-11-12.20; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -345,11 +345,11 @@ get_version() {
 
   $app --version 2>&1 |
   sed -n '# extract version within line
-          s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
+          s/.*[v ]\{1,\}\([0-9]\{1,\}\(\.[.a-z0-9-]*\)*\).*/\1/
           t done
 
           # extract version at start of line
-          s/^\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
+          s/^\([0-9]\{1,\}\(\.[.a-z0-9-]*\)\)*.*/\1/
           t done
 
           d

diff --git a/build-aux/bootstrap.conf b/build-aux/bootstrap.conf
index 75cf6ff34ef8184040d491fd5949a44961446c77..2bb60e211ee4041761da708d6ee37a87e267e591 100644 (file)
--- a/build-aux/bootstrap.conf
+++ b/build-aux/bootstrap.conf
@@ -57,3 +57,11 @@ if test $gettext_external = 1; then
       m4/xsize.m4
   '
 fi
+
+# Build prerequisites
+buildreq="\
+autoconf   2.59
+automake   1.9.6
+git        1.5.5
+tar        -
+"