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>

diff --git a/ChangeLog b/ChangeLog
index 9d3cf535a9fec3371ff43bd74d28dc7ed4d66030..641ee0b00defc8a1e985404237a2958639766bdb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 83d03bf489d2d02a313e4cb4ed1a4683ac90f269..47d25581e7ec8dd946ccebba38e385dd6ca03112 100644 (file)
--- 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
 ])