From: Gary V. Vaughan <gary@gnu.org>
Date: Fri, 6 Feb 2004 14:12:10 +0000 (+0000)
Subject: * m4/libtool.m4 (AC_PROVIDE_IFELSE): Removed.  We now require
X-Git-Tag: release-1-9b~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=849a7b9f99787784f4a86b8fa05db946892bc48f;p=thirdparty%2Flibtool.git

* m4/libtool.m4 (AC_PROVIDE_IFELSE): Removed.  We now require
Autoconf 2.58, which ships this macro anyway.
---

diff --git a/ChangeLog b/ChangeLog
index 0c31f3889..19fa87248 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-06  Gary V. Vaughan  <gary@gnu.org>
 
+	* m4/libtool.m4 (AC_PROVIDE_IFELSE): Removed.  We now require
+	Autoconf 2.58, which ships this macro anyway.
+
 	* Makefile.am: Comment typo.
 
 	* m4/libtool.m4 (LT_PREREQ): Declare the minimum release number
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 04ce04384..6f2b87f8d 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -30,15 +30,6 @@ m4_define([_LT_COPYING], [dnl
 # serial 49 AC_PROG_LIBTOOL
 
 
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
-
 # LT_PREREQ(VERSION)
 # ------------------
 # Complain and exit if this libtool version is less that VERSION.
@@ -101,7 +92,7 @@ test -f "$ltmain" || ltmain="$ac_aux_dir/ltmain.sh"
 # AC_LIBTOOL_SETUP
 # ----------------
 AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.56)dnl We use the new compiler based header checking in 2.56
+[AC_PREREQ(2.58)dnl We use AC_INCLUDES_DEFAULT
 AC_REQUIRE([LTSUGAR_VERSION])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl