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 <gary@gnu.org>

diff --git a/bootstrap b/bootstrap
index 80b1887f06ed55989b24d7fa36fbee9dae00ac83..cffb1101c7091ed41d18a0027d83617c1856f11d 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -2203,7 +2203,7 @@ test extract-trace = "$progname" && func_main "$@"
 # End:
 
 # Set a version string for *this* script.
-scriptversion=2013-08-23.19; # 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.
@@ -4625,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
@@ -4635,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
 }

diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index b2291be4667e4d0115255af59da00038071a7257..fe7f383e7e7548f87ae280a539730f9d08badcf8 100755 (executable)
--- 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-23.19; # 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.