From 906e14dca45bdf7e823013807456cc8831075db4 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 16 May 2010 23:49:00 +0200 Subject: [PATCH] Avoid autoconf warnings about AM_ICONV. --- ChangeLog | 6 ++++++ m4/iconv.m4 | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7666448e9..c5560761a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-05-16 Bruno Haible + 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 + 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 f46ff1421..4c6847213 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 -- 2.11.0