[SCM] GNU Libtool branch, master, updated. v2.4.2-138-gf7bd6bd

[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  f7bd6bd9ccc54a061702b66d3fe9da4fdadcd2fc (commit)
       via  ccd0cea1a598f59287e97f2dbc0204f04965d004 (commit)
       via  28471749102ee5c566557525f358c8ca50aa5023 (commit)
       via  083d303cb8e77b5aed0315c65672b2066eb8a696 (commit)
      from  8a59ee7f0acdb83c3df12f47638966675a8af051 (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 f7bd6bd9ccc54a061702b66d3fe9da4fdadcd2fc
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Dec 8 17:38:13 2011 +0700

    tests: s/snippit/snippet/.
    
    * tests/demo/foo.h, tests/pdemo/foo.h: Spell `snippet' correctly.
    Reported by Stefano Lattarini.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit ccd0cea1a598f59287e97f2dbc0204f04965d004
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Dec 8 17:33:28 2011 +0700

    tests: make sure file restore traps are called correctly on AIX.
    
    * tests/demo-noinst-link.test (func_save_files): set the restore
    trap outside a function, otherwise AIX 5.3 /bin/sh will run the
    trap at the end of the function, instead of when the script
    exits.
    * tests/demo-relink.test (func_save_files): Ditto.
    * tests/depdemo-relink.test (func_save_files): Ditto.
    Reported by Stefano Lattarini.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 28471749102ee5c566557525f358c8ca50aa5023
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Dec 8 17:11:45 2011 +0700

    maint: eliminate some more spurious leading Xs.
    
    * m4/libtool.m4: Reverse argument order to eliminate spurious
    leading X's.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 083d303cb8e77b5aed0315c65672b2066eb8a696
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Dec 8 17:09:02 2011 +0700

    bootstrap: put back missing spaces before parens.
    
    * bootstrap (func_require_buildreq_autobuild)
    (func_require_buildreq_automake): Vi's delete word command is
    too greedy and also eats trailing whitespace before following
    non-word-chars. Put back the spaces it ate so that
    syntax-checks pass once again.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 bootstrap                   |    4 ++--
 m4/libtool.m4               |    4 ++--
 tests/demo-noinst-link.test |    5 ++++-
 tests/demo-relink.test      |    4 +++-
 tests/demo/foo.h            |    2 +-
 tests/depdemo-relink.test   |    4 +++-
 tests/pdemo/foo.h           |    2 +-
 7 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/bootstrap b/bootstrap
index 28f85b0..147ac08 100755
--- a/bootstrap
+++ b/bootstrap
@@ -972,7 +972,7 @@ func_require_build_aux ()
 # --------------------------
 # Try to find whether the bootstrap requires autobuild.
 require_buildreq_autobuild=func_require_buildreq_autobuild
-func_require_buildreq_autobuild()
+func_require_buildreq_autobuild ()
 {
     $debug_cmd
 
@@ -1041,7 +1041,7 @@ done
 # Try to find the minimum compatible version of automake required to
 # bootstrap successfully, and add it to `$buildreq'.
 require_buildreq_automake=func_require_buildreq_automake
-func_require_buildreq_automake()
+func_require_buildreq_automake ()
 {
     $debug_cmd
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 0eef323..9c2574f 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -198,7 +198,7 @@ aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
   # reason, if we set the COLLECT_NAMES environment variable, the problems
   # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
+  if test set != "${COLLECT_NAMES+set}"; then
     COLLECT_NAMES=
     export COLLECT_NAMES
   fi
@@ -739,7 +739,7 @@ _LT_EOF
 # AIX sometimes has problems with the GCC collect2 program.  For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
diff --git a/tests/demo-noinst-link.test b/tests/demo-noinst-link.test
index 5e658b0..5654ff9 100755
--- a/tests/demo-noinst-link.test
+++ b/tests/demo-noinst-link.test
@@ -38,13 +38,16 @@ func_save_files ()
     func_mkdir_p "$objdir/temp/libs"
     cp -f libhello.la "hell$EXEEXT" "$objdir/temp"
     cp -f "$objdir"/* "$objdir"/temp/libs
-    trap "func_restore_files" 0 1 2 13 15
 }
 
 func_require "demo-inst" "$prefix/lib/libhello.la"
 
 func_mkprefixdir
 func_cd "tests/demo"
+
+# AIX 5.3 `/bin/sh' will invoke the trap for 0 at the end of a
+# function, so we set the trap outside of a function to be portable.
+trap func_restore_files 0 1 2 13 15
 func_save_files
 
 func_msg "removing \`libhello.la' and \`hell' from demo"
diff --git a/tests/demo-relink.test b/tests/demo-relink.test
index b463441..4b32fba 100755
--- a/tests/demo-relink.test
+++ b/tests/demo-relink.test
@@ -37,7 +37,6 @@ func_save_files ()
     func_mkdir_p "$objdir/temp/libs"
     cp -f libhello.la "$objdir/temp"
     cp -f "$objdir"/libhello.* "$objdir/lt-hell$EXEEXT" "$objdir/temp/libs"
-    trap "func_restore_files" 0 1 2 13 15
 }
 
 func_require "demo-inst" "$prefix/lib/libhello.la"  "tests/demo/libhello.la"
@@ -50,7 +49,10 @@ func_get_config "library_names" "cat libhello.la"
 test -z "$library_names" \
   && func_skip "Exiting: demo/libhello.la is not a shared library"
 
+# AIX 5.3 `/bin/sh' will invoke the trap for 0 at the end of a
+# function, so we set the trap outside of a function to be portable.
 func_save_files
+trap func_restore_files 0 1 2 13 15
 
 func_get_config 'shlibpath_overrides_runpath
 hardcode_action
diff --git a/tests/demo/foo.h b/tests/demo/foo.h
index 5609d8d..9ee7f2e 100644
--- a/tests/demo/foo.h
+++ b/tests/demo/foo.h
@@ -27,7 +27,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 #define _FOO_H_ 1
 
 /* At some point, cygwin will stop defining __CYGWIN32__, but b19 and
- * earlier do not define __CYGWIN__.  This snippit allows us to check
+ * earlier do not define __CYGWIN__.  This snippet allows us to check
  * for __CYGWIN__ reliably for both current, old, and (probable) future
  * releases.
  */
diff --git a/tests/depdemo-relink.test b/tests/depdemo-relink.test
index 382f36c..0d01279 100755
--- a/tests/depdemo-relink.test
+++ b/tests/depdemo-relink.test
@@ -47,7 +47,6 @@ func_save_files ()
       && cp -f "$objdir/depdemo$EXEEXT" "_fnord/temp"
     cp -f l3/libl3.la "_fnord/temp"
     cp -f l3/"$objdir"/* "_fnord/temp/libs"
-    trap "func_restore_files" 0 1 2 13 15
 }
 
 func_require "depdemo-inst" "$prefix/lib/libl3.la"  "tests/depdemo/l3/libl3.la"
@@ -60,6 +59,9 @@ func_get_config "library_names" "cat l3/libl3.la"
 test -z "$library_names" \
   && func_skip "Exiting: depdemo/l3/libl3.la is not a shared library"
 
+# AIX 5.3 `/bin/sh' will invoke the trap for 0 at the end of a
+# function, so we set the trap outside of a function to be portable.
+trap func_restore_files 0 1 2 13 15
 func_save_files
 
 func_get_config 'shlibpath_overrides_runpath
diff --git a/tests/pdemo/foo.h b/tests/pdemo/foo.h
index 2f666f3..1843783 100644
--- a/tests/pdemo/foo.h
+++ b/tests/pdemo/foo.h
@@ -27,7 +27,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 #define _FOO_H_ 1
 
 /* At some point, cygwin will stop defining __CYGWIN32__, but b19 and
- * earlier do not define __CYGWIN__.  This snippit allows us to check
+ * earlier do not define __CYGWIN__.  This snippet allows us to check
  * for __CYGWIN32__ reliably for both old and (probable) future releases.
  */
 #ifdef __CYGWIN__


hooks/post-receive
-- 
GNU Libtool