diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-05-16 23:49:00 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-05-16 23:49:00 +0200 |
| commit | 906e14dca45bdf7e823013807456cc8831075db4 (patch) | |
| tree | 71759cab75545ec6ec2edd9129caa7ef3d1ec377 | |
| parent | 0bc56a3096dea3d175fa36a06d152cd143bad24c (diff) | |
| download | gnulib-906e14dca45bdf7e823013807456cc8831075db4.tar.gz | |
Avoid autoconf warnings about AM_ICONV.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | m4/iconv.m4 | 7 |
2 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,11 @@ 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. * m4/absolute-header.m4 (gl_ABSOLUTE_HEADER_ONE): New macro, extracted from gl_ABSOLUTE_HEADER. diff --git a/m4/iconv.m4 b/m4/iconv.m4 index f46ff14215..4c68472135 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -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 @@ int main () 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 |