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 27327a15c9e7650dd2564e221618b60093fbbd42..7b6913b1b02d3b2df8d1f476efdbe6718b9855ad 100644 (file)
--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -10,13 +10,16 @@ m4/wint_t.m4
 Depends-on:
 wchar
 extensions
-wctype-h        [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
-localcharset    [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
-streq           [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
-uniwidth/width  [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
+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: