[SCM] GNU Libtool branch, master, updated. v2.4.2-390-gd1ddb6f

[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  d1ddb6fbbf5f25e0cac740662631d40110a6d4d3 (commit)
       via  c5d20a6dbcc867cec4bcd31f91ed52c71e4da36b (commit)
       via  a4a814cdafbaab983eafa4cd7df5ec849106f211 (commit)
       via  049be0146e67fa9fde5c97ae87f4575752199649 (commit)
       via  4306ce7329ce6caa6f7c314272defa663f3f2f72 (commit)
       via  a7362377480154556b308e29bf97bf1760138879 (commit)
       via  552c17f7b475b0517d5536182d895a7d8acb9647 (commit)
      from  5f7f7d9615bf650cf99d581a33b3e18357f79951 (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 d1ddb6fbbf5f25e0cac740662631d40110a6d4d3
Author: Alan Modra <address@hidden>
Date:   Fri Aug 23 20:36:32 2013 +0700

    bootstrap: make first char of IFS a space.
    
    Putting tab first in IFS breaks func_echo_all usage of $*,
    resulting in failure of func_infer_tag to match a command line
    using a $CC with trailing spaces. The trailing spaces were
    stripped out of CC_expanded but words in $CC were separated by
    tabs. This didn't match the makefile expansion of $CC using the
    standard IFS with a first char of space.
    * gl/build-aux/funclib.sh (IFS): Make first char a space.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit c5d20a6dbcc867cec4bcd31f91ed52c71e4da36b
Author: Gary V. Vaughan <address@hidden>
Date:   Fri Aug 23 20:28:25 2013 +0700

    bootstrap: support --no-git and --no-po options.
    
    * gl/build-aux/bootstrap.in (bootstrap_parse_options): Accept
    --no-git as an alias for --skip-git for compatibility with gnulib
    bootstrap, and --no-po for symmetry.
    Reported by Mike Miller.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit a4a814cdafbaab983eafa4cd7df5ec849106f211
Author: Gary V. Vaughan <address@hidden>
Date:   Fri Aug 23 20:17:50 2013 +0700

    bootstrap: support gnulib gnulib_tool_option_extras settings.
    
    * gl/build-aux/bootstrap.in (func_gnulib_tool): Even though we
    don't need it, support gnulib_tool_option_extras for bootstrap.conf
    ported from gnulib bootstrap.
    * bootstrap: Regenerate.
    Reported by Mike Miller.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 049be0146e67fa9fde5c97ae87f4575752199649
Author: Gary V. Vaughan <address@hidden>
Date:   Fri Aug 23 19:55:27 2013 +0700

    bootstrap: support sha1 binary on OpenBSD.
    
    * gl/build-aux/bootstrap.in (func_update_po_files): Remove the
    use of --status in a way that will suppress all error messages,
    but since this is only used to minimize updates, it shouldn't
    cause an issue.
    Look for a sha1 binary if the other SHA1SUM settings are not
    found.
    Also exit early if there is a problem updating the po file
    checksums.
    * bootstrap: Regenerate.
    Ported from a gnulib patch by Padraig Brady.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 4306ce7329ce6caa6f7c314272defa663f3f2f72
Author: Gary V. Vaughan <address@hidden>
Date:   Fri Aug 23 17:23:29 2013 +0700

    bootstrap: support tools that don't accept '--version' in buildreq.
    
    * gl/build-aux/bootstrap.in (func_check_tool): Check whether there
    is an executable as given or on the command PATH.
    (func_check_version): Use func_check_tool to avoid invoking --version
    when buildreq specifies '-' for the version number.
    * bootstrap: Regenerate.
    Reported by Mike Miller.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit a7362377480154556b308e29bf97bf1760138879
Author: Gary V. Vaughan <address@hidden>
Date:   Fri Aug 23 16:27:31 2013 +0700

    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 <address@hidden>

commit 552c17f7b475b0517d5536182d895a7d8acb9647
Author: Gary V. Vaughan <address@hidden>
Date:   Fri Aug 23 15:59:46 2013 +0700

    bootstrap: support OpenBSD sed.
    
    * gl/build-aux/bootstrap.in (func_insert_if_absent): Work around
    the problem of OpenBSD sed not supporting '-' as a notation for
    standard input.
    * bootstrap: Regenerate.
    * THANKS: Add Mike Miller.
    Reported by Mike Miller.
    
    Copyright-paperwork-exempt: Yes
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 THANKS                    |    1 +
 bootstrap                 |  120 ++++++++++++++++++++++++++++++++++-----------
 gl/build-aux/bootstrap.in |  116 +++++++++++++++++++++++++++++++++----------
 gl/build-aux/funclib.sh   |    4 +-
 4 files changed, 183 insertions(+), 58 deletions(-)

diff --git a/THANKS b/THANKS
index d6f9153..f49e5d9 100644
--- a/THANKS
+++ b/THANKS
@@ -148,6 +148,7 @@
   Michael Haubenwallner                address@hidden
   Mike Gorchak                 address@hidden
   Mike Frysinger               address@hidden
+  Mike Miller                  address@hidden
   Nix                          address@hidden
   Olaf Lenz                    address@hidden
   Olly Betts                   address@hidden
diff --git a/bootstrap b/bootstrap
index 2a70cb5..006cde3 100755
--- a/bootstrap
+++ b/bootstrap
@@ -9,7 +9,7 @@
 
 # Source required external libraries:
 # Set a version string for this script.
-scriptversion=2013-08-22.10; # UTC
+scriptversion=2013-08-23.20; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
@@ -92,7 +92,7 @@ done
 sp=' '
 nl='
 '
-IFS="  $sp$nl"
+IFS="$sp       $nl"
 
 # There are still modern systems that have problems with 'echo' mis-
 # handling backslashes, among others, so make sure $bs_echo is set to a
@@ -2203,7 +2203,7 @@ test extract-trace = "$progname" && func_main "$@"
 # End:
 
 # Set a version string for *this* script.
-scriptversion=2013-08-22.10; # UTC
+scriptversion=2013-08-23.20; # UTC
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -2586,6 +2586,13 @@ func_gnulib_tool ()
     $require_libtoolize
 
     test true = "$gnulib_tool" || {
+      # bootstrap.conf written for gnulib bootstrap expects
+      # gnulib_tool_option_extras to which --no-changelog is appended,
+      # but libtool bootstrap expects you to append to gnulib_tool_options
+      # so that you can override the --no-changelog default: make sure we
+      # support both styles so users can migrate between them easily.
+      gnulib_tool_all_options="$gnulib_tool_options $gnulib_tool_option_extras"
+
       if test -n "$gnulib_modules"; then
         $require_gnulib_cache
         $require_gnulib_tool_base_options
@@ -2595,7 +2602,6 @@ func_gnulib_tool ()
         # Try not to pick up any stale values from 'gnulib-cache.m4'.
         rm -f "$gnulib_cache"
 
-        gnulib_tool_all_options=$gnulib_tool_options
         test -n "$gnulib_tool_base_options" \
             && func_append_uniq gnulib_tool_all_options " 
$gnulib_tool_base_options"
         test -n "$gnulib_mk" \
@@ -2609,8 +2615,6 @@ func_gnulib_tool ()
         # 'gnulib_modules' and others are cached in 'gnulib-cache.m4':
         # Use 'gnulib --update' to fetch gnulib modules.
         gnulib_mode=--update
-
-        gnulib_tool_all_options=$gnulib_tool_options
       fi
 
       # Add a sensible default libtool option to gnulib_tool_options.
@@ -4384,8 +4388,8 @@ func_insert_if_absent ()
           || func_verbose "inserting '$str' into '$file'"
 
       linesold=`func_gitignore_entries "$file" |wc -l`
-      linesnew=`$bs_echo "$str" \
-                |func_gitignore_entries - "$file" |sort -u |wc -l`
+      linesnew=`{ $bs_echo "$str"; cat "$file"; } \
+                |func_gitignore_entries |sort -u |wc -l`
       test "$linesold" -eq "$linesnew" \
         || { sed "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
         || func_permissions_error "$file"
@@ -4479,6 +4483,35 @@ func_get_version ()
 }
 
 
+# func_check_tool APP
+# -------------------
+# Search PATH for an executable at APP.
+func_check_tool ()
+{
+    $debug_cmd
+
+    func_check_tool_result=
+
+    case $1 in
+    *[\\/]*)
+      test -x "$1" && func_check_tool_result=$1
+      ;;
+    *)
+      save_IFS=$IFS
+      IFS=:
+      for _G_check_tool_path in $PATH; do
+        IFS=$save_IFS
+       if test -x "$_G_check_tool_path/$1"; then
+         func_check_tool_result=$_G_check_tool_path/$1
+         break
+       fi
+      done
+      IFS=$save_IFS
+      ;;
+    esac
+}
+
+
 # func_check_versions APP1 VER1 URL1 ...[APPN VERN URLN]
 # ------------------------------------------------------
 func_check_versions ()
@@ -4492,30 +4525,54 @@ 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
       eval "_G_app=\${$_G_appvar-$_G_app}"
-      _G_instver=`func_get_version $_G_app`
 
-      test -z "$_G_instver" \
-          || func_verbose "found '$_G_app' version $_G_instver."
+      # Fail if no version specified, but the program can't be found.
+      if test x- = "x$_G_reqver"; then
+        func_check_tool $_G_app
+       if test -z "$func_check_tool_result"; then
+         func_error "Prerequisite '$_G_app' not not found. Please install it, 
or
+'export $_G_appvar=/path/to/$_G_app'."
+          func_check_versions_result=false
+       else
+         func_verbose "found '$func_check_tool_result' for $_G_appvar."
+       fi
+      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
+        # Fail if --version didn't work.
+        if test -z "$_G_instver"; then
+          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.
-      elif test x- != "x$_G_reqver"; then
-        _G_newer=`func_sort_ver $_G_reqver $_G_instver |cut -d' ' -f2`
-        test "$_G_newer" != "$_G_instver" && {
-          func_error "\
-'$_G_app' version == $_G_instver is too old
-'$_G_app' version >= $_G_reqver is required"
           func_check_versions_result=false
-        }
+
+        # Fail if a newer version than what we have is required.
+        else
+          _G_newer=`func_sort_ver $_G_reqver $_G_instver |cut -d' ' -f2`
+          test "$_G_newer" != "$_G_instver" && {
+            func_error "\
+  '$_G_app' version == $_G_instver is too old
+  '$_G_app' version >= $_G_reqver is required"
+            func_check_versions_result=false
+          }
+        fi
       fi
     done
 }
