-# wcwidth.m4 serial 17
-dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
+# wcwidth.m4 serial 20
+dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
fi
if test $ac_cv_func_wcwidth = yes; then
+ HAVE_WCWIDTH=1
dnl On MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
dnl This leads to bugs in 'ls' (coreutils).
#endif
int main ()
{
+ int result = 0;
if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
- if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
- return 1;
- return 0;
+ {
+ if (wcwidth (0x0301) > 0)
+ result |= 1;
+ if (wcwidth (0x200B) > 0)
+ result |= 2;
+ }
+ return result;
}]])],
[gl_cv_func_wcwidth_works=yes],
[gl_cv_func_wcwidth_works=no],
*yes) ;;
*no) REPLACE_WCWIDTH=1 ;;
esac
- fi
- if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
- AC_LIBOBJ([wcwidth])
- fi
- if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1 \
- || test $HAVE_DECL_WCWIDTH = 0; then
- gl_REPLACE_WCHAR_H
+ else
+ HAVE_WCWIDTH=0
fi
dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not
dnl have the wcwidth function, then it does not declare it.