# HG changeset patch # User Bruno Haible # Date 1247600012 -7200 # Node ID 0448ef50894e8de52738a2359422836cd8075d3c # Parent e59c94826772ce1d11f8f5e5f3a94c126cb3e3f8 Guess that wcwidth works on glibc systems. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-07-14 Bruno Haible + + * m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Guess it works on glibc systems. + Reported by anonymous kc. + 2009-07-07 Jim Meyering maint.mk: don't look for translatable strings in *.m4 or *.mk diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -1,5 +1,5 @@ -# wcwidth.m4 serial 14 -dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. +# wcwidth.m4 serial 15 +dnl Copyright (C) 2006-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,6 +7,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH], [ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles dnl Persuade glibc to declare wcwidth(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) @@ -68,7 +69,15 @@ return 1; return 0; }], [gl_cv_func_wcwidth_works=yes], [gl_cv_func_wcwidth_works=no], - [gl_cv_func_wcwidth_works="guessing no"]) + [ +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";; + esac +changequote([,])dnl + ]) ]) case "$gl_cv_func_wcwidth_works" in *yes) ;;