From: Bruno Haible Date: Sun, 16 May 2010 21:48:16 +0000 (+0200) Subject: Avoid autoconf warnings about AM_ICONV. X-Git-Tag: v0.18.1~44 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab49ce7b075d942785d954819ab0722d3dce6bb2;p=thirdparty%2Fgettext.git Avoid autoconf warnings about AM_ICONV. --- diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 96fc18ef3..c6628c10f 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,8 @@ +2010-05-16 Bruno Haible + + Avoid autoconf warnings about AM_ICONV. + * iconv.m4 (AM_ICONV): Define using AM_DEFUN_ONCE for autoconf >= 2.64. + 2010-05-09 Bruno Haible * gettext-0.18 released. diff --git a/gettext-runtime/m4/iconv.m4 b/gettext-runtime/m4/iconv.m4 index f46ff1421..4c6847213 100644 --- a/gettext-runtime/m4/iconv.m4 +++ b/gettext-runtime/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