Mercurial > hg > octave-lojdl > gnulib-hg
changeset 13494:91b50a4d7659
iconv: Update regarding AIX.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 30 Jul 2010 21:00:18 +0200 |
| parents | f3cdb966ff0f |
| children | 8fdc6d633c81 |
| files | ChangeLog m4/iconv.m4 |
| diffstat | 2 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-07-30 Bruno Haible <bruno@clisp.org> + + iconv: Update regarding AIX. + * m4/iconv.m4 (AM_ICONV_LINK): When cross-compiling, guess yes on + AIX 7. + Reported by Rainer Tammer. + 2010-07-30 Bruno Haible <bruno@clisp.org> getopt: Update regarding AIX.
--- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,4 +1,4 @@ -# iconv.m4 serial 11 (gettext-0.18.1) +# iconv.m4 serial 11a 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, @@ -139,10 +139,14 @@ return 1; return 0; }], [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