diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-12-27 19:54:25 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-12-27 19:54:25 +0000 |
| commit | db844e48b469f59ccfc7da42677040700b8eace9 (patch) | |
| tree | 6f95ff71f9031308209000496072543847ba7408 /m4 | |
| parent | aafb133aa1176295ec51c8a477e46e498e98fb57 (diff) | |
| download | gnulib-db844e48b469f59ccfc7da42677040700b8eace9.tar.gz | |
* lib/mbchar.h: Just include <wctype.h>; the wctype module
handles its gotchas now.
* lib/mbswidth.c: Likewise.
* lib/wcwidth.h: Likewise.
* m4/mbchar.m4 (gl_MBCHAR): Don't bother checking for wctype.h
and iswcntrl; the wctype module does this stuff now.
* m4/mbswidth.m4 (gl_MBSWIDTH): Likewise.
* m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise.
* modules/mbchar (Depends-on): Add wctype.
* modules/mbswidth (Depends-on): Likewise.
* modules/wcwidth (Depends-on): Likewise.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/mbchar.m4 | 3 | ||||
| -rw-r--r-- | m4/mbswidth.m4 | 3 | ||||
| -rw-r--r-- | m4/wcwidth.m4 | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/m4/mbchar.m4 b/m4/mbchar.m4 index f95e9267c3..017c56ad44 100644 --- a/m4/mbchar.m4 +++ b/m4/mbchar.m4 @@ -16,8 +16,5 @@ AC_DEFUN([gl_MBCHAR], dnl Compile mbchar.c only if HAVE_WCHAR_H. if test $ac_cv_header_wchar_h = yes; then AC_LIBOBJ([mbchar]) - dnl Prerequisites of mbchar.h and mbchar.c. - AC_CHECK_HEADERS_ONCE([wctype.h]) - AC_CHECK_FUNCS([iswcntrl]) fi ]) diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4 index 5aff74eb50..462eb0b6ad 100644 --- a/m4/mbswidth.m4 +++ b/m4/mbswidth.m4 @@ -9,9 +9,8 @@ dnl From Bruno Haible. AC_DEFUN([gl_MBSWIDTH], [ - AC_CHECK_HEADERS_ONCE([wchar.h wctype.h]) + AC_CHECK_HEADERS_ONCE([wchar.h]) AC_CHECK_FUNCS_ONCE([isascii mbsinit]) - AC_CHECK_FUNCS([iswcntrl]) gl_FUNC_MBRTOWC dnl UnixWare 7.1.1 <wchar.h> has a declaration of a function mbswidth() diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index e8a37f2e4f..7f23e5fed4 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -13,8 +13,8 @@ AC_DEFUN([gl_FUNC_WCWIDTH], AC_REQUIRE([gt_TYPE_WCHAR_T]) AC_REQUIRE([gt_TYPE_WINT_T]) - AC_CHECK_HEADERS_ONCE([wchar.h wctype.h]) - AC_CHECK_FUNCS_ONCE([iswprint wcwidth]) + AC_CHECK_HEADERS_ONCE([wchar.h]) + AC_CHECK_FUNCS_ONCE([wcwidth]) AC_CHECK_DECLS([wcwidth], [], [], [ /* AIX 3.2.5 declares wcwidth in <string.h>. */ |