Mercurial > gnulib
changeset 13348:417aae33eae3
Avoid autoconf warnings about AM_ICONV.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 16 May 2010 23:49:00 +0200 |
| parents | 60868f1aad24 |
| children | e3f87df3b2a9 |
| files | ChangeLog m4/iconv.m4 |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun May 16 23:41:33 2010 +0200 +++ b/ChangeLog Sun May 16 23:49:00 2010 +0200 @@ -1,3 +1,9 @@ +2010-05-16 Bruno Haible <bruno@clisp.org> + + Avoid autoconf warnings about AM_ICONV. + * m4/iconv.m4 (AM_ICONV): Define using AM_DEFUN_ONCE for autoconf >= + 2.64. + 2010-05-16 Bruno Haible <bruno@clisp.org> absolute-header: Make the macro usable in more situations.
--- a/m4/iconv.m4 Sun May 16 23:41:33 2010 +0200 +++ b/m4/iconv.m4 Sun May 16 23:49:00 2010 +0200 @@ -1,4 +1,4 @@ -# iconv.m4 serial 9 (gettext-0.18) +# iconv.m4 serial 10 (gettext-0.18.1) dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -170,7 +170,10 @@ AC_SUBST([LTLIBICONV]) ]) -AC_DEFUN([AM_ICONV], +dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to +dnl avoid warnings like +dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". +m4_version_prereq([2.64],[AC_DEFUN_ONCE],[AC_DEFUN])([AM_ICONV], [ AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then