X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fwcwidth.m4;fp=m4%2Fwcwidth.m4;h=8a97e3891679ae4e247a0c0cc7303edf1202f490;hb=d7b3e94540c66455a08533826feb1fdd11a64008;hp=dbcc231be4c0ab1f1a8088205c7ee85fb0c3a9fa;hpb=9f35d916b23497e282394370b61c94afc4de1835;p=gnulib.git

diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
index dbcc231be..8a97e3891 100644
--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 19
+# wcwidth.m4 serial 20
 dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -35,6 +35,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
   fi
 
   if test $ac_cv_func_wcwidth = yes; then
+    HAVE_WCWIDTH=1
     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 This leads to bugs in 'ls' (coreutils).
@@ -89,9 +90,8 @@ changequote([,])dnl
       *yes) ;;
       *no) REPLACE_WCWIDTH=1 ;;
     esac
-  fi
-  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
-    AC_LIBOBJ([wcwidth])
+  else
+    HAVE_WCWIDTH=0
   fi
   dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not
   dnl have the wcwidth function, then it does not declare it.