* 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 0c31f3889e4117eccffbb42098fbed73d1c9f068..19fa8724868b76d776ee7384f2fbd1a19789b60a 100644 (file)
--- 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 04ce04384d6c3a2af14b603d700395dc178dcb7e..6f2b87f8dd06e4e58785d2e32659d31c3c5a634e 100644 (file)
--- 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