diff options
| author | Andreas Rottmann <a.rottmann@gmx.at> | 2009-09-14 12:34:39 +0200 |
|---|---|---|
| committer | Andreas Rottmann <a.rottmann@gmx.at> | 2009-09-14 12:34:39 +0200 |
| commit | 79ca645d222db2e158784642c3b464a47bea26f3 (patch) | |
| tree | 73fa0e7f2f509013ca7ea3395b268c8471b2355b /gnulib-m4/wcwidth.m4 | |
| parent | 8a927bfd7da41dbe61f3cfeaccbd37c761c0bc36 (diff) | |
| parent | 3bebb94360f1c2333feb8d504a9fa4f96984d8b7 (diff) | |
Merge commit 'upstream/0.9.1.1'
Diffstat (limited to 'gnulib-m4/wcwidth.m4')
| -rw-r--r-- | gnulib-m4/wcwidth.m4 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnulib-m4/wcwidth.m4 b/gnulib-m4/wcwidth.m4 index 4bedefa..9cacb56 100644 --- a/gnulib-m4/wcwidth.m4 +++ b/gnulib-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 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_WCWIDTH], [ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles dnl Persuade glibc <wchar.h> to declare wcwidth(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) @@ -68,7 +69,15 @@ int main () 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) ;; |