From: Jim Meyering <meyering@redhat.com>
Date: Sun, 29 Nov 2009 12:57:05 +0000 (+0100)
Subject: bootstrap: handle perl-5.11's changed --version output
X-Git-Tag: v0.1~5112
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=f203a8f4fe82853424a873bffb16de1700e23fcc;p=gnulib.git

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 979a5549e..3d04361fe 100644
--- 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 8ac13b251..7c4882d02 100755
--- 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 |