From: Gary V. Vaughan <gary@gnu.org>
Date: Fri, 23 Aug 2013 09:27:31 +0000 (+0700)
Subject: bootstrap: diagnose bad $buildreq formatting.
X-Git-Tag: v2.4.2.418~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7362377480154556b308e29bf97bf1760138879;p=thirdparty%2Flibtool.git

bootstrap: diagnose bad $buildreq formatting.

Particularly when porting from gnulib bootstrap to libtool
bootstrap, it's easy to forget the extra URL column used for
error reporting.
* gl/build-aux/bootstrap.in (func_check_versions): A non-URL
pattern in the 3rd column of buildreq triggers a fatal error.
* bootstrap: Regenerate.
Reported by Mike Miller.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/bootstrap b/bootstrap
index df3ca3ae1..5b382d85d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4492,6 +4492,17 @@ func_check_versions ()
       _G_reqver=$1; shift
       _G_url=$1; shift
 
+      # Diagnose bad buildreq formatting.
+      case $_G_url in
+      [a-z]*://*) ;; # looks like a url
+      *) func_fatal_error "\
+'$_G_url' from the buildreq table in
+'bootstrap.conf' does not look like the URL for downloading
+$_G_app. Please ensure that buildreq is a strict newline
+delimited list of triples; 'program min-version url'."
+        ;;
+      esac
+
       # Honor $APP variables ($TAR, $AUTOCONF, etc.)
       _G_appvar=`echo $_G_app |tr '[a-z]' '[A-Z]'`
       test TAR = "$_G_appvar" && _G_appvar=AMTAR
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 74e65175a..34e4155e6 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -2302,6 +2302,17 @@ func_check_versions ()
       _G_reqver=$1; shift
       _G_url=$1; shift
 
+      # Diagnose bad buildreq formatting.
+      case $_G_url in
+      [a-z]*://*) ;; # looks like a url
+      *) func_fatal_error "\
+'$_G_url' from the buildreq table in
+'bootstrap.conf' does not look like the URL for downloading
+$_G_app. Please ensure that buildreq is a strict newline
+delimited list of triples; 'program min-version url'."
+        ;;
+      esac
+
       # Honor $APP variables ($TAR, $AUTOCONF, etc.)
       _G_appvar=`echo $_G_app |tr '[a-z]' '[A-Z]'`
       test TAR = "$_G_appvar" && _G_appvar=AMTAR