bootstrap: handle perl-5.11's changed --version output

* build-aux/bootstrap (get_version): Handle perl separately,
since perl-5.11's --version output is different.

diff --git a/ChangeLog b/ChangeLog
index 979a5549ebd0d25ffab03a9b2d76c993ad7af0b0..3d04361fe778a078837ff8dd3bbc496f1864dce9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-29  Jim Meyering  <meyering@redhat.com>
+
+       bootstrap: handle perl-5.11's changed --version output
+       * build-aux/bootstrap (get_version): Handle perl separately,
+       since perl-5.11's --version output is different.
+
 2009-11-28  Jim Meyering  <meyering@redhat.com>
 
        userspec: depend on the inttostr module, too

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 8ac13b2512344f2c52ce7da48c92355a2904a329..7c4882d0258d7d8a22f62795247804663df9f52b 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -311,6 +311,13 @@ sort_ver() { # sort -V is not generally available
 get_version() {
   app=$1
 
+  # perl 5.11's --version output does not fit the mold,
+  # handle perl as a special case.
+  if test "_$app" = _perl; then
+      perl -le 'print $]' || return 1
+      return 0
+  fi
+
   $app --version >/dev/null 2>&1 || return 1
 
   $app --version 2>&1 |