X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fwcwidth;h=7b6913b1b02d3b2df8d1f476efdbe6718b9855ad;hb=7f26f4f75fc3aee7a5e351ecdf05278d9890ff3e;hp=fe410f150fcd5e68c5baa7eb27268093fcaaf62f;hpb=3740c324b0f14e757b73cc22d88d30c4235d1bcb;p=gnulib.git

diff --git a/modules/wcwidth b/modules/wcwidth
index fe410f150..7b6913b1b 100644
--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -8,15 +8,18 @@ m4/wchar_t.m4
 m4/wint_t.m4
 
 Depends-on:
-extensions
 wchar
-wctype
-localcharset
-streq
-uniwidth/width
+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: