diff options
author | Eric Blake <ebb9@byu.net> | 2006-06-28 13:10:12 +0000 |
---|---|---|
committer | Eric Blake <ebb9@byu.net> | 2006-06-28 13:10:12 +0000 |
commit | f5e6e9801a33eda719a723fcae8244e2fe25a056 (patch) | |
tree | 9b93d025551b055fd4a3cd8dd561785fe9e2415f /m4/mbswidth.m4 | |
parent | 633351a9c79940c871ce6ed4d182844239c1ef72 (diff) | |
download | gnulib-f5e6e9801a33eda719a723fcae8244e2fe25a056.tar.gz |
* mbswidth.m4 (gl_MBSDWIDTH): Move wcwidth from here...
* wcwidth.m4 (gl_FUNC_WCWIDTH): ...to this new file.
Diffstat (limited to 'm4/mbswidth.m4')
-rw-r--r-- | m4/mbswidth.m4 | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4 index 878e5311d5..3cb200039b 100644 --- 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 @@ dnl From Bruno Haible. 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>], |