[SCM] GNU Libtool branch, master, updated. v2.4.2-336-gcdd7f33

[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  cdd7f33f06e5864fdf0d13731398f5021e285647 (commit)
       via  7bbf8236dd9ba78c6237b6b1989744060f52fe51 (commit)
       via  90152bb184f1ff60ebb510189371a1a06f1c2b4f (commit)
      from  b7679c7c564582cfb8bf8a88436d1cd58d6c384b (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 cdd7f33f06e5864fdf0d13731398f5021e285647
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Oct 25 14:00:09 2012 +0000

    bootstrap: be sure to register gnulib submodule.
    
    * gl/build-aux/bootstrap.in (require_gnulib_submodule): Register
    the gnulib submodule before updating it, even with a shallow
    clone of gnulib.
    * bootstrap: Regenerate.
    Reported by Robert Boehne.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 7bbf8236dd9ba78c6237b6b1989744060f52fe51
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Oct 25 13:40:57 2012 +0000

    bootstrap: fix a typo in a find invocation.
    
    * gl/build-aux/bootstrap.in (require_buildreq_patch): Fix a typo.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 90152bb184f1ff60ebb510189371a1a06f1c2b4f
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Oct 25 12:31:20 2012 +0000

    bootstrap: bash versions 3.00.x do not have += functionality.
    
    * gl/build-aux/funclib.sh: Fix a typo in fork minimisation for
    bash versions 3.00.x.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 bootstrap                 |   17 ++++++++---------
 gl/build-aux/bootstrap.in |   15 +++++++--------
 gl/build-aux/funclib.sh   |    2 +-
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/bootstrap b/bootstrap
index f6dd4e5..d9fc979 100755
--- a/bootstrap
+++ b/bootstrap
@@ -374,7 +374,7 @@ func_require_term_colors ()
     : ${_G_HAVE_XSI_OPS="yes"}
     # The += operator was introduced in bash 3.1
     case $BASH_VERSION in
-      [12].* | 3.0 | 3.0.*) ;;
+      [12].* | 3.0 | 3.0*) ;;
       *)
         : ${_G_HAVE_PLUSEQ_OP="yes"}
         ;;
@@ -3340,7 +3340,7 @@ func_require_buildreq_patch ()
       # The ugly find invocation is necessary to exit with non-zero
       # status for old find binaries that don't support -exec fully.
       if test ! -d "$local_gl_dir" \
-          || find "$local_gl_dir" -name *.diff -exec false {} +; then :
+          || find "$local_gl_dir" -name *.diff -exec false {} \; ; then :
       else
           func_append buildreq 'patch - http://www.gnu.org/s/patch
 '
@@ -3621,16 +3621,13 @@ func_require_gnulib_submodule ()
       $require_gnulib_url
 
       if test -f .gitmodules && test -f "$gnulib_path/gnulib-tool"; then
-        func_show_eval "$GIT submodule update" \
-            'func_fatal_error "Unable to update gnulib submodule."'
+        : All present and correct.
 
       elif test -n "$opt_gnulib_srcdir"; then
         # Older git can't clone into an empty directory.
         rmdir "$gnulib_path" 2>/dev/null
         func_show_eval "$GIT clone --reference '$opt_gnulib_srcdir' \
                 '$gnulib_url' '$gnulib_path'" \
-            && func_show_eval "$GIT submodule init" \
-            && func_show_eval "$GIT submodule update" \
             || func_fatal_error "Unable to fetch gnulib submodule."
 
       # Without --gnulib-srcdir, and no existing checked out submodule, we
@@ -3645,13 +3642,15 @@ func_require_gnulib_submodule ()
         func_show_eval "$GIT clone $shallow '$gnulib_url' '$gnulib_path'" \
           func_cleanup_gnulib
 
-        func_show_eval "$GIT submodule update" \
-            'func_fatal_error "Unable to update gnulib submodule."'
-
        # FIXME: Solaris /bin/sh will try to execute '-' if any of
        #        these signals are caught after this.
         trap - 1 2 13 15
       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_fatal_error "Unable to update gnulib submodule."
     fi
 
     require_gnulib_submodule=:
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index a0cb11f..7df66b1 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -1150,7 +1150,7 @@ func_require_buildreq_patch ()
       # The ugly find invocation is necessary to exit with non-zero
       # status for old find binaries that don't support -exec fully.
       if test ! -d "$local_gl_dir" \
-          || find "$local_gl_dir" -name *.diff -exec false {} +; then :
+          || find "$local_gl_dir" -name *.diff -exec false {} \; ; then :
       else
           func_append buildreq 'patch - http://www.gnu.org/s/patch
 '
@@ -1431,16 +1431,13 @@ func_require_gnulib_submodule ()
       $require_gnulib_url
 
       if test -f .gitmodules && test -f "$gnulib_path/gnulib-tool"; then
-        func_show_eval "$GIT submodule update" \
-            'func_fatal_error "Unable to update gnulib submodule."'
+        : All present and correct.
 
       elif test -n "$opt_gnulib_srcdir"; then
         # Older git can't clone into an empty directory.
         rmdir "$gnulib_path" 2>/dev/null
         func_show_eval "$GIT clone --reference '$opt_gnulib_srcdir' \
                 '$gnulib_url' '$gnulib_path'" \
-            && func_show_eval "$GIT submodule init" \
-            && func_show_eval "$GIT submodule update" \
             || func_fatal_error "Unable to fetch gnulib submodule."
 
       # Without --gnulib-srcdir, and no existing checked out submodule, we
@@ -1455,13 +1452,15 @@ func_require_gnulib_submodule ()
         func_show_eval "$GIT clone $shallow '$gnulib_url' '$gnulib_path'" \
           func_cleanup_gnulib
 
-        func_show_eval "$GIT submodule update" \
-            'func_fatal_error "Unable to update gnulib submodule."'
-
        # FIXME: Solaris /bin/sh will try to execute '-' if any of
        #        these signals are caught after this.
         trap - 1 2 13 15
       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_fatal_error "Unable to update gnulib submodule."
     fi
 
     require_gnulib_submodule=:
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
index 90f40a5..a470f8d 100644
--- a/gl/build-aux/funclib.sh
+++ b/gl/build-aux/funclib.sh
@@ -364,7 +364,7 @@ func_require_term_colors ()
     : ${_G_HAVE_XSI_OPS="yes"}
     # The += operator was introduced in bash 3.1
     case $BASH_VERSION in
-      [12].* | 3.0 | 3.0.*) ;;
+      [12].* | 3.0 | 3.0*) ;;
       *)
         : ${_G_HAVE_PLUSEQ_OP="yes"}
         ;;


hooks/post-receive
-- 
GNU Libtool