X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fwcwidth.m4;h=4bedefae69a34cb83f474c8fab1c54087b830f42;hb=0a3f7af426469ab51370585e1a3afba66ff24b57;hp=5b3fd77504410dd8d92ff696427ede464d2a9014;hpb=dced91140ad8eb666ed6cc6192fb486dadf623bb;p=gnulib.git

diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
index 5b3fd7750..4bedefae6 100644
--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -38,7 +38,6 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
   else
     dnl On MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
     dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
-    dnl On OpenBSD 4.0, wcwidth(0x3000) (IDEOGRAPHIC SPACE) returns 0.
     dnl This leads to bugs in 'ls' (coreutils).
     AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
       [gl_cv_func_wcwidth_works],
@@ -65,7 +64,7 @@ int wcwidth (int);
 int main ()
 {
   if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
-    if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0 || wcwidth (0x3000) <= 1)
+    if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
       return 1;
   return 0;
 }], [gl_cv_func_wcwidth_works=yes], [gl_cv_func_wcwidth_works=no],
@@ -81,6 +80,6 @@ int main ()
   fi
 
   if test $REPLACE_WCWIDTH = 1 || test $HAVE_DECL_WCWIDTH = 0; then
-    WCHAR_H=wchar.h
+    gl_REPLACE_WCHAR_H
   fi
 ])