From 9299411fe170f5d896a64cef00911891c78c3a4b Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Mon, 27 Oct 2014 17:59:20 +0000 Subject: bootstrap: sync with upstream. * gl/build-aux/bootstrap.in, gl/build-aux/funclib.sh: Sync with upstream. * bootstrap: Regenerate. Signed-off-by: Gary V. Vaughan --- bootstrap | 10 +++++----- gl/build-aux/bootstrap.in | 6 +++--- gl/build-aux/funclib.sh | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bootstrap b/bootstrap index 755ed8b9..0d9b1523 100755 --- a/bootstrap +++ b/bootstrap @@ -230,7 +230,7 @@ vc_ignore= # Source required external libraries: # Set a version string for this script. -scriptversion=2014-02-10.13; # UTC +scriptversion=2014-01-03.01; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 @@ -1499,7 +1499,7 @@ func_warning () # ----------------------- # '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-p12a < 1.4-p3a +# 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 @@ -2563,7 +2563,7 @@ test extract-trace = "$progname" && func_main "$@" # End: # Set a version string for *this* script. -scriptversion=2014-01-27.02; # UTC +scriptversion=2014-10-19.23; # UTC ## ------------------- ## @@ -3916,8 +3916,8 @@ func_require_gnulib_submodule () fi # Make sure we've checked out the correct revision of gnulib. - func_show_eval "$GIT submodule init" \ - && func_show_eval "$GIT submodule update" \ + func_show_eval "$GIT submodule init -- $gnulib_path" \ + && func_show_eval "$GIT submodule update -- $gnulib_path" \ || func_fatal_error "Unable to update gnulib submodule." fi diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in index 266eb20d..bf3ba9ba 100755 --- a/gl/build-aux/bootstrap.in +++ b/gl/build-aux/bootstrap.in @@ -232,7 +232,7 @@ vc_ignore= . `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace" # Set a version string for *this* script. -scriptversion=2014-01-27.02; # UTC +scriptversion=2014-10-19.23; # UTC ## ------------------- ## @@ -1585,8 +1585,8 @@ func_require_gnulib_submodule () fi # Make sure we've checked out the correct revision of gnulib. - func_show_eval "$GIT submodule init" \ - && func_show_eval "$GIT submodule update" \ + func_show_eval "$GIT submodule init -- $gnulib_path" \ + && func_show_eval "$GIT submodule update -- $gnulib_path" \ || func_fatal_error "Unable to update gnulib submodule." fi diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh index fe535052..9cb02ff6 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=2014-02-10.13; # UTC +scriptversion=2014-01-03.01; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 @@ -1268,7 +1268,7 @@ func_warning () # ----------------------- # '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-p12a < 1.4-p3a +# 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 -- cgit v1.2.1