From: Bruno Haible <bruno@clisp.org>
Date: Fri, 30 Jul 2010 19:00:18 +0000 (+0200)
Subject: iconv: Update regarding AIX.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b47ab6864fa06f14ee04c4d33238080207f95426;hp=41f9f674fd42e4a8a366eb4caba39f6a6c5f8cab;p=pspp

iconv: Update regarding AIX.
---

diff --git a/ChangeLog b/ChangeLog
index f533983577..757a48a637 100644
--- 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.
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index e2041b9b49..f3c2ce868e 100644
--- 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 @@ int main ()
     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