[SCM] GNU Libtool branch, master, updated. v2.4.2-416-gc2e13d8

[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  c2e13d8030bb6a81dae2de4c2b6f7734ff150227 (commit)
       via  60a8f165b5a0461b2e2f2661baa4eaa3f445637b (commit)
      from  e693c9ac96a19dc5ca01ec3520ab18d1d3342e95 (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 c2e13d8030bb6a81dae2de4c2b6f7734ff150227
Author: Gary V. Vaughan <address@hidden>
Date:   Sat Oct 26 15:44:46 2013 +1300

    gnulib: use func_sort_ver instead of GNU sort -V in 
do-release-commit-and-tag.
    
    * gl/build-aux/do-release-commit-and-tag: Source funclib.sh and
    then use portable func_sort_ver rather than force installation of
    all GNU coreutils just for sort -V support.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 60a8f165b5a0461b2e2f2661baa4eaa3f445637b
Author: Gary V. Vaughan <address@hidden>
Date:   Sat Oct 26 15:33:07 2013 +1300

    refactor: move func_sort_ver from bootstrap.in to funclib.sh.
    
    * gl/build-aux/bootstrap.in (func_sort_ver): Move from here...
    * gl/build-aux/funclib.sh (func_sort_ver): ...to here.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 bootstrap                                   |   94 +++++++++++++-------------
 gl/build-aux/bootstrap.in                   |   47 -------------
 gl/build-aux/do-release-commit-and-tag.diff |   36 ++++++-----
 gl/build-aux/funclib.sh                     |   47 +++++++++++++
 4 files changed, 114 insertions(+), 110 deletions(-)

diff --git a/bootstrap b/bootstrap
index 2ad3eb9..83171b5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1166,6 +1166,53 @@ func_warning ()
 }
 
 
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    ver1=$1
+    ver2=$2
+
+    # Split on '.' and compare each component.
+    i=1
+    while :; do
+      p1=`echo "$ver1" |cut -d. -f$i`
+      p2=`echo "$ver2" |cut -d. -f$i`
+      if test ! "$p1"; then
+        echo "$1 $2"
+        break
+      elif test ! "$p2"; then
+        echo "$2 $1"
+        break
+      elif test ! "$p1" = "$p2"; then
+        if test "$p1" -gt "$p2" 2>/dev/null; then # numeric comparison
+          echo "$2 $1"
+        elif test "$p2" -gt "$p1" 2>/dev/null; then # numeric comparison
+          echo "$1 $2"
+        else # numeric, then lexicographic comparison
+          lp=`printf "$p1\n$p2\n" |sort -n |tail -n1`
+          if test "$lp" = "$p2"; then
+            echo "$1 $2"
+          else
+            echo "$2 $1"
+          fi
+        fi
+        break
+      fi
+      i=`expr $i + 1`
+    done
+}
+
+
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2
@@ -4490,53 +4537,6 @@ func_insert_if_absent ()
 }
 
 
-# func_sort_ver VER1 VER2
-# -----------------------
-# 'sort -V' is not generally available.
-# Note this deviates from the version comparison in automake
-# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
-# but this should suffice as we won't be specifying old
-# version formats or redundant trailing .0 in bootstrap.conf.
-# If we did want full compatibility then we should probably
-# use m4_version_compare from autoconf.
-func_sort_ver ()
-{
-    $debug_cmd
-
-    ver1=$1
-    ver2=$2
-
-    # Split on '.' and compare each component.
-    i=1
-    while :; do
-      p1=`echo "$ver1" |cut -d. -f$i`
-      p2=`echo "$ver2" |cut -d. -f$i`
-      if test ! "$p1"; then
-        echo "$1 $2"
-        break
-      elif test ! "$p2"; then
-        echo "$2 $1"
-        break
-      elif test ! "$p1" = "$p2"; then
-        if test "$p1" -gt "$p2" 2>/dev/null; then # numeric comparison
-          echo "$2 $1"
-        elif test "$p2" -gt "$p1" 2>/dev/null; then # numeric comparison
-          echo "$1 $2"
-        else # numeric, then lexicographic comparison
-          lp=`printf "$p1\n$p2\n" |sort -n |tail -n1`
-          if test "$lp" = "$p2"; then
-            echo "$1 $2"
-          else
-            echo "$2 $1"
-          fi
-        fi
-        break
-      fi
-      i=`expr $i + 1`
-    done
-}
-
-
 # func_get_version APP
 # --------------------
 # echo the version number (if any) of APP, which is looked up along your
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 6463a6c..3362d45 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -2300,53 +2300,6 @@ func_insert_if_absent ()
 }
 
 
