* m4/libtool.m4 (_LT_CHECK_XSI_SHELL): Fix bogus merge.

Reported by Patrick Welche <prlw1@newn.cam.ac.uk>.

diff --git a/ChangeLog b/ChangeLog
index 1b46922c688d5e9e0ad113268a888c45317dd896..18470976d6c872cee01ead592b9dc90c32e8ee66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * m4/libtool.m4 (_LT_CHECK_XSI_SHELL): Fix bogus merge.
+       Reported by Patrick Welche <prlw1@newn.cam.ac.uk>.
+
 2005-07-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * libltdl/Makefile.am (libltdl_la_DEPENDENCIES): Depend on

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 7068b012e079405590e01c1cf933782781ec978a..29cf58f8422343b675822179b045c310880961ec 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -6213,8 +6213,6 @@ xsi_shell=no
       = c,a/b,, ) >/dev/null 2>&1 \
   && xsi_shell=yes
 AC_MSG_RESULT([$xsi_shell])
-])
-fi
 _LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
 ])# _LT_CHECK_XSI_SHELL