FYI: fix bogus merge (Libtool HEAD)

[Ralf Wildenhues]

Hi Patrick,

Regarding your recent problem report[1] with a m4 loop in CVS autotools:
While I can reproduce it over here, I have not found its cause yet.

But it turned up another bug in Libtool CVS HEAD, presumably caused by
a bogus CVS merge.  Checked in the patch below as obvious.  (This bug
shows up only if you do `sinclude(libtool.m4)', not if aclocal pulls in
the macros.)

Cheers,
Ralf

[1] http://lists.gnu.org/archive/html/libtool/2005-07/msg00023.html

2005-07-11  Ralf Wildenhues  <address@hidden>

        * m4/libtool.m4 (_LT_CHECK_XSI_SHELL): Fix bogus merge.
        Reported by Patrick Welche <address@hidden>.

Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.202
diff -u -r1.202 libtool.m4
--- m4/libtool.m4       8 Jul 2005 14:59:59 -0000       1.202
+++ m4/libtool.m4       11 Jul 2005 12:04:53 -0000
@@ -6213,8 +6213,6 @@
       = 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