-# func_sort_ver VER1 VER2
-# -----------------------
-# 'sort -V' is not generally available.
-# Note this deviates from the version comparison in automake
-# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
-# but this should suffice as we won't be specifying old
-# version formats or redundant trailing .0 in bootstrap.conf.
-# If we did want full compatibility then we should probably
-# use m4_version_compare from autoconf.
-func_sort_ver ()
-{
-    $debug_cmd
-
-    ver1=$1
-    ver2=$2
-
-    # Split on '.' and compare each component.
-    i=1
-    while :; do
-      p1=`echo "$ver1" |cut -d. -f$i`
-      p2=`echo "$ver2" |cut -d. -f$i`
-      if test ! "$p1"; then
-        echo "$1 $2"
-        break
-      elif test ! "$p2"; then
-        echo "$2 $1"
-        break
-      elif test ! "$p1" = "$p2"; then
-        if test "$p1" -gt "$p2" 2>/dev/null; then # numeric comparison
-          echo "$2 $1"
-        elif test "$p2" -gt "$p1" 2>/dev/null; then # numeric comparison
-          echo "$1 $2"
-        else # numeric, then lexicographic comparison
-          lp=`printf "$p1\n$p2\n" |sort -n |tail -n1`
-          if test "$lp" = "$p2"; then
-            echo "$1 $2"
-          else
-            echo "$2 $1"
-          fi
-        fi
-        break
-      fi
-      i=`expr $i + 1`
-    done
-}
-
-
 # func_get_version APP
 # --------------------
 # echo the version number (if any) of APP, which is looked up along your
diff --git a/gl/build-aux/do-release-commit-and-tag.diff 
b/gl/build-aux/do-release-commit-and-tag.diff
index 0496bed..ad1b409 100644
--- a/gl/build-aux/do-release-commit-and-tag.diff
+++ b/gl/build-aux/do-release-commit-and-tag.diff
@@ -1,22 +1,26 @@
---- gnulib/build-aux/do-release-commit-and-tag 2012-09-16 10:56:58.000000000 
+0700
-+++ gl/build-aux/do-release-commit-and-tag     2012-09-16 11:01:14.000000000 
+0700
-@@ -86,6 +86,10 @@
- branch=$(git branch | sed -ne '/^\* /{s///;p;q;}')
- builddir=.
+--- gnulib/build-aux/do-release-commit-and-tag 2013-01-26 16:46:26.000000000 
+1300
++++ gl/build-aux/do-release-commit-and-tag     2013-10-26 15:42:36.000000000 
+1300
+@@ -5,6 +5,9 @@
+ # will serve to identify the release, so apply a signed tag to it as well.
+ VERSION=2012-08-01.09 # UTC
  
-+for gsort in $SORT gsort sort; do
-+  echo 1|$gsort -V >/dev/null 2>/dev/null && break
-+done
++# Make sure we've evaluated scripts we depend on.
++test -z "$progpath" && . `echo "$0" |${SED-sed} 's|[^/]*$||'`/funclib.sh
 +
- while test $# != 0
- do
-   # Handle --option=value by splitting apart and putting back on argv.
-@@ -125,7 +129,7 @@
+ # Note: this is a bash script (could be zsh or dash)
+ 
+ # Copyright (C) 2009-2013 Free Software Foundation, Inc.
+@@ -125,10 +128,9 @@
    || die 'failed to determine previous version number from .prev-version'
  
  # Verify that $ver is sensible (> .prev-version).
 -case $(printf "$prev_ver\n$ver\n"|sort -V -u|tr '\n' ':') in
-+case $(printf "$prev_ver\n$ver\n"|$gsort -V -u|tr '\n' ':') in
-   "$prev_ver:$ver:") ;;
-   *) die "invalid version: $ver (<= $prev_ver)";;
- esac
+-  "$prev_ver:$ver:") ;;
+-  *) die "invalid version: $ver (<= $prev_ver)";;
+-esac
++newer_ver=$(func_sort_ver $prev_ver $ver |cut -d' ' -f2)
++test "$newer_ver" != "$ver" && \
++  die "invalid version: $ver (<= $prev_ver)"
+ 
+ case $type in
+   alpha|beta|stable) ;;
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
index fbaa8d0..2f27d77 100644
--- a/gl/build-aux/funclib.sh
+++ b/gl/build-aux/funclib.sh
@@ -1156,6 +1156,53 @@ func_warning ()
 }
 
 
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    ver1=$1
+    ver2=$2
+
+    # Split on '.' and compare each component.
+    i=1
+    while :; do
+      p1=`echo "$ver1" |cut -d. -f$i`
+      p2=`echo "$ver2" |cut -d. -f$i`
+      if test ! "$p1"; then
+        echo "$1 $2"
+        break
+      elif test ! "$p2"; then
+        echo "$2 $1"
+        break
+      elif test ! "$p1" = "$p2"; then
+        if test "$p1" -gt "$p2" 2>/dev/null; then # numeric comparison
+          echo "$2 $1"
+        elif test "$p2" -gt "$p1" 2>/dev/null; then # numeric comparison
+          echo "$1 $2"
+        else # numeric, then lexicographic comparison
+          lp=`printf "$p1\n$p2\n" |sort -n |tail -n1`
+          if test "$lp" = "$p2"; then
+            echo "$1 $2"
+          else
+            echo "$2 $1"
+          fi
+        fi
+        break
+      fi
+      i=`expr $i + 1`
+    done
+}
+
+
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2


hooks/post-receive
-- 
GNU Libtool