iconv: Update regarding AIX.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 4cc615e032ebf337f3ae956c4308595b7bad0555..539355a35f952cc1dd8e56787211217994c3b813 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-30  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        Modernize AC_TRY_RUN invocations.

diff --git a/gettext-runtime/m4/iconv.m4 b/gettext-runtime/m4/iconv.m4
index ffa037396241b42759e8dd93d66b2eda2e185343..b78ba18af6689b9f1dd4f65c30414e63de245284 100644 (file)
--- 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