roundf-ieee: Fix test failures on AIX 7.1 and OSF/1 5.1.

[pspp] / modules / wcwidth

diff --git a/modules/wcwidth b/modules/wcwidth
index 74743947e1ecc5f24144b46485859d47c80cf9fd..7b6913b1b02d3b2df8d1f476efdbe6718b9855ad 100644 (file)
--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -9,13 +9,17 @@ m4/wint_t.m4
 
 Depends-on:
 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: