# HG changeset patch # User Bruno Haible # Date 1249333620 -7200 # Node ID b1f6784b66bd00a9f1ede1a105bd7b47b9b17a75 # Parent da47269129ab3b5768faeb161e6c539208ad49ba Fix displayed message of AM_ICONV with autoconf-2.64. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-08-03 Bruno Haible + + * m4/iconv.m4 (AM_ICONV): Fix displayed message with autoconf-2.64. + 2009-08-02 Bruno Haible Tests for module 'uname'. diff --git a/m4/iconv.m4 b/m4/iconv.m4 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,4 +1,4 @@ -# iconv.m4 serial AM7 (gettext-0.18) +# iconv.m4 serial AM8 (gettext-0.18) dnl Copyright (C) 2000-2002, 2007-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -172,8 +172,8 @@ ], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"]) am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([${ac_t:- - }$am_cv_proto_iconv]) + AC_MSG_RESULT([ + $am_cv_proto_iconv]) AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) fi