bootstrap: update bootstrap script to latest upstream.

* bootstrap, build-aux/options-parser: apply upstream fixes and
enhancements.

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

1 files changed, 13 insertions, 7 deletions

diff --git a/bootstrap b/bootstrap
index 8e36780c..19b29370 100755
--- a/bootstrap
+++ b/bootstrap
@@ -134,7 +134,6 @@ gnulib_modules=
 gnulib_non_module_files="
         build-aux/compile
         build-aux/install-sh
-        build-aux/missing
         build-aux/mdate-sh
         build-aux/texinfo.tex
         build-aux/depcomp
@@ -428,10 +427,10 @@ func_gnulib_tool ()
       gnulib_cmd=`echo $gnulib_tool $gnulib_tool_options`
 
       func_show_eval "$gnulib_cmd" 'exit $?'
-    }
 
-    # Use `gnulib-tool --copy-file' to install non-module files.
-    func_install_gnulib_non_module_files
+      # Use `gnulib-tool --copy-file' to install non-module files.
+      func_install_gnulib_non_module_files
+    }
 
     func_run_hooks func_gnulib_tool
 }
@@ -601,12 +600,18 @@ func_install_gnulib_non_module_files ()
         case $file in
           */COPYING*) dest=COPYING;;
           */INSTALL) dest=INSTALL;;
+	  build-aux/missing) dest=
+            func_warning settings "\
+Please remove build-aux/missing from gnulib_module_files in
+\`bootstrap.conf', as it may clash with Automake's version."
+            ;;
           build-aux/*) dest=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
           *) dest=$file;;
         esac
 
         # Be sure to show all copying errors before bailing out
-	func_gnulib_tool_copy_file "$file" "$dest" \
+	test -z "$dest" \
+	    || func_gnulib_tool_copy_file "$file" "$dest" \
 	    || maybe_exit_cmd="exit $EXIT_FAILURE"
       done
 
@@ -1257,7 +1262,7 @@ func_require_gnulib_merge_changelog ()
     test -f ChangeLog && {
       $require_git
 
-      test true = "$GIT" || {
+      func_grep_q '^\(/\|\)ChangeLog$' .gitignore || test true = "$GIT" || {
         if $GIT config merge.merge-changelog.driver >/dev/null ; then
           :
         elif (git-merge-changelog --version) >/dev/null 2>&1 ; then
@@ -2380,7 +2385,7 @@ bootstrap_options_prep ()
 {
     $debug_cmd
 
-    warning_func=func_error
+    warning_func=func_warn
 
     # Option defaults:
     opt_copy=${copy-'false'}
@@ -2495,6 +2500,7 @@ bootstrap_validate_options ()
     func_quote_for_eval ${1+"$@"}
     bootstrap_validate_options_result=$func_quote_for_eval_result
 }
+func_add_hook func_validate_options bootstrap_validate_options
 
 
 ## -------------------------------------------------- ##