@@ -4572,7 +4629,7 @@ func_update_po_files ()
          |$SED -e 's|.*/||' -e 's|\.po$||' > "$_G_po_dir/LINGUAS" || return
 
     # Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6+.
-    func_find_tool SHA1SUM sha1sum gsha1sum shasum
+    func_find_tool SHA1SUM sha1sum gsha1sum shasum sha1
 
     _G_langs=`cd $_G_ref_po_dir && echo *.po|$SED 's|\.po||g'`
     test '*' = "$_G_langs" && _G_langs=x
@@ -4582,11 +4639,11 @@ func_update_po_files ()
       _G_cksum_file=$_G_ref_po_dir/$_G_po.s1
       if ! test -f "$_G_cksum_file" ||
           ! test -f "$_G_po_dir/$_G_po.po" ||
-          ! $SHA1SUM -c --status "$_G_cksum_file" \
+          ! $SHA1SUM -c "$_G_cksum_file" \
               < "$_G_new_po" > /dev/null; then
         echo "updated $_G_po_dir/$_G_po.po..."
         cp "$_G_new_po" "$_G_po_dir/$_G_po.po" \
-          && $SHA1SUM < "$_G_new_po" > "$_G_cksum_file"
+          && $SHA1SUM < "$_G_new_po" > "$_G_cksum_file" || return
       fi
     done
 }
