summaryrefslogtreecommitdiff
path: root/m4/mbswidth.m4
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2004-04-04 06:53:20 +0000
committerJim Meyering <jim@meyering.net>2004-04-04 06:53:20 +0000
commit8d553e22b1d1a8079d1aab1502a06d91e897a4bc (patch)
tree58d25468f87680f47477117dc4ca3c373e3cacf5 /m4/mbswidth.m4
parent8c5584a1513cdbf62e8ed51c69053db4aae44682 (diff)
downloadcoreutils-8d553e22b1d1a8079d1aab1502a06d91e897a4bc.tar.xz
Sync from gnulib.
Diffstat (limited to 'm4/mbswidth.m4')
-rw-r--r--m4/mbswidth.m421
1 files changed, 20 insertions, 1 deletions
diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4
index d7981ca39..7eefd879d 100644
--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
dnl autoconf tests required for use of mbswidth.c
dnl From Bruno Haible.
@@ -32,5 +32,24 @@ AC_DEFUN([gl_MBSWIDTH],
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>],
+ ac_cv_have_decl_mbswidth,
+ [AC_TRY_COMPILE([
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+], [
+ char *p = (char *) mbswidth;
+], ac_cv_have_decl_mbswidth=yes, ac_cv_have_decl_mbswidth=no)])
+ if test $ac_cv_have_decl_mbswidth = yes; then
+ ac_val=1
+ else
+ ac_val=0
+ fi
+ AC_DEFINE_UNQUOTED(HAVE_DECL_MBSWIDTH_IN_WCHAR_H, $ac_val,
+ [Define to 1 if you have a declaration of mbswidth() in <wchar.h>, and to 0 otherwise.])
+
AC_TYPE_MBSTATE_T
])