From: Bruno Haible <bruno@clisp.org>
Date: Fri, 30 Jul 2010 19:40:29 +0000 (+0200)
Subject: wcwidth: Drop replacement on AIX 7.
X-Git-Tag: v0.1~3983
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=8b4b3169967174633f41487dbf7aa9c1a49c36d0

wcwidth: Drop replacement on AIX 7.
---

diff --git a/ChangeLog b/ChangeLog
index 78d3b35fb..53cc2aed5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-07-30  Bruno Haible  <bruno@clisp.org>
 
+	wcwidth: Drop replacement on AIX 7.
+	* m4/wcwidth.m4 (gl_FUNC_WCWIDTH): When cross-compiling, guess yes on
+	AIX 7.
+	Reported by Rainer Tammer.
+
+2010-07-30  Bruno Haible  <bruno@clisp.org>
+
 	strtok_r: Avoid triggering bug in AIX 7.1 xlc compiler.
 	* m4/strtok_r.m4 (gl_FUNC_STRTOK_R): Don't cast an invalid address to
 	a 'char *'.
diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
index acceba547..ad5c6cc8e 100644
--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 16
+# wcwidth.m4 serial 17
 dnl Copyright (C) 2006-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,
@@ -70,9 +70,9 @@ int main ()
           [
 changequote(,)dnl
            case "$host_os" in
-                     # Guess yes on glibc systems.
-             *-gnu*) gl_cv_func_wcwidth_works="guessing yes";;
-             *)      gl_cv_func_wcwidth_works="guessing no";;
+                     # Guess yes on glibc and AIX 7 systems.
+             *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
+             *)                  gl_cv_func_wcwidth_works="guessing no";;
            esac
 changequote([,])dnl
           ])