diff options
| -rw-r--r-- | gettext-tools/m4/Makefile.am | 1 | ||||
| -rw-r--r-- | gettext-tools/m4/mbstate_t.m4 | 39 | ||||
| -rw-r--r-- | gettext-tools/m4/mbswidth.m4 | 2 | ||||
| -rw-r--r-- | gettext-tools/m4/quotearg.m4 | 16 |
4 files changed, 36 insertions, 22 deletions
diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am index 2239c79..e07f340 100644 --- a/gettext-tools/m4/Makefile.am +++ b/gettext-tools/m4/Makefile.am @@ -70,6 +70,7 @@ mbswidth.m4 \ mkdtemp.m4 \ onceonly.m4 \ pathmax.m4 \ +quotearg.m4 \ readlink.m4 \ relocatable.m4 \ setenv.m4 \ diff --git a/gettext-tools/m4/mbstate_t.m4 b/gettext-tools/m4/mbstate_t.m4 index a002209..a07f51b 100644 --- a/gettext-tools/m4/mbstate_t.m4 +++ b/gettext-tools/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ -# mbstate_t.m4 serial 9 (fileutils-4.1.3) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +# mbstate_t.m4 serial 9 +dnl Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -12,24 +12,21 @@ dnl the same distribution terms as the rest of that program. # so you can't declare an object of that type. # Check for this incompatibility with Standard C. -# Include stdlib.h first, because otherwise this test would fail on Linux -# (at least glibc-2.1.3) because the "_XOPEN_SOURCE 500" definition elicits -# a syntax error in wchar.h due to the use of undefined __int32_t. - -AC_DEFUN([AC_MBSTATE_T], - [ - AC_CHECK_HEADERS(stdlib.h) - - AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, - [AC_TRY_COMPILE([ -#if HAVE_STDLIB_H -# include <stdlib.h> -#endif -#include <wchar.h>], - [mbstate_t x; return sizeof x;], - ac_cv_type_mbstate_t=yes, - ac_cv_type_mbstate_t=no)]) - if test $ac_cv_type_mbstate_t = no; then - AC_DEFINE(mbstate_t, int, +# AC_TYPE_MBSTATE_T +# ----------------- +AC_DEFUN([AC_TYPE_MBSTATE_T], + [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT +# include <wchar.h>], + [mbstate_t x; return sizeof x;])], + [ac_cv_type_mbstate_t=yes], + [ac_cv_type_mbstate_t=no])]) + if test $ac_cv_type_mbstate_t = yes; then + AC_DEFINE([HAVE_MBSTATE_T], 1, + [Define to 1 if <wchar.h> declares mbstate_t.]) + else + AC_DEFINE([mbstate_t], int, [Define to a type if <wchar.h> does not define.]) fi]) diff --git a/gettext-tools/m4/mbswidth.m4 b/gettext-tools/m4/mbswidth.m4 index e90209b..d7981ca 100644 --- a/gettext-tools/m4/mbswidth.m4 +++ b/gettext-tools/m4/mbswidth.m4 @@ -32,5 +32,5 @@ 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.]) - AC_MBSTATE_T + AC_TYPE_MBSTATE_T ]) diff --git a/gettext-tools/m4/quotearg.m4 b/gettext-tools/m4/quotearg.m4 new file mode 100644 index 0000000..2fba109 --- /dev/null +++ b/gettext-tools/m4/quotearg.m4 @@ -0,0 +1,16 @@ +# quotearg.m4 serial 1 +dnl Copyright (C) 2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +AC_DEFUN([gl_QUOTEARG], +[ + dnl Prerequisites of lib/quotearg.c. + AC_CHECK_HEADERS_ONCE(wchar.h wctype.h) + AC_CHECK_FUNCS_ONCE(iswprint mbsinit) + AC_TYPE_MBSTATE_T + jm_FUNC_MBRTOWC +]) |