From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 29 Aug 2013 13:44:42 +0000 (+0700)
Subject: bootstrap: gnulib_tool=true means no gnulib submodule.
X-Git-Tag: v2.4.2.418~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebeb8a62cd52a008a666bec1073cbbabb838acaf;p=thirdparty%2Flibtool.git

bootstrap: gnulib_tool=true means no gnulib submodule.

* gl/build-aux/bootstrap.in (func_require_gnulib_tool): No
sneaking off and cloning gnulib when the user already specified
gnulib_tool=true in their bootstrap.conf!
* bootstrap: Regenerate.

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

diff --git a/bootstrap b/bootstrap
index 006cde312..fec6f33e3 100755
--- 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.20; # UTC
+scriptversion=2013-08-29.21; # 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
@@ -3661,9 +3661,8 @@ func_require_gnulib_tool ()
 {
     $debug_cmd
 
-    $require_gnulib_submodule
-
     test true = "$gnulib_tool" || {
+      $require_gnulib_submodule
       $require_gnulib_path
 
       test -n "$gnulib_tool" \
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index b364cc750..4102144d0 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-23.20; # UTC
+scriptversion=2013-08-29.21; # 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
@@ -1471,9 +1471,8 @@ func_require_gnulib_tool ()
 {
     $debug_cmd
 
-    $require_gnulib_submodule
-
     test true = "$gnulib_tool" || {
+      $require_gnulib_submodule
       $require_gnulib_path
 
       test -n "$gnulib_tool" \