Mercurial > hg > octave-lojdl > gnulib-hg
changeset 6876:edba9bd2b197
* mbswidth.m4 (gl_MBSDWIDTH): Move wcwidth from here...
* wcwidth.m4 (gl_FUNC_WCWIDTH): ...to this new file.
author | Eric Blake <ebb9@byu.net> |
---|---|
date | Wed, 28 Jun 2006 13:10:12 +0000 |
parents | 41254433d288 |
children | 8a1cdc7197a8 |
files | m4/ChangeLog m4/mbswidth.m4 m4/wcwidth.m4 |
diffstat | 3 files changed, 48 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2006-06-28 Eric Blake <ebb9@byu.net> + + * mbswidth.m4 (gl_MBSDWIDTH): Move wcwidth from here... + * wcwidth.m4 (gl_FUNC_WCWIDTH): ...to this new file. + 2006-06-28 Simon Josefsson <jas@extundo.com> * getaddrinfo.m4: Look for getnameinfo prototypes too. @@ -87,7 +92,7 @@ * ssize_t.m4 (gt_TYPE_SSIZE_T): Work in spite of -Werror. 2006-05-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> - Bruno Haible <bruno@clisp.org> + Bruno Haible <bruno@clisp.org> * strndup.m4 (gl_FUNC_STRNDUP): Replace the AC_REPLACE_FUNCS with a check for the declaration of strnlen and a run test that exposes the
--- a/m4/mbswidth.m4 +++ b/m4/mbswidth.m4 @@ -1,5 +1,5 @@ -# mbswidth.m4 serial 11 -dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. +# mbswidth.m4 serial 12 +dnl Copyright (C) 2000-2002, 2004, 2006 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. @@ -9,33 +9,11 @@ AC_DEFUN([gl_MBSWIDTH], [ - AC_CHECK_HEADERS_ONCE(wchar.h wctype.h) - AC_CHECK_FUNCS_ONCE(isascii iswprint mbsinit) - AC_CHECK_FUNCS(iswcntrl wcwidth) + AC_CHECK_HEADERS_ONCE([wchar.h wctype.h]) + AC_CHECK_FUNCS_ONCE([isascii mbsinit]) + AC_CHECK_FUNCS([iswcntrl]) gl_FUNC_MBRTOWC - AC_CACHE_CHECK([whether wcwidth is declared], ac_cv_have_decl_wcwidth, - [AC_TRY_COMPILE([ -/* AIX 3.2.5 declares wcwidth in <string.h>. */ -#if HAVE_STRING_H -# include <string.h> -#endif -#if HAVE_WCHAR_H -# include <wchar.h> -#endif -], [ -#ifndef wcwidth - char *p = (char *) wcwidth; -#endif -], ac_cv_have_decl_wcwidth=yes, ac_cv_have_decl_wcwidth=no)]) - if test $ac_cv_have_decl_wcwidth = yes; then - ac_val=1 - else - ac_val=0 - fi - AC_DEFINE_UNQUOTED(HAVE_DECL_WCWIDTH, $ac_val, - [Define to 1 if you have the declaration of wcwidth(), and to 0 otherwise.]) - dnl UnixWare 7.1.1 <wchar.h> has a declaration of a function mbswidth() dnl that clashes with ours. AC_CACHE_CHECK([whether mbswidth is declared in <wchar.h>],
new file mode 100644 --- /dev/null +++ b/m4/wcwidth.m4 @@ -0,0 +1,37 @@ +# wcwidth.m4 serial 1 +dnl Copyright (C) 2006 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. + +dnl autoconf tests required for use of mbswidth.c + +AC_DEFUN([gl_FUNC_WCWIDTH], +[ AC_CHECK_HEADERS_ONCE([wchar.h wctype.h]) + AC_CHECK_FUNCS_ONCE([iswprint wcwidth]) + + AC_REQUIRE([AC_GNU_SOURCE]) + + AC_CACHE_CHECK([whether wcwidth is declared], [ac_cv_have_decl_wcwidth], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +/* AIX 3.2.5 declares wcwidth in <string.h>. */ +#if HAVE_STRING_H +# include <string.h> +#endif +#if HAVE_WCHAR_H +# include <wchar.h> +#endif +], [ +#ifndef wcwidth + char *p = (char *) wcwidth; +#endif +])], [ac_cv_have_decl_wcwidth=yes], [ac_cv_have_decl_wcwidth=no])]) + if test $ac_cv_have_decl_wcwidth = yes; then + ac_val=1 + else + ac_val=0 + fi + AC_DEFINE_UNQUOTED([HAVE_DECL_WCWIDTH], [$ac_val], + [Define to 1 if you have the declaration of wcwidth(), and to 0 + otherwise.]) +])