X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fwcwidth;h=7b6913b1b02d3b2df8d1f476efdbe6718b9855ad;hb=e56e96fe20f72586e9ec5c528b9a9a06daa2ecc6;hp=a10d34a5fbad0a738b9e22061df2a48293e33f7f;hpb=2b3817550022a9a5c9cd89f4e5a3a77381ac328c;p=gnulib.git

diff --git a/modules/wcwidth b/modules/wcwidth
index a10d34a5f..7b6913b1b 100644
--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -2,7 +2,6 @@ Description:
 Determine the number of screen columns needed for a character.
 
 Files:
-lib/wcwidth.h
 lib/wcwidth.c
 m4/wcwidth.m4
 m4/wchar_t.m4
@@ -10,15 +9,23 @@ m4/wint_t.m4
 
 Depends-on:
 wchar
-wctype
+extensions
+wctype-h        [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
+localcharset    [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
+streq           [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
+uniwidth/width  [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
 
 configure.ac:
 gl_FUNC_WCWIDTH
+if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
+  AC_LIBOBJ([wcwidth])
+fi
+gl_WCHAR_MODULE_INDICATOR([wcwidth])
 
 Makefile.am:
 
 Include:
-"wcwidth.h"
+<wchar.h>
 
 License:
 LGPL