[SCM] GNU Libtool branch, master, updated. v2.4.2.444-18-g5e5cf7a

[Gary V. Vaughan]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  5e5cf7a7d67a1af4752bf442a42a5a77dccacd3e (commit)
      from  1f14273e954361bde44143458098acd9723e54a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5e5cf7a7d67a1af4752bf442a42a5a77dccacd3e
Author: Gary V. Vaughan <address@hidden>
Date:   Tue Jan 7 14:16:34 2014 +1300

    bootstrap: specify particular version in buildreq with =x.y.
    
    * gl/build-aux/bootstrap.in (func_check_versions): If the version
    number begins with '=' then it must match the installed version of
    the named tool exactly.
    * gl/doc/bootstrap.texi (buildreq): Document the '=vernum' feature.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 bootstrap                 |   26 ++++++++++++++++++++------
 gl/build-aux/bootstrap.in |   26 ++++++++++++++++++++------
 gl/doc/bootstrap.texi     |    5 +++++
 3 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/bootstrap b/bootstrap
index b5b6730..4ca10e4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4805,9 +4805,6 @@ delimited list of triples; 'program min-version url'."
       else
         _G_instver=`func_get_version $_G_app`
 
-        test -z "$_G_instver" \
-            || func_verbose "found '$_G_app' version $_G_instver."
-
         # Fail if --version didn't work.
         if test -z "$_G_instver"; then
           func_error "Prerequisite '$_G_app' not found. Please install it, or
@@ -4816,12 +4813,29 @@ delimited list of triples; 'program min-version url'."
 
         # Fail if a newer version than what we have is required.
         else
-          func_lt_ver "$_G_reqver" "$_G_instver" || {
-            func_error "\
+          func_verbose "found '$_G_app' version $_G_instver."
+
+         case $_G_reqver in
+            =*)
+              # If $buildreq version starts with '=', version must
+             # match the installed program exactly.
+             test "x$_G_reqver" = "x=$_G_instver" || {
+               func_error "\
+  '$_G_app' version == $_G_instver is too old
+  'exactly $_G_app-$_G_reqver is required"
+                func_check_versions_result=false
+              }
+             ;;
+           *)
+              # Otherwise, anything that is not older is a match.
+              func_lt_ver "$_G_reqver" "$_G_instver" || {
+                func_error "\
   '$_G_app' version == $_G_instver is too old
   '$_G_app' version >= $_G_reqver is required"
             func_check_versions_result=false
-          }
+              }
+             ;;
+         esac
         fi
       fi
     done
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 7fc0c12..71ff3ae 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -2474,9 +2474,6 @@ delimited list of triples; 'program min-version url'."
       else
         _G_instver=`func_get_version $_G_app`
 
-        test -z "$_G_instver" \
-            || func_verbose "found '$_G_app' version $_G_instver."
-
         # Fail if --version didn't work.
         if test -z "$_G_instver"; then
           func_error "Prerequisite '$_G_app' not found. Please install it, or
@@ -2485,12 +2482,29 @@ delimited list of triples; 'program min-version url'."
 
         # Fail if a newer version than what we have is required.
         else
-          func_lt_ver "$_G_reqver" "$_G_instver" || {
-            func_error "\
+          func_verbose "found '$_G_app' version $_G_instver."
+
+         case $_G_reqver in
+            =*)
+              # If $buildreq version starts with '=', version must
+             # match the installed program exactly.
+             test "x$_G_reqver" = "x=$_G_instver" || {
+               func_error "\
+  '$_G_app' version == $_G_instver is too old
+  'exactly $_G_app-$_G_reqver is required"
+                func_check_versions_result=false
+              }
+             ;;
+           *)
+              # Otherwise, anything that is not older is a match.
+              func_lt_ver "$_G_reqver" "$_G_instver" || {
+                func_error "\
   '$_G_app' version == $_G_instver is too old
   '$_G_app' version >= $_G_reqver is required"
             func_check_versions_result=false
-          }
+              }
+             ;;
+         esac
         fi
       fi
     done
diff --git a/gl/doc/bootstrap.texi b/gl/doc/bootstrap.texi
index a457931..2f7b382 100755
--- a/gl/doc/bootstrap.texi
+++ b/gl/doc/bootstrap.texi
@@ -82,6 +82,11 @@ requirement for Autobuild is added automatically, and 
finally if there
 are any diff files under @code{local_gl_dir}, then a versionless
 requirement for patch is also added.
 
+When there are backwards incompatibilities in a newer build-tool
+release, you can pin the version requirement for your program by
+prefixing the version number field in buildreq with a single '='
+character (no spaces).
+
 When @command{bootstrap} is invoked, it will check that all the listed
 and automatically added tools are available at the given minimum version,
 or else bail out with a diagnostic.


hooks/post-receive
-- 
GNU Libtool