Mercurial > hg > octave-lyh > gnulib-hg
changeset 10900:7bc71464d757
Don't override a newer version of an autoconf macro with an older version.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Thu, 18 Dec 2008 03:28:36 +0100 |
parents | 3a5b73f13a99 |
children | 41c8957239b8 |
files | ChangeLog m4/mbrtowc.m4 |
diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -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 ]) +])