From: Bruno Haible <bruno@clisp.org>
Date: Thu, 18 Dec 2008 02:28:36 +0000 (+0100)
Subject: Don't override a newer version of an autoconf macro with an older version.
X-Git-Tag: v0.1~6585
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=cb252a70ec76d7386a3b1f60eb2946bf15c19db8;p=gnulib.git

Don't override a newer version of an autoconf macro with an older version.
---

diff --git a/ChangeLog b/ChangeLog
index 5c1d1811d..89d8b8db5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-12-17  Bruno Haible  <bruno@clisp.org>
 
+	* m4/mbrtowc.m4 (AC_FUNC_MBRTOWC): Don't override in autoconf >= 2.60.
+	Suggested by Eric Blake.
+
+2008-12-17  Bruno Haible  <bruno@clisp.org>
+
 	* m4/errno_h.m4 (AC_COMPUTE_INT): Provide fallback definition.
 
 2008-12-17  Bruno Haible  <bruno@clisp.org>
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index 16ad6ca15..a0274933b 100644
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -9,6 +9,7 @@ dnl From Paul Eggert
 dnl This override of an autoconf macro can be removed when autoconf 2.60 or
 dnl newer can be assumed everywhere.
 
+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.60]),[-1],[
 AC_DEFUN([AC_FUNC_MBRTOWC],
 [
   dnl Same as AC_FUNC_MBRTOWC in autoconf-2.60.
@@ -29,3 +30,4 @@ AC_DEFUN([AC_FUNC_MBRTOWC],
       [Define to 1 if mbrtowc and mbstate_t are properly declared.])
   fi
 ])
+])