From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 25 Oct 2012 09:00:52 +0000 (-0500)
Subject: bootstrap: display prerequisite program environment vars.
X-Git-Tag: v2.4.2.418~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c478e3a0b7e64f4fcbc1b66cfb175b6cdd287277;p=thirdparty%2Flibtool.git

bootstrap: display prerequisite program environment vars.

Be more helpful when a prerequisite program from $buildreq
cannot be located, by showing what variable to export if it
is already installed but not in PATH.
* gl/build-aux/bootstrap.in (func_check_versions): Display
associated environment variables for not found prerequisite
programs.
* bootstrap: Regenerate.

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

diff --git a/bootstrap b/bootstrap
index b897f2071..0cd5a2b75 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4441,11 +4441,12 @@ func_check_versions ()
       _G_instver=`func_get_version $_G_app`
 
       test -z "$_G_instver" \
-          || func_verbose "found '$_G_app' version $_G_instver"
+          || func_verbose "found '$_G_app' version $_G_instver."
 
       # Fail if --version didn't work.
       if test -z "$_G_instver"; then
-        func_error "'$_G_app' not found"
+        func_error "Prerequisite '$_G_app' not found. Please install it, or
+'export $_G_appvar=/path/to/$_G_app'."
         func_check_versions_result=false
 
       # Fail if a new version than what we have is required.
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 7de22fffa..84fbec7dd 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -2259,11 +2259,12 @@ func_check_versions ()
       _G_instver=`func_get_version $_G_app`
 
       test -z "$_G_instver" \
-          || func_verbose "found '$_G_app' version $_G_instver"
+          || func_verbose "found '$_G_app' version $_G_instver."
 
       # Fail if --version didn't work.
       if test -z "$_G_instver"; then
-        func_error "'$_G_app' not found"
+        func_error "Prerequisite '$_G_app' not found. Please install it, or
+'export $_G_appvar=/path/to/$_G_app'."
         func_check_versions_result=false
 
       # Fail if a new version than what we have is required.