@@ -4693,8 +4750,13 @@ bootstrap_parse_options ()
                       shift
                       ;;
 
-        --skip-git)   opt_skip_git=: ;;
-        --skip-po)    opt_skip_po=: ;;
+        --skip-git|--no-git)
+                      opt_skip_git=:
+                      ;;
+
+        --skip-po|--no-po)
+                      opt_skip_po=:
+                      ;;
 
         # Separate non-argument short options:
         -c*|-f*|-n*)
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index ce50d7e..b364cc7 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -13,7 +13,7 @@
 . `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace"
 
 # Set a version string for *this* script.
-scriptversion=2013-08-22.10; # UTC
+scriptversion=2013-08-23.20; # UTC
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -396,6 +396,13 @@ func_gnulib_tool ()
     $require_libtoolize
 
     test true = "$gnulib_tool" || {
+      # bootstrap.conf written for gnulib bootstrap expects
+      # gnulib_tool_option_extras to which --no-changelog is appended,
+      # but libtool bootstrap expects you to append to gnulib_tool_options
+      # so that you can override the --no-changelog default: make sure we
+      # support both styles so users can migrate between them easily.
+      gnulib_tool_all_options="$gnulib_tool_options $gnulib_tool_option_extras"
+
       if test -n "$gnulib_modules"; then
         $require_gnulib_cache
         $require_gnulib_tool_base_options
@@ -405,7 +412,6 @@ func_gnulib_tool ()
         # Try not to pick up any stale values from 'gnulib-cache.m4'.
         rm -f "$gnulib_cache"
 
-        gnulib_tool_all_options=$gnulib_tool_options
         test -n "$gnulib_tool_base_options" \
             && func_append_uniq gnulib_tool_all_options " 
$gnulib_tool_base_options"
         test -n "$gnulib_mk" \
@@ -419,8 +425,6 @@ func_gnulib_tool ()
         # 'gnulib_modules' and others are cached in 'gnulib-cache.m4':
         # Use 'gnulib --update' to fetch gnulib modules.
         gnulib_mode=--update
-
-        gnulib_tool_all_options=$gnulib_tool_options
       fi
 
       # Add a sensible default libtool option to gnulib_tool_options.
@@ -2194,8 +2198,8 @@ func_insert_if_absent ()
           || func_verbose "inserting '$str' into '$file'"
 
       linesold=`func_gitignore_entries "$file" |wc -l`
-      linesnew=`$bs_echo "$str" \
-                |func_gitignore_entries - "$file" |sort -u |wc -l`
+      linesnew=`{ $bs_echo "$str"; cat "$file"; } \
+                |func_gitignore_entries |sort -u |wc -l`
       test "$linesold" -eq "$linesnew" \
         || { sed "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
         || func_permissions_error "$file"
@@ -2289,6 +2293,35 @@ func_get_version ()
 }
 
 
+# func_check_tool APP
+# -------------------
+# Search PATH for an executable at APP.
+func_check_tool ()
+{
+    $debug_cmd
+
+    func_check_tool_result=
+
+    case $1 in
+    *[\\/]*)
+      test -x "$1" && func_check_tool_result=$1
+      ;;
+    *)
+      save_IFS=$IFS
+      IFS=:
+      for _G_check_tool_path in $PATH; do
+        IFS=$save_IFS
+       if test -x "$_G_check_tool_path/$1"; then
+         func_check_tool_result=$_G_check_tool_path/$1
+         break
+       fi
+      done
+      IFS=$save_IFS
+      ;;
+    esac
+}
+
+
 # func_check_versions APP1 VER1 URL1 ...[APPN VERN URLN]
 # ------------------------------------------------------
 func_check_versions ()
@@ -2302,30 +2335,54 @@ 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
       eval "_G_app=\${$_G_appvar-$_G_app}"
-      _G_instver=`func_get_version $_G_app`
 
-      test -z "$_G_instver" \
-          || func_verbose "found '$_G_app' version $_G_instver."
+      # Fail if no version specified, but the program can't be found.
+      if test x- = "x$_G_reqver"; then
+        func_check_tool $_G_app
+       if test -z "$func_check_tool_result"; then
+         func_error "Prerequisite '$_G_app' not not found. Please install it, 
or
+'export $_G_appvar=/path/to/$_G_app'."
+          func_check_versions_result=false
+       else
+         func_verbose "found '$func_check_tool_result' for $_G_appvar."
+       fi
+      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
+        # Fail if --version didn't work.
+        if test -z "$_G_instver"; then
+          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.
-      elif test x- != "x$_G_reqver"; then
-        _G_newer=`func_sort_ver $_G_reqver $_G_instver |cut -d' ' -f2`
-        test "$_G_newer" != "$_G_instver" && {
-          func_error "\
-'$_G_app' version == $_G_instver is too old
-'$_G_app' version >= $_G_reqver is required"
           func_check_versions_result=false
-        }
+
+        # Fail if a newer version than what we have is required.
+        else
+          _G_newer=`func_sort_ver $_G_reqver $_G_instver |cut -d' ' -f2`
+          test "$_G_newer" != "$_G_instver" && {
+            func_error "\
+  '$_G_app' version == $_G_instver is too old
+  '$_G_app' version >= $_G_reqver is required"
+            func_check_versions_result=false
+          }
+        fi
       fi
     done
 }
@@ -2382,7 +2439,7 @@ func_update_po_files ()
          |$SED -e 's|.*/||' -e 's|\.po$||' > "$_G_po_dir/LINGUAS" || return
 
     # Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6+.
-    func_find_tool SHA1SUM sha1sum gsha1sum shasum
+    func_find_tool SHA1SUM sha1sum gsha1sum shasum sha1
 
     _G_langs=`cd $_G_ref_po_dir && echo *.po|$SED 's|\.po||g'`
     test '*' = "$_G_langs" && _G_langs=x
@@ -2392,11 +2449,11 @@ func_update_po_files ()
       _G_cksum_file=$_G_ref_po_dir/$_G_po.s1
       if ! test -f "$_G_cksum_file" ||
           ! test -f "$_G_po_dir/$_G_po.po" ||
-          ! $SHA1SUM -c --status "$_G_cksum_file" \
+          ! $SHA1SUM -c "$_G_cksum_file" \
               < "$_G_new_po" > /dev/null; then
         echo "updated $_G_po_dir/$_G_po.po..."
         cp "$_G_new_po" "$_G_po_dir/$_G_po.po" \
-          && $SHA1SUM < "$_G_new_po" > "$_G_cksum_file"
+          && $SHA1SUM < "$_G_new_po" > "$_G_cksum_file" || return
       fi
     done
 }
@@ -2503,8 +2560,13 @@ bootstrap_parse_options ()
                       shift
                       ;;
 
-        --skip-git)   opt_skip_git=: ;;
-        --skip-po)    opt_skip_po=: ;;
+        --skip-git|--no-git)
+                      opt_skip_git=:
+                      ;;
+
+        --skip-po|--no-po)
+                      opt_skip_po=:
+                      ;;
 
         # Separate non-argument short options:
         -c*|-f*|-n*)
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
index 3594107..fbaa8d0 100644
--- a/gl/build-aux/funclib.sh
+++ b/gl/build-aux/funclib.sh
@@ -1,5 +1,5 @@
 # Set a version string for this script.
-scriptversion=2013-08-22.10; # UTC
+scriptversion=2013-08-23.20; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
@@ -82,7 +82,7 @@ done
 sp=' '
 nl='
 '
-IFS="  $sp$nl"
+IFS="$sp       $nl"
 
 # There are still modern systems that have problems with 'echo' mis-
 # handling backslashes, among others, so make sure $bs_echo is set to a


hooks/post-receive
-- 
GNU Libtool