From f203a8f4fe82853424a873bffb16de1700e23fcc Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 29 Nov 2009 13:57:05 +0100 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ build-aux/bootstrap | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 979a5549e..3d04361fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-11-29 Jim Meyering + + 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 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 | -- 2.11.0