[SCM] GNU Libtool branch, master, updated. v2.2.10-35-gee2dde8

[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  ee2dde86ba2f1bdc0638726c6580b96800ad4b39 (commit)
      from  b8dd17aeba9ae235d189b30ce38d64ba0ff2a309 (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 ee2dde86ba2f1bdc0638726c6580b96800ad4b39
Author: Gary V. Vaughan <address@hidden>
Date:   Sun Jun 27 13:57:50 2010 +0700

    Fix portability regressions in today's earlier changeset.
    
    * libltdl/m4/libtool.m4 (_LT_PROG_XSI_REPLACE): `sed -i' is not
    portable; use `mv -f ...|| cp -f ...' instead.
    Add an initial backslash to sed `c' substitutions with leading
    whitespace, so that indentation is not removed by some non-POSIX
    compliant sed implementations.
    (_LT_PROG_XSI_SHELLFNS): Display a diagnostic warning message if
    one or more XSI function replacements failed.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 ChangeLog             |    9 +++++++++
 libltdl/m4/libtool.m4 |   16 +++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e95b836..853ee86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2010-06-27  Gary V. Vaughan  <address@hidden>
 
+       Fix portability regressions in today's earlier changeset.
+       * libltdl/m4/libtool.m4 (_LT_PROG_XSI_REPLACE): `sed -i' is not
+       portable; use `mv -f ...|| cp -f ...' instead.
+       Add an initial backslash to sed `c' substitutions with leading
+       whitespace, so that indentation is not removed by some non-POSIX
+       compliant sed implementations.
+       (_LT_PROG_XSI_SHELLFNS): Display a diagnostic warning message if
+       one or more XSI function replacements failed.
+
        getopt.m4sh generated libtool option parser, and XSI improvements.
        * libltdl/m4/libtool.m4 (_LT_PROG_XSI_SHELLFNS): Moved portable
        shell versions of various utility functions from here...
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 0b8a00e..2079e20 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -7257,13 +7257,15 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into 
spaces])dnl
 # '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
 m4_defun([_LT_PROG_XSI_REPLACE],
 [dnl {
-sed -i .tmp -e '/^$1 ()$/,/^} # $1 /c\
+sed -e '/^$1 ()$/,/^} # $1 /c\
 $1 ()\
 {\
-m4_bpatsubst([$2], [$], [\\])
-} # XSI $1 implementation' "$cfgfile" \
-  || (mv -f "$cfgfile.tmp" "$cfgfile"; exit 1)
-rm -f "$cfgfile.tmp"])
+m4_bpatsubsts([$2], [$], [\\], [^\([   ]\)], [\\\1])
+} # XSI $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f 
"$cfgfile.tmp")
+test 0 -eq $? || _lt_xsi_replace_fail=:
+])
 
 
 # _LT_PROG_XSI_SHELLFNS
@@ -7315,4 +7317,8 @@ fi
 if test x"$lt_shell_append" = xyes; then
   _LT_PROG_XSI_REPLACE([func_append], [    eval "${1}+=\\${2}"])
 fi
+
+if test x"$_lt_xsi_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute faster XSI functions in $ofile]) 
+fi
 ])


hooks/post-receive
-- 
GNU Libtool