diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-02-06 12:56:31 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-02-07 23:36:05 +0100 |
| commit | 7aae6551319dd8c750eefc0ea82503af3dc3145f (patch) | |
| tree | cf7ea7aa6d358578b8d4e55d0ac8c9e5a9a258f7 /m4 | |
| parent | e1cc6ea006da8ff4527e055e7aa2db0d69351a05 (diff) | |
| download | gnulib-7aae6551319dd8c750eefc0ea82503af3dc3145f.tar.gz | |
New module 'wcscoll'.
* modules/wcscoll: New file.
* lib/wchar.in.h (wcscoll): New declaration.
* lib/wcscoll.c: New file.
* lib/wcscoll-impl.h: New file.
* m4/wcscoll.m4: New file.
* m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcscoll is declared.
(gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSCOLL, HAVE_WCSCOLL.
* modules/wchar (Makefile.am): Substitute GNULIB_WCSCOLL, HAVE_WCSCOLL.
* tests/test-wchar-c++.cc: Test the declaration of wcscoll.
* doc/posix-functions/wcscoll.texi: Mention the new module.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/wchar_h.m4 | 4 | ||||
| -rw-r--r-- | m4/wcscoll.m4 | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index a06c0a4139..c1a3904172 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -52,7 +52,7 @@ AC_DEFUN([gl_WCHAR_H], [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp - wcsncmp wcscasecmp wcsncasecmp + wcsncmp wcscasecmp wcsncasecmp wcscoll ]) ]) @@ -164,6 +164,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP]) GNULIB_WCSCASECMP=0; AC_SUBST([GNULIB_WCSCASECMP]) GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP]) + GNULIB_WCSCOLL=0; AC_SUBST([GNULIB_WCSCOLL]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -191,6 +192,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], HAVE_WCSNCMP=1; AC_SUBST([HAVE_WCSNCMP]) HAVE_WCSCASECMP=1; AC_SUBST([HAVE_WCSCASECMP]) HAVE_WCSNCASECMP=1; AC_SUBST([HAVE_WCSNCASECMP]) + HAVE_WCSCOLL=1; AC_SUBST([HAVE_WCSCOLL]) HAVE_DECL_WCTOB=1; AC_SUBST([HAVE_DECL_WCTOB]) HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH]) REPLACE_MBSTATE_T=0; AC_SUBST([REPLACE_MBSTATE_T]) diff --git a/m4/wcscoll.m4 b/m4/wcscoll.m4 new file mode 100644 index 0000000000..8a39a69a7f --- /dev/null +++ b/m4/wcscoll.m4 @@ -0,0 +1,15 @@ +# wcscoll.m4 serial 1 +dnl Copyright (C) 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. + +AC_DEFUN([gl_FUNC_WCSCOLL], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([wcscoll]) + if test $ac_cv_func_wcscoll = no; then + HAVE_WCSCOLL=0 + AC_LIBOBJ([wcscoll]) + fi +]) |