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

diff --git a/ChangeLog b/ChangeLog
index 5c1d1811d4811a0d4617c018d23edcc92c6a3103..89d8b8db5ea3534bbb4311f101057738578de7b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index 16ad6ca1550e64f5f35c1b689e2d0b9e9e82d8de..a0274933b0bbb077dd6182ae8ef72cd734dc7805 100644 (file)
--- 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
 ])
+])