Re: rename gl_FUNC_MBRTOWC

[Bruno Haible]

Eric Blake wrote:
> When overriding an autoconf macro, it is safer practice to wrap the
> override with m4_ifndef or with m4_version_compare.  That way, if a later
> autoconf version changes the internal implementation to something that
> works better, your override isn't trapping users with the old semantics.

I thought that we would then also update gnulib. But anyway,I'm doing as you
say:


2008-12-17  Bruno Haible  <address@hidden>

        * m4/mbrtowc.m4 (AC_FUNC_MBRTOWC): Don't override in autoconf >= 2.60.
        Suggested by Eric Blake.

--- m4/mbrtowc.m4.orig  2008-12-18 03:25:03.000000000 +0100
+++ m4/mbrtowc.m4       2008-12-18 03:14:13.000000000 +0100
@@ -9,6 +9,7 @@
 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 @@
       [Define to 1 if mbrtowc and mbstate_t are properly declared.])
   fi
 ])
+])