diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2010-07-08 18:47:59 +0700 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2010-07-08 20:36:39 +0700 |
| commit | 8c4dae1232958c24989f31ab5b5768d00be2ef03 (patch) | |
| tree | 4b85edead3e6be32a263ebf1ffa6c173baa17133 | |
| parent | de8a0992b21b76a13c302cf48588ad5f6042595c (diff) | |
| download | libtool-8c4dae1232958c24989f31ab5b5768d00be2ef03.tar.gz | |
Fix a spurious trailing space and a botched merge.
* libltdl/m4/libtool.m4 (_LT_PROG_FUNCTION_REPLACE): Remove
spurious trailing space.
* ChangeLog: Reorder to match commit order after botched
merge.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | libltdl/m4/libtool.m4 | 2 |
2 files changed, 10 insertions, 8 deletions
@@ -1,10 +1,3 @@ -2010-07-08 Peter Rosin <peda@lysator.liu.se> - - Optimize assignment of output_la. - * libltdl/config/ltmain.m4sh (func_mode_link): Save two fork/exec - instances. - Report by Ralf Wildenhues. - 2010-07-08 Gary V. Vaughan <gary@gnu.org> Rename _LT_PROG_XSI_REPLACE macro to _LT_PROG_FUNCTION_REPLACE. @@ -26,6 +19,15 @@ (_LT_AT_EXTENDED_SHELL_FUNC_EXTRACT): Change regular expression to match new replacable function decorator comments. +2010-07-08 Peter Rosin <peda@lysator.liu.se> + + Optimize assignment of output_la. + * libltdl/config/ltmain.m4sh (func_mode_link): Save two fork/exec + instances. + Report by Ralf Wildenhues. + +2010-07-08 Gary V. Vaughan <gary@gnu.org> + Fix a cut-n-pasto in "2010-07-07 Charles Wilson" patch. * libltdl/config/ltmain.m4sh (func_mode_link): Remove spurious variable dereference. diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 83d03bf4..47d25581 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -7542,6 +7542,6 @@ else fi if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) fi ]) |