summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2001-08-04 17:00:11 +0000
committerJim Meyering <jim@meyering.net>2001-08-04 17:00:11 +0000
commit06f3a965158f185a4cfafe55e297c6a3f5552737 (patch)
tree238269e569a4a8d894488761a20915cd968f1342
parent847f8d0124e7f039c28af8a4b21ebea57a58fd0f (diff)
downloadcoreutils-06f3a965158f185a4cfafe55e297c6a3f5552737.tar.xz
(jm_PREREQ_MBSWIDTH): No longer requires AM_C_PROTOTYPES.
Check for iswcntrl, mbsinit. Use AC_TRY_COMPILE, not AC_CHECK_DECLS, for portability to Autoconf 2.13.
-rw-r--r--m4/mbswidth.m434
1 files changed, 25 insertions, 9 deletions
diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4
index 085c8849c..26f661f64 100644
--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5
dnl autoconf tests required for use of mbswidth.c
dnl From Bruno Haible.
@@ -6,15 +6,31 @@ dnl From Bruno Haible.
AC_DEFUN(jm_PREREQ_MBSWIDTH,
[
AC_REQUIRE([AC_HEADER_STDC])
- AC_REQUIRE([AM_C_PROTOTYPES])
AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
- AC_CHECK_FUNCS(isascii iswprint wcwidth)
+ AC_CHECK_FUNCS(isascii iswcntrl iswprint mbsinit wcwidth)
jm_FUNC_MBRTOWC
- headers='
-# if HAVE_WCHAR_H
-# include <wchar.h>
-# endif
-'
- AC_CHECK_DECLS([wcwidth], , , $headers)
+
+ 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.])
+
AC_MBSTATE_T
])