NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / modules / wcwidth

diff --git a/modules/wcwidth b/modules/wcwidth
index d10209f..7b6913b 100644 (file)
--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -2,22 +2,30 @@ 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
 m4/wint_t.m4
 
 Depends-on:
-wctype
+wchar
+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:
-lib_SOURCES += wcwidth.h
 
 Include:
-"wcwidth.h"
+<wchar.h>
 
 License:
 LGPL