From 1b9161a08681d9694de7d1fd19d8337d1d757d25 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 30 Jul 2010 21:02:12 +0200 Subject: [PATCH] iconv: Update regarding AIX. --- gettext-runtime/m4/ChangeLog | 6 ++++++ gettext-runtime/m4/iconv.m4 | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 4cc615e03..539355a35 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,9 @@ +2010-07-30 Bruno Haible + + iconv: Update regarding AIX. + * iconv.m4 (AM_ICONV_LINK): When cross-compiling, guess yes on AIX 7. + Reported by Rainer Tammer. + 2010-07-19 Bruno Haible Modernize AC_TRY_RUN invocations. diff --git a/gettext-runtime/m4/iconv.m4 b/gettext-runtime/m4/iconv.m4 index ffa037396..b78ba18af 100644 --- a/gettext-runtime/m4/iconv.m4 +++ b/gettext-runtime/m4/iconv.m4 @@ -1,4 +1,4 @@ -# iconv.m4 serial 12 (gettext-0.18.2) +# iconv.m4 serial 13 (gettext-0.18.2) 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, @@ -150,10 +150,14 @@ int main () }]])], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], - [case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac]) + [ +changequote(,)dnl + case "$host_os" in + aix | aix[3-6]* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +changequote([,])dnl + ]) LIBS="$am_save_LIBS" ]) case "$am_cv_func_iconv_works" in -- 2.47.2