[SCM] GNU Libtool branch, master, updated. v2.4.2-395-g2d744d9

[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  2d744d9edab9819e15942d20e2f11fad14d8cbbb (commit)
      from  96d876301b0b1423e8192b6e54eba6a88569d14f (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 2d744d9edab9819e15942d20e2f11fad14d8cbbb
Author: Gary V. Vaughan <address@hidden>
Date:   Sun Sep 15 20:35:15 2013 +0700

    bootstrap: make ensure_changelog work for update mode projects.
    
    * gl/build-aux/bootstrap.in (func_bootstrap): Move
    func_changelog_ensure invocation from here...
    (func_reconfigure): ...to here. If gnulib_modules is empty, then
    grep gnulib-cache.m4 for gitlog-to-changelog before invoking
    func_changelog_ensure.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 bootstrap                 |   17 +++++++++++++----
 gl/build-aux/bootstrap.in |   17 +++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/bootstrap b/bootstrap
index e123a8b..803380a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2461,10 +2461,6 @@ func_bootstrap ()
     # Post-option preparation.
     func_prep
 
-    # Ensure ChangeLog presence.
-    func_ifcontains "$gnulib_modules" gitlog-to-changelog \
-      func_ensure_changelog
-
     # Reconfigure the package.
     func_reconfigure
 
@@ -2545,6 +2541,19 @@ func_reconfigure ()
 {
     $debug_cmd
 
+    # Ensure ChangeLog presence.
+    if test -n "$gnulib_modules"; then
+      func_ifcontains "$gnulib_modules" gitlog-to-changelog \
+        func_ensure_changelog
+    else
+      $require_gnulib_cache
+      if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache |
+         func_grep_q gitlog-to-changelog
+      then
+        func_ensure_changelog
+      fi
+    fi
+
     # Released 'autopoint' has the tendency to install macros that have
     # been obsoleted in current 'gnulib., so run this before 'gnulib-tool'.
     func_autopoint
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index e58cde5..550a642 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -271,10 +271,6 @@ func_bootstrap ()
     # Post-option preparation.
     func_prep
 
-    # Ensure ChangeLog presence.
-    func_ifcontains "$gnulib_modules" gitlog-to-changelog \
-      func_ensure_changelog
-
     # Reconfigure the package.
     func_reconfigure
 
@@ -355,6 +351,19 @@ func_reconfigure ()
 {
     $debug_cmd
 
+    # Ensure ChangeLog presence.
+    if test -n "$gnulib_modules"; then
+      func_ifcontains "$gnulib_modules" gitlog-to-changelog \
+        func_ensure_changelog
+    else
+      $require_gnulib_cache
+      if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache |
+         func_grep_q gitlog-to-changelog
+      then
+        func_ensure_changelog
+      fi
+    fi
+
     # Released 'autopoint' has the tendency to install macros that have
     # been obsoleted in current 'gnulib., so run this before 'gnulib-tool'.
     func_autopoint


hooks/post-receive
-- 
GNU Libtool