From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 11 Jul 2005 12:11:25 +0000 (+0000)
Subject: * m4/libtool.m4 (_LT_CHECK_XSI_SHELL): Fix bogus merge.
X-Git-Tag: release-2-1b~611
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c52d0fc021d7bc3fff6812db03cfcda136e3e1ae;p=thirdparty%2Flibtool.git

* 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 1b46922c6..18470976d 100644
--- 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 7068b012e..29cf58f84 100644
--- 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