From 26112352a774737e1ce5580c93654a26c1e82b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 24 Oct 2022 22:25:29 +0200 Subject: New upstream version 1.1 --- gnulib-m4/assert_h.m4 | 61 +++ gnulib-m4/c-bool.m4 | 51 +++ gnulib-m4/extern-inline.m4 | 19 +- gnulib-m4/gnulib-cache.m4 | 2 +- gnulib-m4/gnulib-common.m4 | 108 ++++- gnulib-m4/gnulib-comp.m4 | 887 ++++++++++++++++++++--------------------- gnulib-m4/host-cpu-c-abi.m4 | 5 +- gnulib-m4/iconv.m4 | 24 +- gnulib-m4/largefile.m4 | 7 +- gnulib-m4/lib-link.m4 | 6 +- gnulib-m4/lib-prefix.m4 | 4 +- gnulib-m4/libunistring-base.m4 | 4 +- gnulib-m4/nanosleep.m4 | 39 +- gnulib-m4/pselect.m4 | 73 ++++ gnulib-m4/sigaction.m4 | 40 -- gnulib-m4/stdalign.m4 | 104 ++++- gnulib-m4/stdbool.m4 | 117 ------ gnulib-m4/stdio_h.m4 | 29 +- gnulib-m4/sys_stat_h.m4 | 6 +- gnulib-m4/time_h.m4 | 8 +- gnulib-m4/unistd_h.m4 | 1 + gnulib-m4/warn-on-use.m4 | 21 +- gnulib-m4/year2038.m4 | 10 +- 23 files changed, 921 insertions(+), 705 deletions(-) create mode 100644 gnulib-m4/assert_h.m4 create mode 100644 gnulib-m4/c-bool.m4 create mode 100644 gnulib-m4/pselect.m4 delete mode 100644 gnulib-m4/sigaction.m4 delete mode 100644 gnulib-m4/stdbool.m4 (limited to 'gnulib-m4') diff --git a/gnulib-m4/assert_h.m4 b/gnulib-m4/assert_h.m4 new file mode 100644 index 0000000..c1306da --- /dev/null +++ b/gnulib-m4/assert_h.m4 @@ -0,0 +1,61 @@ +# assert-h.m4 +dnl Copyright (C) 2011-2022 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 From Paul Eggert. + +AC_DEFUN([gl_ASSERT_H], +[ + AC_CACHE_CHECK([for static_assert], [gl_cv_static_assert], + [gl_save_CFLAGS=$CFLAGS + for gl_working in "yes, a keyword" "yes, an macro"; do + AS_CASE([$gl_working], + [*assert.h*], [CFLAGS="$gl_save_CFLAGS -DINCLUDE_ASSERT_H"]) + + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#if defined __clang__ && __STDC_VERSION__ < 202311 + #pragma clang diagnostic error "-Wc2x-extensions" + #pragma clang diagnostic error "-Wc++17-extensions" + #endif + #ifdef INCLUDE_ASSERT_H + #include + #endif + static_assert (2 + 2 == 4, "arithmetic does not work"); + static_assert (2 + 2 == 4); + ]], + [[ + static_assert (sizeof (char) == 1, "sizeof does not work"); + static_assert (sizeof (char) == 1); + ]])], + [gl_cv_static_assert=$gl_working], + [gl_cv_static_assert=no]) + CFLAGS=$gl_save_CFLAGS + test "$gl_cv_static_assert" != no && break + done]) + + GL_GENERATE_ASSERT_H=false + AS_CASE([$gl_cv_static_assert], + [yes*keyword*], + [AC_DEFINE([HAVE_C_STATIC_ASSERT], [1], + [Define to 1 if the static_assert keyword works.])], + [no], + [GL_GENERATE_ASSERT_H=true + gl_NEXT_HEADERS([assert.h])]) + + dnl The "zz" puts this toward config.h's end, to avoid potential + dnl collisions with other definitions. #undef assert so that + dnl programs are not tempted to use it without specifically + dnl including assert.h. Break the #undef apart with a comment + dnl so that 'configure' does not comment it out. + AH_VERBATIM([zzstatic_assert], +[#if (!defined HAVE_C_STATIC_ASSERT && !defined assert \ + && (!defined __cplusplus \ + || (__cpp_static_assert < 201411 \ + && __GNUG__ < 6 && __clang_major__ < 6))) + #include + #undef/**/assert +#endif]) +]) diff --git a/gnulib-m4/c-bool.m4 b/gnulib-m4/c-bool.m4 new file mode 100644 index 0000000..bb109b7 --- /dev/null +++ b/gnulib-m4/c-bool.m4 @@ -0,0 +1,51 @@ +# Check for bool that conforms to C2023. + +dnl Copyright 2022 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. + +AC_DEFUN([gl_C_BOOL], +[ + AC_CACHE_CHECK([for bool, true, false], [gl_cv_c_bool], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[ + #if true == false + #error "true == false" + #endif + extern bool b; + bool b = true == false;]])], + [gl_cv_c_bool=yes], + [gl_cv_c_bool=no])]) + if test "$gl_cv_c_bool" = yes; then + AC_DEFINE([HAVE_C_BOOL], [1], + [Define to 1 if bool, true and false work as per C2023.]) + fi + + AC_CHECK_HEADERS_ONCE([stdbool.h]) + + dnl The "zz" puts this toward config.h's end, to avoid potential + dnl collisions with other definitions. + dnl If 'bool', 'true' and 'false' do not work, arrange for them to work. + dnl In C, this means including if it is not already included. + dnl However, if the preprocessor mistakenly treats 'true' as 0, + dnl define it to a bool expression equal to 1; this is needed in + dnl Sun C++ 5.11 (Oracle Solaris Studio 12.2, 2010) and older. + AH_VERBATIM([zzbool], +[#ifndef HAVE_C_BOOL +# if !defined __cplusplus && !defined __bool_true_false_are_defined +# if HAVE_STDBOOL_H +# include +# else +# if defined __SUNPRO_C +# error " is not usable with this configuration. To make it usable, add -D_STDC_C99= to $CC." +# else +# error " does not exist on this platform. Use gnulib module 'stdbool-c99' instead of gnulib module 'stdbool'." +# endif +# endif +# endif +# if !true +# define true (!false) +# endif +#endif]) +]) diff --git a/gnulib-m4/extern-inline.m4 b/gnulib-m4/extern-inline.m4 index 2e914db..8a12bdd 100644 --- a/gnulib-m4/extern-inline.m4 +++ b/gnulib-m4/extern-inline.m4 @@ -7,7 +7,22 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_EXTERN_INLINE], [ - AH_VERBATIM([extern_inline], + AC_CACHE_CHECK([whether ctype.h defines __header_inline], + [gl_cv_have___header_inline], + [AC_PREPROC_IFELSE( + [AC_LANG_SOURCE([[#include + #ifndef __header_inline + #error " does not define __header_inline" + #endif + ]])], + [gl_cv_have___header_inline=yes], + [gl_cv_have___header_inline=no])]) + if test "$gl_cv_have___header_inline" = yes; then + AC_DEFINE([HAVE___HEADER_INLINE], [1], + [Define to 1 if ctype.h defines __header_inline.]) + fi + + AH_VERBATIM([HAVE___HEADER_INLINE_1], [/* Please see the Gnulib manual for how to use these macros. Suppress extern inline with HP-UX cc, as it appears to be broken; see @@ -54,7 +69,7 @@ AC_DEFUN([gl_EXTERN_INLINE], */ #if (((defined __APPLE__ && defined __MACH__) \ || defined __DragonFly__ || defined __FreeBSD__) \ - && (defined __header_inline \ + && (defined HAVE___HEADER_INLINE \ ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ && ! defined __clang__) \ : ((! defined _DONT_USE_CTYPE_INLINE_ \ diff --git a/gnulib-m4/gnulib-cache.m4 b/gnulib-m4/gnulib-cache.m4 index 5e2df6b..a28477a 100644 --- a/gnulib-m4/gnulib-cache.m4 +++ b/gnulib-m4/gnulib-cache.m4 @@ -2,7 +2,7 @@ # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This file is distributed in the hope that it will be useful, diff --git a/gnulib-m4/gnulib-common.m4 b/gnulib-m4/gnulib-common.m4 index 87a9a75..d17cbec 100644 --- a/gnulib-m4/gnulib-common.m4 +++ b/gnulib-m4/gnulib-common.m4 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 69 +# gnulib-common.m4 serial 74 dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -69,7 +69,9 @@ AC_DEFUN([gl_COMMON_BODY], [ [/* Attributes. */ #if (defined __has_attribute \ && (!defined __clang_minor__ \ - || 3 < __clang_major__ + (5 <= __clang_minor__))) + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))) # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) #else # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr @@ -104,12 +106,16 @@ AC_DEFUN([gl_COMMON_BODY], [ #endif #ifdef __has_c_attribute +# if ((defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710 \ + && _GL_GNUC_PREREQ (4, 6)) +# pragma GCC diagnostic ignored "-Wpedantic" +# endif # define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__) #else # define _GL_HAS_C_ATTRIBUTE(attr) 0 #endif -]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's _Alignas instead. +]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's alignas instead. [ /* _GL_ATTRIBUTE_ALLOC_SIZE ((N)) declares that the Nth argument of the function is the size of the returned memory block. @@ -181,7 +187,12 @@ AC_DEFUN([gl_COMMON_BODY], [ #else # define _GL_ATTRIBUTE_DEALLOC(f, i) #endif -#define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) +/* If gnulib's or has already defined this macro, continue + to use this earlier definition, since may not have been included + yet. */ +#ifndef _GL_ATTRIBUTE_DEALLOC_FREE +# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) +#endif /* _GL_ATTRIBUTE_DEPRECATED: Declares that an entity is deprecated. The compiler may warn if the entity is used. */ @@ -302,7 +313,8 @@ AC_DEFUN([gl_COMMON_BODY], [ #else # define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED #endif -/* Alternative spelling of this macro, for convenience. */ +/* Alternative spelling of this macro, for convenience and for + compatibility with glibc/include/libc-symbols.h. */ #define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED /* Earlier spellings of this macro. */ #define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED @@ -813,6 +825,24 @@ AC_DEFUN([gl_CACHE_VAL_SILENT], ]) ]) +# gl_CONDITIONAL(conditional, condition) +# is like AM_CONDITIONAL(conditional, condition), except that it does not +# produce an error +# configure: error: conditional "..." was never defined. +# Usually this means the macro was only invoked conditionally. +# when only invoked conditionally. Instead, in that case, both the _TRUE +# and the _FALSE case are disabled. +AC_DEFUN([gl_CONDITIONAL], +[ + pushdef([AC_CONFIG_COMMANDS_PRE], [:])dnl + AM_CONDITIONAL([$1], [$2]) + popdef([AC_CONFIG_COMMANDS_PRE])dnl + if test -z "${[$1]_TRUE}" && test -z "${[$1]_FALSE}"; then + [$1]_TRUE='#' + [$1]_FALSE='#' + fi +]) + # gl_CC_ALLOW_WARNINGS # sets and substitutes a variable GL_CFLAG_ALLOW_WARNINGS, to a $(CC) option # that reverts a preceding '-Werror' option, if available. @@ -879,6 +909,72 @@ AC_DEFUN([gl_CXX_ALLOW_WARNINGS], AC_SUBST([GL_CXXFLAG_ALLOW_WARNINGS]) ]) +# gl_CC_GNULIB_WARNINGS +# sets and substitutes a variable GL_CFLAG_GNULIB_WARNINGS, to a $(CC) option +# set that enables or disables warnings as suitable for the Gnulib coding style. +AC_DEFUN([gl_CC_GNULIB_WARNINGS], +[ + AC_REQUIRE([gl_CC_ALLOW_WARNINGS]) + dnl Assume that the compiler supports -Wno-* options only if it also supports + dnl -Wno-error. + GL_CFLAG_GNULIB_WARNINGS='' + if test -n "$GL_CFLAG_ALLOW_WARNINGS"; then + dnl Enable these warning options: + dnl + dnl GCC clang + dnl -Wno-cast-qual >= 3 >= 3.9 + dnl -Wno-conversion >= 3 >= 3.9 + dnl -Wno-float-conversion >= 4.9 >= 3.9 + dnl -Wno-float-equal >= 3 >= 3.9 + dnl -Wimplicit-fallthrough >= 7 >= 3.9 + dnl -Wno-pedantic >= 4.8 >= 3.9 + dnl -Wno-sign-compare >= 3 >= 3.9 + dnl -Wno-sign-conversion >= 4.3 >= 3.9 + dnl -Wno-type-limits >= 4.3 >= 3.9 + dnl -Wno-undef >= 3 >= 3.9 + dnl -Wno-unsuffixed-float-constants >= 4.5 + dnl -Wno-unused-function >= 3 >= 3.9 + dnl -Wno-unused-parameter >= 3 >= 3.9 + dnl + cat > conftest.c <<\EOF + #if __GNUC__ >= 3 || (__clang_major__ + (__clang_minor__ >= 9) > 3) + -Wno-cast-qual + -Wno-conversion + -Wno-float-equal + -Wno-sign-compare + -Wno-undef + -Wno-unused-function + -Wno-unused-parameter + #endif + #if __GNUC__ + (__GNUC_MINOR__ >= 9) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) + -Wno-float-conversion + #endif + #if __GNUC__ >= 7 || (__clang_major__ + (__clang_minor__ >= 9) > 3) + -Wimplicit-fallthrough + #endif + #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) + -Wno-pedantic + #endif + #if __GNUC__ + (__GNUC_MINOR__ >= 3) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) + -Wno-sign-conversion + -Wno-type-limits + #endif + #if __GNUC__ + (__GNUC_MINOR__ >= 5) > 4 + -Wno-unsuffixed-float-constants + #endif +EOF + gl_command="$CC $CFLAGS $CPPFLAGS -E conftest.c > conftest.out" + if AC_TRY_EVAL([gl_command]); then + gl_options=`grep -v '#' conftest.out` + for word in $gl_options; do + GL_CFLAG_GNULIB_WARNINGS="$GL_CFLAG_GNULIB_WARNINGS $word" + done + fi + rm -f conftest.c conftest.out + fi + AC_SUBST([GL_CFLAG_GNULIB_WARNINGS]) +]) + dnl gl_CONDITIONAL_HEADER([foo.h]) dnl takes a shell variable GL_GENERATE_FOO_H (with value true or false) as input dnl and produces @@ -903,7 +999,7 @@ AC_DEFUN([gl_CONDITIONAL_HEADER], *) echo "*** gl_generate_var is not set correctly" 1>&2; exit 1 ;; esac AC_SUBST(gl_header_name) - AM_CONDITIONAL(gl_generate_cond, [$gl_generate_var]) + gl_CONDITIONAL(gl_generate_cond, [$gl_generate_var]) m4_popdef([gl_generate_cond]) m4_popdef([gl_generate_var]) m4_popdef([gl_header_name]) diff --git a/gnulib-m4/gnulib-comp.m4 b/gnulib-m4/gnulib-comp.m4 index 62dedba..7bad398 100644 --- a/gnulib-m4/gnulib-comp.m4 +++ b/gnulib-m4/gnulib-comp.m4 @@ -3,7 +3,7 @@ # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This file is distributed in the hope that it will be useful, @@ -42,7 +42,6 @@ AC_DEFUN([gl_EARLY], AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_PROG_AR_RANLIB]) - AC_REQUIRE([AM_PROG_CC_C_O]) # Code from module absolute-header: # Code from module accept: # Code from module accept-tests: @@ -54,6 +53,8 @@ AC_DEFUN([gl_EARLY], # Code from module arpa_inet-tests: # Code from module array-mergesort: # Code from module array-mergesort-tests: + # Code from module assert-h: + # Code from module assert-h-tests: # Code from module attribute: # Code from module basename-lgpl: # Code from module binary-io: @@ -173,8 +174,8 @@ AC_DEFUN([gl_EARLY], # Code from module langinfo: # Code from module langinfo-tests: # Code from module largefile: - AC_REQUIRE([AC_SYS_LARGEFILE]) AC_REQUIRE([gl_YEAR2038_EARLY]) + AC_REQUIRE([AC_SYS_LARGEFILE]) # Code from module limits-h: # Code from module limits-h-tests: # Code from module listen: @@ -229,6 +230,8 @@ AC_DEFUN([gl_EARLY], # Code from module printf-frexpl: # Code from module printf-frexpl-tests: # Code from module printf-safe: + # Code from module pselect: + # Code from module pselect-tests: # Code from module pthread-h: gl_ANYTHREADLIB_EARLY # Code from module pthread-h-tests: @@ -259,8 +262,6 @@ AC_DEFUN([gl_EARLY], # Code from module setlocale-tests: # Code from module setsockopt: # Code from module setsockopt-tests: - # Code from module sigaction: - # Code from module sigaction-tests: # Code from module signal-h: # Code from module signal-h-tests: # Code from module signbit: @@ -289,6 +290,8 @@ AC_DEFUN([gl_EARLY], # Code from module stdalign-tests: # Code from module stdbool: # Code from module stdbool-tests: + # Code from module stdckdint: + # Code from module stdckdint-tests: # Code from module stddef: # Code from module stddef-tests: # Code from module stdint: @@ -1344,6 +1347,9 @@ AC_DEFUN([gl_INIT], gl_CONDITIONAL_HEADER([alloca.h]) AC_PROG_MKDIR_P AC_REQUIRE([AC_C_RESTRICT]) + gl_ASSERT_H + gl_CONDITIONAL_HEADER([assert.h]) + AC_PROG_MKDIR_P gl___BUILTIN_EXPECT gl_HEADER_ERRNO_H gl_CONDITIONAL_HEADER([errno.h]) @@ -1353,17 +1359,13 @@ AC_DEFUN([gl_INIT], gl_FLOAT_H gl_CONDITIONAL_HEADER([float.h]) AC_PROG_MKDIR_P - if test $REPLACE_FLOAT_LDBL = 1; then - AC_LIBOBJ([float]) - fi - if test $REPLACE_ITOLD = 1; then - AC_LIBOBJ([itold]) - fi + gl_CONDITIONAL([GL_COND_OBJ_FLOAT], [test $REPLACE_FLOAT_LDBL = 1]) + gl_CONDITIONAL([GL_COND_OBJ_ITOLD], [test $REPLACE_ITOLD = 1]) gl_FUNC_FREE - if test $REPLACE_FREE = 1; then - AC_LIBOBJ([free]) + gl_CONDITIONAL([GL_COND_OBJ_FREE], [test $REPLACE_FREE = 1]) + AM_COND_IF([GL_COND_OBJ_FREE], [ gl_PREREQ_FREE - fi + ]) gl_STDLIB_MODULE_INDICATOR([free-posix]) gl_FUNC_FREXP_NO_LIBM if test $gl_func_frexp_no_libm != yes; then @@ -1376,9 +1378,7 @@ AC_DEFUN([gl_INIT], fi gl_MATH_MODULE_INDICATOR([frexpl]) gl_FUNC_FSETERR - if test $ac_cv_func___fseterr = no; then - AC_LIBOBJ([fseterr]) - fi + gl_CONDITIONAL([GL_COND_OBJ_FSETERR], [test $ac_cv_func___fseterr = no]) AC_REQUIRE([gl_FUNC_SETLOCALE_NULL]) LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL" AC_SUBST([LIB_HARD_LOCALE]) @@ -1393,13 +1393,8 @@ AC_DEFUN([gl_INIT], gl_FUNC_ICONV_OPEN dnl Because of gl_REPLACE_ICONV_H: gl_CONDITIONAL_HEADER([iconv.h]) - if test $REPLACE_ICONV_OPEN = 1; then - AC_LIBOBJ([iconv_open]) - fi - if test $REPLACE_ICONV = 1; then - AC_LIBOBJ([iconv]) - AC_LIBOBJ([iconv_close]) - fi + gl_CONDITIONAL([GL_COND_OBJ_ICONV_OPEN], [test $REPLACE_ICONV_OPEN = 1]) + gl_CONDITIONAL([GL_COND_OBJ_ICONV], [test $REPLACE_ICONV = 1]) gl_INLINE gl_INTTYPES_INCOMPLETE gl_INTTYPES_H_REQUIRE_DEFAULTS @@ -1420,31 +1415,16 @@ AC_DEFUN([gl_INIT], gl_PREREQ_ISNANL fi gl_FUNC_ISWBLANK - if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then - : - else - if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then - AC_LIBOBJ([iswblank]) - fi - fi + gl_CONDITIONAL([GL_COND_OBJ_ISWBLANK], + [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && { test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; }]) gl_WCTYPE_MODULE_INDICATOR([iswblank]) gl_FUNC_ISWDIGIT - if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then - : - else - if test $REPLACE_ISWDIGIT = 1; then - AC_LIBOBJ([iswdigit]) - fi - fi + gl_CONDITIONAL([GL_COND_OBJ_ISWDIGIT], + [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWDIGIT = 1]) gl_WCTYPE_MODULE_INDICATOR([iswdigit]) gl_FUNC_ISWXDIGIT - if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then - : - else - if test $REPLACE_ISWXDIGIT = 1; then - AC_LIBOBJ([iswxdigit]) - fi - fi + gl_CONDITIONAL([GL_COND_OBJ_ISWXDIGIT], + [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWXDIGIT = 1]) gl_WCTYPE_MODULE_INDICATOR([iswxdigit]) gl_LANGINFO_H gl_LANGINFO_H_REQUIRE_DEFAULTS @@ -1475,28 +1455,30 @@ AC_DEFUN([gl_INIT], gl_MBCHAR gl_MBITER gl_FUNC_MBRTOWC - if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then - AC_LIBOBJ([mbrtowc]) + gl_CONDITIONAL([GL_COND_OBJ_MBRTOWC], + [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]) + AM_COND_IF([GL_COND_OBJ_MBRTOWC], [ if test $REPLACE_MBSTATE_T = 1; then AC_LIBOBJ([lc-charset-dispatch]) AC_LIBOBJ([mbtowc-lock]) gl_PREREQ_MBTOWC_LOCK fi gl_PREREQ_MBRTOWC - fi + ]) gl_WCHAR_MODULE_INDICATOR([mbrtowc]) gl_FUNC_MBSINIT - if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then - AC_LIBOBJ([mbsinit]) + gl_CONDITIONAL([GL_COND_OBJ_MBSINIT], + [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]) + AM_COND_IF([GL_COND_OBJ_MBSINIT], [ gl_PREREQ_MBSINIT - fi + ]) gl_WCHAR_MODULE_INDICATOR([mbsinit]) gl_STRING_MODULE_INDICATOR([mbsnlen]) gl_FUNC_MEMCHR - if test $REPLACE_MEMCHR = 1; then - AC_LIBOBJ([memchr]) + gl_CONDITIONAL([GL_COND_OBJ_MEMCHR], [test $REPLACE_MEMCHR = 1]) + AM_COND_IF([GL_COND_OBJ_MEMCHR], [ gl_PREREQ_MEMCHR - fi + ]) gl_STRING_MODULE_INDICATOR([memchr]) gl_MINMAX gl_MULTIARCH @@ -1508,22 +1490,25 @@ AC_DEFUN([gl_INIT], AC_LIBOBJ([relocatable]) fi gl_FUNC_SETLOCALE_NULL - if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then - AC_LIBOBJ([setlocale-lock]) + gl_CONDITIONAL([GL_COND_OBJ_SETLOCALE_LOCK], + [test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0]) + AM_COND_IF([GL_COND_OBJ_SETLOCALE_LOCK], [ gl_PREREQ_SETLOCALE_LOCK - fi + ]) gl_LOCALE_MODULE_INDICATOR([setlocale_null]) gl_SIGNBIT - if test $REPLACE_SIGNBIT = 1; then - AC_LIBOBJ([signbitf]) - AC_LIBOBJ([signbitd]) - AC_LIBOBJ([signbitl]) - fi + gl_CONDITIONAL([GL_COND_OBJ_SIGNBIT3], [test $REPLACE_SIGNBIT = 1]) gl_MATH_MODULE_INDICATOR([signbit]) gl_SIZE_MAX gt_TYPE_SSIZE_T - gl_STDBOOL_H - gl_CONDITIONAL_HEADER([stdbool.h]) + gl_C_BOOL + AC_CHECK_HEADERS_ONCE([stdckdint.h]) + if test $ac_cv_header_stdckdint_h = yes; then + GL_GENERATE_STDCKDINT_H=false + else + GL_GENERATE_STDCKDINT_H=true + fi + gl_CONDITIONAL_HEADER([stdckdint.h]) AC_PROG_MKDIR_P gl_STDDEF_H gl_STDDEF_H_REQUIRE_DEFAULTS @@ -1545,10 +1530,10 @@ AC_DEFUN([gl_INIT], gl_STRING_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P gl_FUNC_STRNCAT - if test $REPLACE_STRNCAT = 1; then - AC_LIBOBJ([strncat]) + gl_CONDITIONAL([GL_COND_OBJ_STRNCAT], [test $REPLACE_STRNCAT = 1]) + AM_COND_IF([GL_COND_OBJ_STRNCAT], [ gl_PREREQ_STRNCAT - fi + ]) gl_STRING_MODULE_INDICATOR([strncat]) gl_FUNC_STRSTR if test $REPLACE_STRSTR = 1; then @@ -1575,63 +1560,63 @@ AC_DEFUN([gl_INIT], gl_LIBUNISTRING_MODULE([0.9.11], [unicase/tolower]) gl_LIBUNISTRING_MODULE([0.9.11], [unicase/totitle]) gl_LIBUNISTRING_MODULE([0.9.11], [unicase/toupper]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-casecmp]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-casecoll]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-casefold]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-casexfrm]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-ct-casefold]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-ct-tolower]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-ct-totitle]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-ct-toupper]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-cased]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-casefolded]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-lowercase]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-titlecase]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-uppercase]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-prefix-context]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-suffix-context]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-tolower]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-totitle]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-toupper]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-casecmp]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-casecoll]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-casefold]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-casexfrm]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-ct-casefold]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-ct-tolower]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-ct-totitle]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-ct-toupper]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-cased]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-casefolded]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-lowercase]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-titlecase]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-uppercase]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-prefix-context]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-suffix-context]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-tolower]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-totitle]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-toupper]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-casecmp]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-casecoll]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-casefold]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-casexfrm]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-ct-casefold]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-ct-tolower]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-ct-totitle]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-ct-toupper]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-cased]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-casefolded]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-lowercase]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-titlecase]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-uppercase]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-prefix-context]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-suffix-context]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-tolower]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-totitle]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-toupper]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/ulc-casecmp]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/ulc-casecoll]) - gl_LIBUNISTRING_MODULE([0.9.11], [unicase/ulc-casexfrm]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-casecmp]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-casecoll]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-casefold]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-casexfrm]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-ct-casefold]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-ct-tolower]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-ct-totitle]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-ct-toupper]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-is-cased]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-is-casefolded]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-is-lowercase]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-is-titlecase]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-is-uppercase]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-prefix-context]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-suffix-context]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-tolower]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-totitle]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-toupper]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-casecmp]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-casecoll]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-casefold]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-casexfrm]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-ct-casefold]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-ct-tolower]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-ct-totitle]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-ct-toupper]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-is-cased]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-is-casefolded]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-is-lowercase]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-is-titlecase]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-is-uppercase]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-prefix-context]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-suffix-context]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-tolower]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-totitle]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-toupper]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-casecmp]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-casecoll]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-casefold]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-casexfrm]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-ct-casefold]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-ct-tolower]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-ct-totitle]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-ct-toupper]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-is-cased]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-is-casefolded]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-is-lowercase]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-is-titlecase]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-is-uppercase]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-prefix-context]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-suffix-context]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-tolower]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-totitle]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-toupper]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/ulc-casecmp]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/ulc-casecoll]) + gl_LIBUNISTRING_MODULE([1.1], [unicase/ulc-casexfrm]) gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniconv.h]) AC_PROG_MKDIR_P AC_REQUIRE([gl_BIGENDIAN]) @@ -1660,67 +1645,67 @@ AC_DEFUN([gl_INIT], gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-byname]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-longname]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-name]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-of]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-test]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/block-list]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/bidiclass-of]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/bidiclass-test]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/block-list]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/block-test]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-C]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-C]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Cc]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Cf]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Cn]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Cf]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Cn]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Co]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Cs]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-L]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-LC]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Ll]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Lm]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Lo]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-L]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-LC]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Ll]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Lm]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Lo]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Lt]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Lu]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-M]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Mc]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-M]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Mc]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Me]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Mn]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-N]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Nd]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Mn]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-N]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Nd]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Nl]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-No]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-P]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-No]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-P]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Pc]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Pd]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Pe]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Pf]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Pi]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Po]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Po]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Ps]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-S]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-S]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Sc]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Sk]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Sm]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-So]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-So]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Z]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Zl]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Zp]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Zs]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-and]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-and-not]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-byname]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-and]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-and-not]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-byname]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-longname]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-name]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-none]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-of]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-or]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-of]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/category-or]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-test]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/combining-class]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/combining-class]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/combining-class-byname]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/combining-class-longname]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/combining-class-name]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-alnum]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/ctype-alnum]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-alpha]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/ctype-alpha]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-blank]) AC_REQUIRE([AC_C_INLINE]) @@ -1728,73 +1713,73 @@ AC_DEFUN([gl_INIT], AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-digit]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-graph]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/ctype-graph]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-lower]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-print]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/ctype-print]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-punct]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/ctype-punct]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-space]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-upper]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-xdigit]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/decimal-digit]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/digit]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/decimal-digit]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/digit]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/joininggroup-byname]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/joininggroup-name]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/joininggroup-of]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/joiningtype-byname]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/joiningtype-longname]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/joiningtype-name]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/joiningtype-of]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/joiningtype-of]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/mirror]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/numeric]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/numeric]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-alphabetic]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-alphabetic]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-ascii-hex-digit]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-arabic-digit]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-arabic-digit]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-arabic-right-to-left]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-arabic-right-to-left]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-block-separator]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-block-separator]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-boundary-neutral]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-boundary-neutral]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-common-separator]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-common-separator]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-control]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-control]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-embedding-or-override]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-embedding-or-override]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-eur-num-separator]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-eur-num-separator]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-eur-num-terminator]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-eur-num-terminator]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-european-digit]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-european-digit]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-hebrew-right-to-left]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-hebrew-right-to-left]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-left-to-right]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-left-to-right]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-non-spacing-mark]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-non-spacing-mark]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-other-neutral]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-other-neutral]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-pdf]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-pdf]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-segment-separator]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-segment-separator]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-whitespace]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-byname]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-whitespace]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-byname]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-case-ignorable]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-case-ignorable]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-cased]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-cased]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-changes-when-casefolded]) AC_REQUIRE([AC_C_INLINE]) @@ -1806,7 +1791,7 @@ AC_DEFUN([gl_INIT], AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-changes-when-uppercased]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-combining]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-combining]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-composite]) AC_REQUIRE([AC_C_INLINE]) @@ -1814,23 +1799,23 @@ AC_DEFUN([gl_INIT], AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-dash]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-decimal-digit]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-decimal-digit]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-default-ignorable-code-point]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-deprecated]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-diacritic]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-diacritic]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-emoji]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-emoji]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-emoji-component]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-emoji-modifier]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-emoji-modifier-base]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-emoji-modifier-base]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-emoji-presentation]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-emoji-presentation]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-extended-pictographic]) AC_REQUIRE([AC_C_INLINE]) @@ -1838,27 +1823,27 @@ AC_DEFUN([gl_INIT], AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-format-control]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-grapheme-base]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-grapheme-base]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-grapheme-extend]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-grapheme-extend]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-grapheme-link]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-grapheme-link]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-hex-digit]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-hyphen]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-id-continue]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-id-continue]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-id-start]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-id-start]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-ideographic]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-ideographic]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-ids-binary-operator]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-ids-trinary-operator]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-ignorable-control]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-ignorable-control]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-iso-control]) AC_REQUIRE([AC_C_INLINE]) @@ -1870,7 +1855,7 @@ AC_DEFUN([gl_INIT], AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-logical-order-exception]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-lowercase]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-lowercase]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-math]) AC_REQUIRE([AC_C_INLINE]) @@ -1878,9 +1863,9 @@ AC_DEFUN([gl_INIT], AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-not-a-character]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-numeric]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-numeric]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-other-alphabetic]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-other-alphabetic]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-other-default-ignorable-code-point]) AC_REQUIRE([AC_C_INLINE]) @@ -1890,7 +1875,7 @@ AC_DEFUN([gl_INIT], AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-other-id-start]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-other-lowercase]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-other-lowercase]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-other-math]) AC_REQUIRE([AC_C_INLINE]) @@ -1906,7 +1891,7 @@ AC_DEFUN([gl_INIT], AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-private-use]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-punctuation]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-punctuation]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-quotation-mark]) AC_REQUIRE([AC_C_INLINE]) @@ -1914,20 +1899,20 @@ AC_DEFUN([gl_INIT], AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-regional-indicator]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-sentence-terminal]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-sentence-terminal]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-soft-dotted]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-soft-dotted]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-space]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-terminal-punctuation]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-terminal-punctuation]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-test]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-titlecase]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-unassigned-code-value]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-unassigned-code-value]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-unified-ideograph]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-unified-ideograph]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-uppercase]) AC_REQUIRE([AC_C_INLINE]) @@ -1935,85 +1920,85 @@ AC_DEFUN([gl_INIT], AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-white-space]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-xid-continue]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-xid-continue]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-xid-start]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-xid-start]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-zero-width]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/scripts]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/property-zero-width]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/scripts]) AC_REQUIRE([AC_C_INLINE]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/syntax-c-ident]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/syntax-c-whitespace]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unictype/syntax-java-ident]) + gl_LIBUNISTRING_MODULE([1.1], [unictype/syntax-java-ident]) gl_LIBUNISTRING_MODULE([0.9.8], [unictype/syntax-java-whitespace]) gl_LIBUNISTRING_LIBHEADER([0.9.11], [unigbrk.h]) AC_PROG_MKDIR_P gl_MODULE_INDICATOR([unigbrk/u16-grapheme-breaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u16-grapheme-breaks]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u16-grapheme-breaks]) gl_MODULE_INDICATOR([unigbrk/u16-grapheme-next]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u16-grapheme-next]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u16-grapheme-next]) gl_MODULE_INDICATOR([unigbrk/u16-grapheme-prev]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u16-grapheme-prev]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u16-grapheme-prev]) gl_MODULE_INDICATOR([unigbrk/u32-grapheme-breaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u32-grapheme-breaks]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u32-grapheme-breaks]) gl_MODULE_INDICATOR([unigbrk/u32-grapheme-next]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u32-grapheme-next]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u32-grapheme-next]) gl_MODULE_INDICATOR([unigbrk/u32-grapheme-prev]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u32-grapheme-prev]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u32-grapheme-prev]) gl_MODULE_INDICATOR([unigbrk/u8-grapheme-breaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u8-grapheme-breaks]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u8-grapheme-breaks]) gl_MODULE_INDICATOR([unigbrk/u8-grapheme-next]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u8-grapheme-next]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u8-grapheme-next]) gl_MODULE_INDICATOR([unigbrk/u8-grapheme-prev]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u8-grapheme-prev]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/uc-gbrk-prop]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u8-grapheme-prev]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/uc-gbrk-prop]) gl_MODULE_INDICATOR([unigbrk/uc-grapheme-breaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/uc-grapheme-breaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/uc-is-grapheme-break]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/uc-grapheme-breaks]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/uc-is-grapheme-break]) gl_MODULE_INDICATOR([unigbrk/ulc-grapheme-breaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/ulc-grapheme-breaks]) + gl_LIBUNISTRING_MODULE([1.1], [unigbrk/ulc-grapheme-breaks]) gl_LIBUNISTRING_LIBHEADER([0.9.11], [unilbrk.h]) AC_PROG_MKDIR_P AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u16-possible-linebreaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u16-width-linebreaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u32-possible-linebreaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u32-width-linebreaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u8-possible-linebreaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u8-width-linebreaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/ulc-possible-linebreaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/ulc-width-linebreaks]) + gl_LIBUNISTRING_MODULE([1.1], [unilbrk/u16-possible-linebreaks]) + gl_LIBUNISTRING_MODULE([1.1], [unilbrk/u16-width-linebreaks]) + gl_LIBUNISTRING_MODULE([1.1], [unilbrk/u32-possible-linebreaks]) + gl_LIBUNISTRING_MODULE([1.1], [unilbrk/u32-width-linebreaks]) + gl_LIBUNISTRING_MODULE([1.1], [unilbrk/u8-possible-linebreaks]) + gl_LIBUNISTRING_MODULE([1.1], [unilbrk/u8-width-linebreaks]) + gl_LIBUNISTRING_MODULE([1.1], [unilbrk/ulc-possible-linebreaks]) + gl_LIBUNISTRING_MODULE([1.1], [unilbrk/ulc-width-linebreaks]) gl_LIBUNISTRING_LIBHEADER([0.9.5], [uniname.h]) AC_PROG_MKDIR_P - gl_LIBUNISTRING_MODULE([0.9.11], [uniname/uniname]) + gl_LIBUNISTRING_MODULE([1.1], [uniname/uniname]) gl_LIBUNISTRING_LIBHEADER([0.9.11], [uninorm.h]) AC_PROG_MKDIR_P - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/canonical-decomposition]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/canonical-decomposition]) gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/composition]) gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/decomposing-form]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/decomposition]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/decomposition]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/filter]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/nfc]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/nfd]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/nfkc]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/nfkd]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/filter]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfc]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfd]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfkc]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfkd]) gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u16-normalize]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u16-normalize]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u16-normcmp]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u16-normcoll]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u16-normxfrm]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/u16-normalize]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/u16-normcmp]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/u16-normcoll]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/u16-normxfrm]) gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u32-normalize]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u32-normalize]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u32-normcmp]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u32-normcoll]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u32-normxfrm]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/u32-normalize]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/u32-normcmp]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/u32-normcoll]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/u32-normxfrm]) gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u8-normalize]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u8-normalize]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u8-normcmp]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u8-normcoll]) - gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u8-normxfrm]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/u8-normalize]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/u8-normcmp]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/u8-normcoll]) + gl_LIBUNISTRING_MODULE([1.1], [uninorm/u8-normxfrm]) gl_UNISTD_H gl_UNISTD_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P @@ -2247,20 +2232,20 @@ AC_DEFUN([gl_INIT], ]) gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwbrk.h]) AC_PROG_MKDIR_P - gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/u16-wordbreaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/u32-wordbreaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/u8-wordbreaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/ulc-wordbreaks]) - gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/wordbreak-property]) + gl_LIBUNISTRING_MODULE([1.1], [uniwbrk/u16-wordbreaks]) + gl_LIBUNISTRING_MODULE([1.1], [uniwbrk/u32-wordbreaks]) + gl_LIBUNISTRING_MODULE([1.1], [uniwbrk/u8-wordbreaks]) + gl_LIBUNISTRING_MODULE([1.1], [uniwbrk/ulc-wordbreaks]) + gl_LIBUNISTRING_MODULE([1.1], [uniwbrk/wordbreak-property]) gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwidth.h]) AC_PROG_MKDIR_P - gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u16-strwidth]) - gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u16-width]) - gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u32-strwidth]) - gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u32-width]) - gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u8-strwidth]) - gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u8-width]) - gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/width]) + gl_LIBUNISTRING_MODULE([1.1], [uniwidth/u16-strwidth]) + gl_LIBUNISTRING_MODULE([1.1], [uniwidth/u16-width]) + gl_LIBUNISTRING_MODULE([1.1], [uniwidth/u32-strwidth]) + gl_LIBUNISTRING_MODULE([1.1], [uniwidth/u32-width]) + gl_LIBUNISTRING_MODULE([1.1], [uniwidth/u8-strwidth]) + gl_LIBUNISTRING_MODULE([1.1], [uniwidth/u8-width]) + gl_LIBUNISTRING_MODULE([1.1], [uniwidth/width]) gl_WCHAR_H gl_WCHAR_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P @@ -2268,35 +2253,24 @@ AC_DEFUN([gl_INIT], gl_WCTYPE_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P gl_FUNC_WCWIDTH - if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then - AC_LIBOBJ([wcwidth]) + gl_CONDITIONAL([GL_COND_OBJ_WCWIDTH], + [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]) + AM_COND_IF([GL_COND_OBJ_WCWIDTH], [ gl_PREREQ_WCWIDTH - fi + ]) gl_WCHAR_MODULE_INDICATOR([wcwidth]) AC_REQUIRE([AC_CANONICAL_HOST]) - case "$host_os" in - mingw*) - AC_LIBOBJ([windows-mutex]) - ;; - esac + gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_MUTEX], + [case "$host_os" in mingw*) true;; *) false;; esac]) AC_REQUIRE([AC_CANONICAL_HOST]) - case "$host_os" in - mingw*) - AC_LIBOBJ([windows-once]) - ;; - esac + gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_ONCE], + [case "$host_os" in mingw*) true;; *) false;; esac]) AC_REQUIRE([AC_CANONICAL_HOST]) - case "$host_os" in - mingw*) - AC_LIBOBJ([windows-recmutex]) - ;; - esac + gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_RECMUTEX], + [case "$host_os" in mingw*) true;; *) false;; esac]) AC_REQUIRE([AC_CANONICAL_HOST]) - case "$host_os" in - mingw*) - AC_LIBOBJ([windows-rwlock]) - ;; - esac + gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_RWLOCK], + [case "$host_os" in mingw*) true;; *) false;; esac]) gl_XSIZE # End of code from modules m4_ifval(gl_LIBSOURCES_LIST, [ @@ -2320,16 +2294,28 @@ AC_DEFUN([gl_INIT], AC_CONFIG_COMMANDS_PRE([ gl_libobjs= gl_ltlibobjs= + gl_libobjdeps= if test -n "$gl_LIBOBJS"; then # Remove the extension. +changequote(,)dnl sed_drop_objext='s/\.o$//;s/\.obj$//' + sed_dirname1='s,//*,/,g' + sed_dirname2='s,\(.\)/$,\1,' + sed_dirname3='s,^[^/]*$,.,' + sed_dirname4='s,\(.\)/[^/]*$,\1,' + sed_basename1='s,.*/,,' +changequote([, ])dnl for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do gl_libobjs="$gl_libobjs $i.$ac_objext" gl_ltlibobjs="$gl_ltlibobjs $i.lo" + i_dir=`echo "$i" | sed -e "$sed_dirname1" -e "$sed_dirname2" -e "$sed_dirname3" -e "$sed_dirname4"` + i_base=`echo "$i" | sed -e "$sed_basename1"` + gl_libobjdeps="$gl_libobjdeps $i_dir/\$(DEPDIR)/$i_base.Plo" done fi AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) + AC_SUBST([gl_LIBOBJDEPS], [$gl_libobjdeps]) ]) gltests_libdeps= gltests_ltlibdeps= @@ -2352,23 +2338,20 @@ changequote([, ])dnl gl_module_indicator_condition=$gltests_WITNESS m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition]) AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([accept]) - fi + gl_CONDITIONAL([GL_COND_OBJ_ACCEPT], [test "$ac_cv_header_winsock2_h" = yes]) gl_SYS_SOCKET_MODULE_INDICATOR([accept]) gl_ARPA_INET_H gl_ARPA_INET_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([bind]) - fi + gl_CONDITIONAL([GL_COND_OBJ_BIND], [test "$ac_cv_header_winsock2_h" = yes]) gl_SYS_SOCKET_MODULE_INDICATOR([bind]) gl_FUNC_BTOWC - if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then - AC_LIBOBJ([btowc]) + gl_CONDITIONAL([GL_COND_OBJ_BTOWC], + [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1]) + AM_COND_IF([GL_COND_OBJ_BTOWC], [ gl_PREREQ_BTOWC - fi + ]) gl_WCHAR_MODULE_INDICATOR([btowc]) gt_LOCALE_FR gt_LOCALE_FR_UTF8 @@ -2386,111 +2369,103 @@ changequote([, ])dnl gl_STDLIB_MODULE_INDICATOR([calloc-posix]) gl_MODULE_INDICATOR_FOR_TESTS([cloexec]) gl_FUNC_CLOSE - if test $REPLACE_CLOSE = 1; then - AC_LIBOBJ([close]) - fi + gl_CONDITIONAL([GL_COND_OBJ_CLOSE], [test $REPLACE_CLOSE = 1]) gl_UNISTD_MODULE_INDICATOR([close]) AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([connect]) - fi + gl_CONDITIONAL([GL_COND_OBJ_CONNECT], [test "$ac_cv_header_winsock2_h" = yes]) gl_SYS_SOCKET_MODULE_INDICATOR([connect]) gl_CTYPE_H gl_CTYPE_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P gl_DOUBLE_SLASH_ROOT gl_FUNC_DUP2 - if test $REPLACE_DUP2 = 1; then - AC_LIBOBJ([dup2]) + gl_CONDITIONAL([GL_COND_OBJ_DUP2], [test $REPLACE_DUP2 = 1]) + AM_COND_IF([GL_COND_OBJ_DUP2], [ gl_PREREQ_DUP2 - fi + ]) gl_UNISTD_MODULE_INDICATOR([dup2]) gl_ENVIRON gl_UNISTD_MODULE_INDICATOR([environ]) gl_ERROR - AS_IF([test "$ac_cv_lib_error_at_line" = no], [ - AC_LIBOBJ([error]) + gl_CONDITIONAL([GL_COND_OBJ_ERROR], [test "$ac_cv_lib_error_at_line" = no]) + AM_COND_IF([GL_COND_OBJ_ERROR], [ gl_PREREQ_ERROR ]) m4_ifdef([AM_XGETTEXT_OPTION], [AM_][XGETTEXT_OPTION([--flag=error:3:c-format]) AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) gl_FUNC_FCNTL - if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then - AC_LIBOBJ([fcntl]) - fi + gl_CONDITIONAL([GL_COND_OBJ_FCNTL], + [test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1]) gl_FCNTL_MODULE_INDICATOR([fcntl]) gl_FCNTL_H gl_FCNTL_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P gl_FUNC_FDOPEN - if test $REPLACE_FDOPEN = 1; then - AC_LIBOBJ([fdopen]) + gl_CONDITIONAL([GL_COND_OBJ_FDOPEN], [test $REPLACE_FDOPEN = 1]) + AM_COND_IF([GL_COND_OBJ_FDOPEN], [ gl_PREREQ_FDOPEN - fi + ]) gl_STDIO_MODULE_INDICATOR([fdopen]) gl_FUNC_FSTAT - if test $REPLACE_FSTAT = 1; then - AC_LIBOBJ([fstat]) + gl_CONDITIONAL([GL_COND_OBJ_FSTAT], [test $REPLACE_FSTAT = 1]) + AM_COND_IF([GL_COND_OBJ_FSTAT], [ case "$host_os" in mingw*) AC_LIBOBJ([stat-w32]) ;; esac gl_PREREQ_FSTAT - fi + ]) gl_SYS_STAT_MODULE_INDICATOR([fstat]) gl_FUNC_FTRUNCATE - if test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1; then - AC_LIBOBJ([ftruncate]) + gl_CONDITIONAL([GL_COND_OBJ_FTRUNCATE], + [test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1]) + AM_COND_IF([GL_COND_OBJ_FTRUNCATE], [ gl_PREREQ_FTRUNCATE - fi + ]) gl_UNISTD_MODULE_INDICATOR([ftruncate]) gl_FUNC_GETCWD_LGPL - if test $REPLACE_GETCWD = 1; then - AC_LIBOBJ([getcwd-lgpl]) - fi + gl_CONDITIONAL([GL_COND_OBJ_GETCWD_LGPL], [test $REPLACE_GETCWD = 1]) gl_UNISTD_MODULE_INDICATOR([getcwd]) gl_FUNC_GETDTABLESIZE - if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then - AC_LIBOBJ([getdtablesize]) + gl_CONDITIONAL([GL_COND_OBJ_GETDTABLESIZE], + [test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1]) + AM_COND_IF([GL_COND_OBJ_GETDTABLESIZE], [ gl_PREREQ_GETDTABLESIZE - fi + ]) gl_UNISTD_MODULE_INDICATOR([getdtablesize]) gl_FUNC_GETPAGESIZE - if test $REPLACE_GETPAGESIZE = 1; then - AC_LIBOBJ([getpagesize]) - fi + gl_CONDITIONAL([GL_COND_OBJ_GETPAGESIZE], [test $REPLACE_GETPAGESIZE = 1]) gl_UNISTD_MODULE_INDICATOR([getpagesize]) gl_FUNC_GETPROGNAME AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) gl_FUNC_GETTIMEOFDAY - if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then - AC_LIBOBJ([gettimeofday]) + gl_CONDITIONAL([GL_COND_OBJ_GETTIMEOFDAY], + [test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1]) + AM_COND_IF([GL_COND_OBJ_GETTIMEOFDAY], [ gl_PREREQ_GETTIMEOFDAY - fi + ]) gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) gl_MUSL_LIBC dnl Distinguish OpenBSD >= 6.2 from OpenBSD < 6.2. AC_CHECK_FUNCS_ONCE([duplocale]) gl_FUNC_INET_PTON - if test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1; then - AC_LIBOBJ([inet_pton]) + gl_CONDITIONAL([GL_COND_OBJ_INET_PTON], + [test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1]) + AM_COND_IF([GL_COND_OBJ_INET_PTON], [ gl_PREREQ_INET_PTON - fi + ]) gl_ARPA_INET_MODULE_INDICATOR([inet_pton]) AC_C_BIGENDIAN gl_INTTYPES_H gl_FUNC_IOCTL - if test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1; then - AC_LIBOBJ([ioctl]) - fi + gl_CONDITIONAL([GL_COND_OBJ_IOCTL], + [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]) gl_SYS_IOCTL_MODULE_INDICATOR([ioctl]) gl_FUNC_ISBLANK - if test $HAVE_ISBLANK = 0; then - AC_LIBOBJ([isblank]) - fi + gl_CONDITIONAL([GL_COND_OBJ_ISBLANK], [test $HAVE_ISBLANK = 0]) gl_MODULE_INDICATOR([isblank]) gl_CTYPE_MODULE_INDICATOR([isblank]) gl_DOUBLE_EXPONENT_LOCATION @@ -2507,9 +2482,7 @@ changequote([, ])dnl gt_LOCALE_ZH_CN AC_REQUIRE([gl_LARGEFILE]) AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([listen]) - fi + gl_CONDITIONAL([GL_COND_OBJ_LISTEN], [test "$ac_cv_header_winsock2_h" = yes]) gl_SYS_SOCKET_MODULE_INDICATOR([listen]) AC_CHECK_FUNCS_ONCE([newlocale]) AC_CHECK_FUNCS_ONCE([newlocale]) @@ -2517,10 +2490,10 @@ changequote([, ])dnl AC_CHECK_DECLS_ONCE([alarm]) AC_REQUIRE([gl_SEMAPHORE]) gl_FUNC_LSTAT - if test $REPLACE_LSTAT = 1; then - AC_LIBOBJ([lstat]) + gl_CONDITIONAL([GL_COND_OBJ_LSTAT], [test $REPLACE_LSTAT = 1]) + AM_COND_IF([GL_COND_OBJ_LSTAT], [ gl_PREREQ_LSTAT - fi + ]) gl_SYS_STAT_MODULE_INDICATOR([lstat]) gl_FUNC_MALLOC_GNU if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 1; then @@ -2533,76 +2506,75 @@ changequote([, ])dnl gt_LOCALE_ZH_CN gt_LOCALE_FR_UTF8 gl_FUNC_MBTOWC - if test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1; then - AC_LIBOBJ([mbtowc]) + gl_CONDITIONAL([GL_COND_OBJ_MBTOWC], + [test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1]) + AM_COND_IF([GL_COND_OBJ_MBTOWC], [ gl_PREREQ_MBTOWC - fi + ]) gl_STDLIB_MODULE_INDICATOR([mbtowc]) dnl Check for prerequisites for memory fence checks. gl_FUNC_MMAP_ANON AC_CHECK_HEADERS_ONCE([sys/mman.h]) AC_CHECK_FUNCS_ONCE([mprotect]) AC_REQUIRE([gl_MSVC_INVAL]) - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - AC_LIBOBJ([msvc-inval]) - fi + gl_CONDITIONAL([GL_COND_OBJ_MSVC_INVAL], + [test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1]) AC_REQUIRE([gl_MSVC_NOTHROW]) - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - AC_LIBOBJ([msvc-nothrow]) - fi + gl_CONDITIONAL([GL_COND_OBJ_MSVC_NOTHROW], + [test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1]) gl_MODULE_INDICATOR([msvc-nothrow]) gl_FUNC_NANOSLEEP - if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then - AC_LIBOBJ([nanosleep]) - gl_PREREQ_NANOSLEEP - fi + gl_CONDITIONAL([GL_COND_OBJ_NANOSLEEP], + [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]) gl_TIME_MODULE_INDICATOR([nanosleep]) AC_CHECK_DECLS_ONCE([alarm]) gl_HEADER_NETINET_IN gl_CONDITIONAL_HEADER([netinet/in.h]) AC_PROG_MKDIR_P gl_FUNC_OPEN - if test $REPLACE_OPEN = 1; then - AC_LIBOBJ([open]) + gl_CONDITIONAL([GL_COND_OBJ_OPEN], [test $REPLACE_OPEN = 1]) + AM_COND_IF([GL_COND_OBJ_OPEN], [ gl_PREREQ_OPEN - fi + ]) gl_FCNTL_MODULE_INDICATOR([open]) gl_PATHMAX gl_FUNC_PERROR - if test $REPLACE_PERROR = 1; then - AC_LIBOBJ([perror]) - fi + gl_CONDITIONAL([GL_COND_OBJ_PERROR], [test $REPLACE_PERROR = 1]) gl_STRING_MODULE_INDICATOR([perror]) gl_FUNC_PIPE - if test $HAVE_PIPE = 0; then - AC_LIBOBJ([pipe]) - fi + gl_CONDITIONAL([GL_COND_OBJ_PIPE], [test $HAVE_PIPE = 0]) gl_UNISTD_MODULE_INDICATOR([pipe]) + gl_FUNC_PSELECT + gl_CONDITIONAL([GL_COND_OBJ_PSELECT], + [test $HAVE_PSELECT = 0 || test $REPLACE_PSELECT = 1]) + gl_SYS_SELECT_MODULE_INDICATOR([pselect]) + AC_CHECK_HEADERS_ONCE([sys/wait.h]) gl_PTHREAD_H gl_PTHREAD_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P gl_PTHREAD_THREAD - if test $HAVE_PTHREAD_CREATE = 0 || test $REPLACE_PTHREAD_CREATE = 1; then - AC_LIBOBJ([pthread-thread]) - fi + gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_THREAD], + [test $HAVE_PTHREAD_CREATE = 0 || test $REPLACE_PTHREAD_CREATE = 1]) gl_PTHREAD_MODULE_INDICATOR([pthread-thread]) gl_FUNC_PTHREAD_SIGMASK - if test $HAVE_PTHREAD_SIGMASK = 0 || test $REPLACE_PTHREAD_SIGMASK = 1; then - AC_LIBOBJ([pthread_sigmask]) + gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_SIGMASK], + [test $HAVE_PTHREAD_SIGMASK = 0 || test $REPLACE_PTHREAD_SIGMASK = 1]) + AM_COND_IF([GL_COND_OBJ_PTHREAD_SIGMASK], [ gl_PREREQ_PTHREAD_SIGMASK - fi + ]) gl_SIGNAL_MODULE_INDICATOR([pthread_sigmask]) gl_FUNC_PUTENV - if test $REPLACE_PUTENV = 1; then - AC_LIBOBJ([putenv]) + gl_CONDITIONAL([GL_COND_OBJ_PUTENV], [test $REPLACE_PUTENV = 1]) + AM_COND_IF([GL_COND_OBJ_PUTENV], [ gl_PREREQ_PUTENV - fi + ]) gl_STDLIB_MODULE_INDICATOR([putenv]) gl_FUNC_RAISE - if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then - AC_LIBOBJ([raise]) + gl_CONDITIONAL([GL_COND_OBJ_RAISE], + [test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1]) + AM_COND_IF([GL_COND_OBJ_RAISE], [ gl_PREREQ_RAISE - fi + ]) gl_SIGNAL_MODULE_INDICATOR([raise]) gl_FUNC_REALLOC_GNU if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 1; then @@ -2615,52 +2587,42 @@ changequote([, ])dnl fi gl_STDLIB_MODULE_INDICATOR([realloc-posix]) gl_FUNC_REALLOCARRAY - if test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1; then - AC_LIBOBJ([reallocarray]) + gl_CONDITIONAL([GL_COND_OBJ_REALLOCARRAY], + [test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1]) + AM_COND_IF([GL_COND_OBJ_REALLOCARRAY], [ gl_PREREQ_REALLOCARRAY - fi + ]) gl_MODULE_INDICATOR([reallocarray]) gl_STDLIB_MODULE_INDICATOR([reallocarray]) gl_SCHED_H gl_SCHED_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P gl_FUNC_SCHED_YIELD - if test $HAVE_SCHED_YIELD = 0 || test $REPLACE_SCHED_YIELD = 1; then - AC_LIBOBJ([sched_yield]) - fi + gl_CONDITIONAL([GL_COND_OBJ_SCHED_YIELD], + [test $HAVE_SCHED_YIELD = 0 || test $REPLACE_SCHED_YIELD = 1]) gl_SCHED_MODULE_INDICATOR([sched_yield]) gl_FUNC_SELECT - if test $REPLACE_SELECT = 1; then - AC_LIBOBJ([select]) - fi + gl_CONDITIONAL([GL_COND_OBJ_SELECT], [test $REPLACE_SELECT = 1]) gl_SYS_SELECT_MODULE_INDICATOR([select]) AC_CHECK_HEADERS_ONCE([sys/wait.h]) gl_FUNC_SETENV - if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then - AC_LIBOBJ([setenv]) - fi + gl_CONDITIONAL([GL_COND_OBJ_SETENV], + [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1]) gl_STDLIB_MODULE_INDICATOR([setenv]) gl_FUNC_SETLOCALE - if test $REPLACE_SETLOCALE = 1; then - AC_LIBOBJ([setlocale]) + gl_CONDITIONAL([GL_COND_OBJ_SETLOCALE], [test $REPLACE_SETLOCALE = 1]) + AM_COND_IF([GL_COND_OBJ_SETLOCALE], [ gl_PREREQ_SETLOCALE - fi + ]) gl_LOCALE_MODULE_INDICATOR([setlocale]) gt_LOCALE_FR gt_LOCALE_FR_UTF8 gt_LOCALE_JA gt_LOCALE_ZH_CN AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([setsockopt]) - fi + gl_CONDITIONAL([GL_COND_OBJ_SETSOCKOPT], + [test "$ac_cv_header_winsock2_h" = yes]) gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt]) - gl_SIGACTION - if test $HAVE_SIGACTION = 0; then - AC_LIBOBJ([sigaction]) - gl_PREREQ_SIGACTION - fi - gl_SIGNAL_MODULE_INDICATOR([sigaction]) gl_SIGNAL_H gl_SIGNAL_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P @@ -2668,21 +2630,18 @@ changequote([, ])dnl AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION]) AC_REQUIRE([gl_LONG_DOUBLE_EXPONENT_LOCATION]) gl_SIGNALBLOCKING - if test $HAVE_POSIX_SIGNALBLOCKING = 0; then - AC_LIBOBJ([sigprocmask]) + gl_CONDITIONAL([GL_COND_OBJ_SIGPROCMASK], [test $HAVE_POSIX_SIGNALBLOCKING = 0]) + AM_COND_IF([GL_COND_OBJ_SIGPROCMASK], [ gl_PREREQ_SIGPROCMASK - fi + ]) gl_SIGNAL_MODULE_INDICATOR([sigprocmask]) gl_FUNC_SLEEP - if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then - AC_LIBOBJ([sleep]) - fi + gl_CONDITIONAL([GL_COND_OBJ_SLEEP], + [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1]) gl_UNISTD_MODULE_INDICATOR([sleep]) AC_CHECK_DECLS_ONCE([alarm]) AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([socket]) - fi + gl_CONDITIONAL([GL_COND_OBJ_SOCKET], [test "$ac_cv_header_winsock2_h" = yes]) # When this module is used, sockets may actually occur as file descriptors, # hence it is worth warning if the modules 'close' and 'ioctl' are not used. m4_ifdef([gl_UNISTD_H_DEFAULTS], [gl_UNISTD_H_REQUIRE_DEFAULTS]) @@ -2697,15 +2656,15 @@ changequote([, ])dnl AC_REQUIRE([gl_SOCKETS]) gl_TYPE_SOCKLEN_T gl_FUNC_STAT - if test $REPLACE_STAT = 1; then - AC_LIBOBJ([stat]) + gl_CONDITIONAL([GL_COND_OBJ_STAT], [test $REPLACE_STAT = 1]) + AM_COND_IF([GL_COND_OBJ_STAT], [ case "$host_os" in mingw*) AC_LIBOBJ([stat-w32]) ;; esac gl_PREREQ_STAT - fi + ]) gl_SYS_STAT_MODULE_INDICATOR([stat]) gl_STAT_TIME gl_STAT_BIRTHTIME @@ -2717,6 +2676,8 @@ changequote([, ])dnl gl_STDIO_H gl_STDIO_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P + gl_CONDITIONAL([GL_COND_OBJ_STDIO_READ], [test $REPLACE_STDIO_READ_FUNCS = 1]) + gl_CONDITIONAL([GL_COND_OBJ_STDIO_WRITE], [test $REPLACE_STDIO_WRITE_FUNCS = 1]) dnl No need to create extra modules for these functions. Everyone who uses dnl likely needs them. gl_STDIO_MODULE_INDICATOR([fscanf]) @@ -2741,17 +2702,16 @@ changequote([, ])dnl gl_STDIO_MODULE_INDICATOR([puts]) gl_STDIO_MODULE_INDICATOR([fwrite]) gl_FUNC_STRERROR - if test $REPLACE_STRERROR = 1; then - AC_LIBOBJ([strerror]) - fi + gl_CONDITIONAL([GL_COND_OBJ_STRERROR], [test $REPLACE_STRERROR = 1]) gl_MODULE_INDICATOR([strerror]) gl_STRING_MODULE_INDICATOR([strerror]) AC_REQUIRE([gl_HEADER_ERRNO_H]) AC_REQUIRE([gl_FUNC_STRERROR_0]) - if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then - AC_LIBOBJ([strerror-override]) + gl_CONDITIONAL([GL_COND_OBJ_STRERROR_OVERRIDE], + [test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1]) + AM_COND_IF([GL_COND_OBJ_STRERROR_OVERRIDE], [ gl_PREREQ_SYS_H_WINSOCK2 - fi + ]) gl_FUNC_STRERROR_R AS_IF([test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1], [ AC_LIBOBJ([strerror_r]) @@ -2768,9 +2728,8 @@ changequote([, ])dnl AC_CHECK_HEADERS_ONCE([sys/mman.h]) AC_CHECK_FUNCS_ONCE([mprotect]) gl_FUNC_SYMLINK - if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then - AC_LIBOBJ([symlink]) - fi + gl_CONDITIONAL([GL_COND_OBJ_SYMLINK], + [test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1]) gl_UNISTD_MODULE_INDICATOR([symlink]) gl_SYS_IOCTL_H gl_SYS_IOCTL_H_REQUIRE_DEFAULTS @@ -2885,51 +2844,47 @@ changequote([, ])dnl AC_CHECK_DECLS_ONCE([alarm]) gt_LOCALE_FR gl_FUNC_UNSETENV - if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then - AC_LIBOBJ([unsetenv]) + gl_CONDITIONAL([GL_COND_OBJ_UNSETENV], + [test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1]) + AM_COND_IF([GL_COND_OBJ_UNSETENV], [ gl_PREREQ_UNSETENV - fi + ]) gl_STDLIB_MODULE_INDICATOR([unsetenv]) gl_FUNC_USLEEP - if test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1; then - AC_LIBOBJ([usleep]) - fi + gl_CONDITIONAL([GL_COND_OBJ_USLEEP], + [test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1]) gl_UNISTD_MODULE_INDICATOR([usleep]) AC_C_VARARRAYS gl_FUNC_WCRTOMB - if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then - AC_LIBOBJ([wcrtomb]) + gl_CONDITIONAL([GL_COND_OBJ_WCRTOMB], + [test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1]) + AM_COND_IF([GL_COND_OBJ_WCRTOMB], [ gl_PREREQ_WCRTOMB - fi + ]) gl_WCHAR_MODULE_INDICATOR([wcrtomb]) gt_LOCALE_FR gt_LOCALE_FR_UTF8 gt_LOCALE_JA gt_LOCALE_ZH_CN gl_FUNC_WCTOB - if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then - AC_LIBOBJ([wctob]) + gl_CONDITIONAL([GL_COND_OBJ_WCTOB], + [test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1]) + AM_COND_IF([GL_COND_OBJ_WCTOB], [ gl_PREREQ_WCTOB - fi + ]) gl_WCHAR_MODULE_INDICATOR([wctob]) gl_FUNC_WCTOMB - if test $REPLACE_WCTOMB = 1; then - AC_LIBOBJ([wctomb]) + gl_CONDITIONAL([GL_COND_OBJ_WCTOMB], [test $REPLACE_WCTOMB = 1]) + AM_COND_IF([GL_COND_OBJ_WCTOMB], [ gl_PREREQ_WCTOMB - fi + ]) gl_STDLIB_MODULE_INDICATOR([wctomb]) AC_REQUIRE([AC_CANONICAL_HOST]) - case "$host_os" in - mingw*) - AC_LIBOBJ([windows-thread]) - ;; - esac + gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_THREAD], + [case "$host_os" in mingw*) true;; *) false;; esac]) AC_REQUIRE([AC_CANONICAL_HOST]) - case "$host_os" in - mingw*) - AC_LIBOBJ([windows-tls]) - ;; - esac + gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_TLS], + [case "$host_os" in mingw*) true;; *) false;; esac]) gl_XALLOC gl_MODULE_INDICATOR([xalloc]) gl_MODULE_INDICATOR([xalloc-die]) @@ -2956,17 +2911,30 @@ changequote([, ])dnl AC_CONFIG_COMMANDS_PRE([ gltests_libobjs= gltests_ltlibobjs= + gltests_libobjdeps= if test -n "$gltests_LIBOBJS"; then # Remove the extension. +changequote(,)dnl sed_drop_objext='s/\.o$//;s/\.obj$//' + sed_dirname1='s,//*,/,g' + sed_dirname2='s,\(.\)/$,\1,' + sed_dirname3='s,^[^/]*$,.,' + sed_dirname4='s,\(.\)/[^/]*$,\1,' + sed_basename1='s,.*/,,' +changequote([, ])dnl for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do gltests_libobjs="$gltests_libobjs $i.$ac_objext" gltests_ltlibobjs="$gltests_ltlibobjs $i.lo" + i_dir=`echo "$i" | sed -e "$sed_dirname1" -e "$sed_dirname2" -e "$sed_dirname3" -e "$sed_dirname4"` + i_base=`echo "$i" | sed -e "$sed_basename1"` + gltests_libobjdeps="$gltests_libobjdeps $i_dir/\$(DEPDIR)/$i_base.Plo" done fi AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs]) AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs]) + AC_SUBST([gltests_LIBOBJDEPS], [$gltests_libobjdeps]) ]) + AC_REQUIRE([gl_CC_GNULIB_WARNINGS]) LIBTESTS_LIBDEPS="$gltests_libdeps" AC_SUBST([LIBTESTS_LIBDEPS]) ]) @@ -3036,6 +3004,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/amemxfrm.h lib/arg-nonnull.h lib/array-mergesort.h + lib/assert.in.h lib/attribute.h lib/c++defs.h lib/c-ctype.c @@ -3072,7 +3041,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/iconv_open.c lib/iconveh.h lib/idx.h - lib/intprops.h + lib/intprops-internal.h lib/inttypes.in.h lib/isnan.c lib/isnand-nolibm.h @@ -3135,7 +3104,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/signbitf.c lib/signbitl.c lib/size_max.h - lib/stdbool.in.h + lib/stdckdint.in.h lib/stddef.in.h lib/stdint.in.h lib/stdio-impl.h @@ -3966,8 +3935,10 @@ AC_DEFUN([gl_FILE_LIST], [ m4/absolute-header.m4 m4/alloca.m4 m4/arpa_inet_h.m4 + m4/assert_h.m4 m4/btowc.m4 m4/builtin-expect.m4 + m4/c-bool.m4 m4/calloc.m4 m4/close.m4 m4/codeset.m4 @@ -4072,6 +4043,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/printf-frexp.m4 m4/printf-frexpl.m4 m4/printf.m4 + m4/pselect.m4 m4/pthread-thread.m4 m4/pthread_h.m4 m4/pthread_rwlock_rdlock.m4 @@ -4088,7 +4060,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/setenv.m4 m4/setlocale.m4 m4/setlocale_null.m4 - m4/sigaction.m4 m4/signal_h.m4 m4/signalblocking.m4 m4/signbit.m4 @@ -4103,7 +4074,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/stat.m4 m4/std-gnu11.m4 m4/stdalign.m4 - m4/stdbool.m4 m4/stddef_h.m4 m4/stdint.m4 m4/stdint_h.m4 @@ -4160,6 +4130,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-alloca-opt.c tests/test-arpa_inet.c tests/test-array-mergesort.c + tests/test-assert.c tests/test-binary-io.c tests/test-binary-io.sh tests/test-bind.c @@ -4260,6 +4231,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-pipe.c tests/test-printf-frexp.c tests/test-printf-frexpl.c + tests/test-pselect.c tests/test-pthread-thread.c tests/test-pthread.c tests/test-pthread_sigmask1.c @@ -4284,7 +4256,6 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-setlocale_null-mt-one.c tests/test-setlocale_null.c tests/test-setsockopt.c - tests/test-sigaction.c tests/test-signal-h.c tests/test-signbit.c tests/test-sigprocmask.c @@ -4295,6 +4266,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-stat.h tests/test-stdalign.c tests/test-stdbool.c + tests/test-stdckdint.c tests/test-stddef.c tests/test-stdint.c tests/test-stdio.c @@ -4908,6 +4880,8 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/ialloc.h tests=lib/ignore-value.h tests=lib/inet_pton.c + tests=lib/intprops-internal.h + tests=lib/intprops.h tests=lib/ioctl.c tests=lib/isblank.c tests=lib/listen.c @@ -4925,6 +4899,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/pathmax.h tests=lib/perror.c tests=lib/pipe.c + tests=lib/pselect.c tests=lib/pthread-thread.c tests=lib/pthread.in.h tests=lib/pthread_sigmask.c @@ -4939,9 +4914,6 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/setenv.c tests=lib/setlocale.c tests=lib/setsockopt.c - tests=lib/sig-handler.c - tests=lib/sig-handler.h - tests=lib/sigaction.c tests=lib/signal.in.h tests=lib/sigprocmask.c tests=lib/sleep.c @@ -4954,6 +4926,8 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/stat-w32.h tests=lib/stat.c tests=lib/stdalign.in.h + tests=lib/stdio-read.c + tests=lib/stdio-write.c tests=lib/stdio.in.h tests=lib/strerror-override.c tests=lib/strerror-override.h @@ -4970,6 +4944,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/time.in.h tests=lib/unsetenv.c tests=lib/usleep.c + tests=lib/verify.h tests=lib/w32sock.h tests=lib/warn-on-use.h tests=lib/wcrtomb.c diff --git a/gnulib-m4/host-cpu-c-abi.m4 b/gnulib-m4/host-cpu-c-abi.m4 index 6d1e457..b922324 100644 --- a/gnulib-m4/host-cpu-c-abi.m4 +++ b/gnulib-m4/host-cpu-c-abi.m4 @@ -1,4 +1,4 @@ -# host-cpu-c-abi.m4 serial 14 +# host-cpu-c-abi.m4 serial 15 dnl Copyright (C) 2002-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -382,6 +382,9 @@ EOF #ifndef __ia64__ #undef __ia64__ #endif +#ifndef __loongarch64__ +#undef __loongarch64__ +#endif #ifndef __m68k__ #undef __m68k__ #endif diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4 index 0005795..2065c97 100644 --- a/gnulib-m4/iconv.m4 +++ b/gnulib-m4/iconv.m4 @@ -1,4 +1,4 @@ -# iconv.m4 serial 24 +# iconv.m4 serial 26 dnl Copyright (C) 2000-2002, 2007-2014, 2016-2022 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -234,12 +234,6 @@ AC_DEFUN([AM_ICONV_LINK], dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". -dnl This is tricky because of the way 'aclocal' is implemented: -dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. -dnl Otherwise aclocal's initial scan pass would miss the macro definition. -dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. -dnl Otherwise aclocal would emit many "Use of uninitialized value $1" -dnl warnings. AC_DEFUN_ONCE([AM_ICONV], [ AM_ICONV_LINK @@ -280,4 +274,20 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si ICONV_CONST="const" fi ]) + + dnl A summary result, for those packages which want to print a summary at the + dnl end of the configuration. + if test "$am_func_iconv" = yes; then + if test -n "$LIBICONV"; then + am_cv_func_iconv_summary='yes, in libiconv' + else + am_cv_func_iconv_summary='yes, in libc' + fi + else + if test "$am_cv_func_iconv" = yes; then + am_cv_func_iconv_summary='not working, consider installing GNU libiconv' + else + am_cv_func_iconv_summary='no, consider installing GNU libiconv' + fi + fi ]) diff --git a/gnulib-m4/largefile.m4 b/gnulib-m4/largefile.m4 index 3e8b5e3..ec9677c 100644 --- a/gnulib-m4/largefile.m4 +++ b/gnulib-m4/largefile.m4 @@ -10,8 +10,10 @@ # It does not set _LARGEFILE_SOURCE=1 on HP-UX/ia64 32-bit, although this # setting of _LARGEFILE_SOURCE is needed so that declares fseeko # and ftello in C++ mode as well. +# Fixed in Autoconf 2.72, which has AC_SYS_YEAR2038. AC_DEFUN([gl_SET_LARGEFILE_SOURCE], [ + m4_ifndef([AC_SYS_YEAR2038], [ AC_REQUIRE([AC_CANONICAL_HOST]) AC_FUNC_FSEEKO case "$host_os" in @@ -20,9 +22,10 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).]) ;; esac + ]) ]) -# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+ +# Work around a problem in Autoconf through 2.71 on glibc 2.34+ # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, # or configures them incorrectly in some cases. @@ -43,6 +46,7 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], ]) ])# m4_version_prereq 2.70 +m4_ifndef([AC_SYS_YEAR2038], [ # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, # CACHE-VAR, @@ -118,6 +122,7 @@ AS_IF([test "$enable_largefile" != no], [64], [gl_YEAR2038_BODY([])])]) ])# AC_SYS_LARGEFILE +])# m4_ifndef AC_SYS_YEAR2038 # Enable large files on systems where this is implemented by Gnulib, not by the # system headers. diff --git a/gnulib-m4/lib-link.m4 b/gnulib-m4/lib-link.m4 index ed5186a..3b75bcd 100644 --- a/gnulib-m4/lib-link.m4 +++ b/gnulib-m4/lib-link.m4 @@ -1,4 +1,4 @@ -# lib-link.m4 serial 32 +# lib-link.m4 serial 33 dnl Copyright (C) 2001-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -196,8 +196,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" ]) AC_ARG_WITH(PACK[-prefix], -[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib - --without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], +[[ --with-]]PACK[[-prefix[=DIR] search for ]]PACKLIBS[[ in DIR/include and DIR/lib + --without-]]PACK[[-prefix don't search for ]]PACKLIBS[[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no diff --git a/gnulib-m4/lib-prefix.m4 b/gnulib-m4/lib-prefix.m4 index 75071e9..999f712 100644 --- a/gnulib-m4/lib-prefix.m4 +++ b/gnulib-m4/lib-prefix.m4 @@ -1,4 +1,4 @@ -# lib-prefix.m4 serial 19 +# lib-prefix.m4 serial 20 dnl Copyright (C) 2001-2005, 2008-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -174,7 +174,7 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB], AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf], [AC_EGREP_CPP([Extensible Linking Format], - [#ifdef __ELF__ + [#if defined __ELF__ || (defined __linux__ && defined __EDG__) Extensible Linking Format #endif ], diff --git a/gnulib-m4/libunistring-base.m4 b/gnulib-m4/libunistring-base.m4 index 3815b3e..a0892da 100644 --- a/gnulib-m4/libunistring-base.m4 +++ b/gnulib-m4/libunistring-base.m4 @@ -1,4 +1,4 @@ -# libunistring-base.m4 serial 6 +# libunistring-base.m4 serial 7 dnl Copyright (C) 2010-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -24,7 +24,7 @@ AC_DEFUN([gl_LIBUNISTRING_MODULE], AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE]) dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from dnl gl_LIBUNISTRING_CORE if that macro has been run. - AM_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]), + gl_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]), [gl_LIBUNISTRING_VERSION_CMP([$1])]) ]) diff --git a/gnulib-m4/nanosleep.m4 b/gnulib-m4/nanosleep.m4 index 6a51f28..dfe21f5 100644 --- a/gnulib-m4/nanosleep.m4 +++ b/gnulib-m4/nanosleep.m4 @@ -1,4 +1,4 @@ -# serial 40 +# serial 42 dnl From Jim Meyering. dnl Check for the nanosleep function. @@ -19,9 +19,6 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], dnl Persuade glibc and Solaris to declare nanosleep. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_HEADERS_ONCE([sys/time.h]) - AC_REQUIRE([gl_FUNC_SELECT]) - AC_CHECK_DECLS_ONCE([alarm]) nanosleep_save_libs=$LIBS @@ -53,9 +50,6 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], #include #include #include - #if HAVE_SYS_TIME_H - #include - #endif #include #include #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) @@ -106,15 +100,22 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], #else /* A simpler test for native Windows. */ if (nanosleep (&ts_sleep, &ts_remaining) < 0) return 3; + /* Test for 32-bit mingw bug: negative nanosecond values do not + cause failure. */ + ts_sleep.tv_sec = 1; + ts_sleep.tv_nsec = -1; + if (nanosleep (&ts_sleep, &ts_remaining) != -1) + return 7; #endif return 0; }]])], [gl_cv_func_nanosleep=yes], - [case $? in dnl ( - 4|5|6) gl_cv_func_nanosleep='no (mishandles large arguments)';; dnl ( - *) gl_cv_func_nanosleep=no;; + [case $? in + 4|5|6) gl_cv_func_nanosleep='no (mishandles large arguments)' ;; + 7) gl_cv_func_nanosleep='no (mishandles negative tv_nsec)' ;; + *) gl_cv_func_nanosleep=no ;; esac], - [case "$host_os" in dnl (( + [case "$host_os" in linux*) # Guess it halfway works when the kernel is Linux. gl_cv_func_nanosleep='guessing no (mishandles large arguments)' ;; mingw*) # Guess no on native Windows. @@ -135,15 +136,6 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], AC_DEFINE([HAVE_BUG_BIG_NANOSLEEP], [1], [Define to 1 if nanosleep mishandles large arguments.]) ;; - *) - # The replacement uses select(). Add $LIBSOCKET to $LIB_NANOSLEEP. - for ac_lib in $LIBSOCKET; do - case " $LIB_NANOSLEEP " in - *" $ac_lib "*) ;; - *) LIB_NANOSLEEP="$LIB_NANOSLEEP $ac_lib";; - esac - done - ;; esac ;; esac @@ -152,10 +144,3 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], fi LIBS=$nanosleep_save_libs ]) - -# Prerequisites of lib/nanosleep.c. -AC_DEFUN([gl_PREREQ_NANOSLEEP], -[ - AC_CHECK_HEADERS_ONCE([sys/select.h]) - gl_PREREQ_SIG_HANDLER_H -]) diff --git a/gnulib-m4/pselect.m4 b/gnulib-m4/pselect.m4 new file mode 100644 index 0000000..8611441 --- /dev/null +++ b/gnulib-m4/pselect.m4 @@ -0,0 +1,73 @@ +# pselect.m4 serial 10 +dnl Copyright (C) 2011-2022 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. + +AC_DEFUN([gl_FUNC_PSELECT], +[ + AC_REQUIRE([gl_SYS_SELECT_H]) + AC_REQUIRE([AC_C_RESTRICT]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CHECK_FUNCS_ONCE([pselect]) + + if test $ac_cv_func_pselect = yes; then + AC_CACHE_CHECK([whether signature of pselect conforms to POSIX], + [gl_cv_sig_pselect], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], + [[int (*p) (int, fd_set *, fd_set *, fd_set *restrict, + struct timespec const *restrict, + sigset_t const *restrict) = pselect; + return !p;]])], + [gl_cv_sig_pselect=yes], + [gl_cv_sig_pselect=no])]) + + dnl On FreeBSD 8.2, pselect() doesn't always reject bad fds. + AC_CACHE_CHECK([whether pselect detects invalid fds], + [gl_cv_func_pselect_detects_ebadf], + [ + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ +#include +#include +#if HAVE_SYS_SELECT_H +# include +#endif +#include +#include +]GL_MDA_DEFINES], +[[ + fd_set set; + dup2(0, 16); + FD_ZERO(&set); + FD_SET(16, &set); + close(16); + struct timespec timeout; + timeout.tv_sec = 0; + timeout.tv_nsec = 5000; + return pselect (17, &set, NULL, NULL, &timeout, NULL) != -1 || errno != EBADF; +]])], [gl_cv_func_pselect_detects_ebadf=yes], + [gl_cv_func_pselect_detects_ebadf=no], + [ + case "$host_os" in + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_pselect_detects_ebadf="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_pselect_detects_ebadf="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_pselect_detects_ebadf="$gl_cross_guess_normal" ;; + esac + ]) + ]) + case $gl_cv_func_pselect_detects_ebadf in + *yes) ;; + *) REPLACE_PSELECT=1 ;; + esac + fi + + if test $ac_cv_func_pselect = no || test $gl_cv_sig_pselect = no; then + REPLACE_PSELECT=1 + fi +]) diff --git a/gnulib-m4/sigaction.m4 b/gnulib-m4/sigaction.m4 deleted file mode 100644 index 62c83e0..0000000 --- a/gnulib-m4/sigaction.m4 +++ /dev/null @@ -1,40 +0,0 @@ -# sigaction.m4 serial 7 -dnl Copyright (C) 2008-2022 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. - -# Determine if sigaction interface is present. -AC_DEFUN([gl_SIGACTION], -[ - AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([sigaction]) - if test $ac_cv_func_sigaction = yes; then - AC_CHECK_MEMBERS([struct sigaction.sa_sigaction], , , - [[#include ]]) - if test $ac_cv_member_struct_sigaction_sa_sigaction = no; then - HAVE_STRUCT_SIGACTION_SA_SIGACTION=0 - fi - else - HAVE_SIGACTION=0 - fi -]) - -# Prerequisites of the part of lib/signal.in.h and of lib/sigaction.c. -AC_DEFUN([gl_PREREQ_SIGACTION], -[ - AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) - AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([AC_TYPE_UID_T]) - AC_REQUIRE([gl_PREREQ_SIG_HANDLER_H]) - AC_CHECK_FUNCS_ONCE([sigaltstack siginterrupt]) - AC_CHECK_TYPES([siginfo_t], [], [], [[ -#include - ]]) - if test $ac_cv_type_siginfo_t = no; then - HAVE_SIGINFO_T=0 - fi -]) - -# Prerequisites of lib/sig-handler.h. -AC_DEFUN([gl_PREREQ_SIG_HANDLER_H], [:]) diff --git a/gnulib-m4/stdalign.m4 b/gnulib-m4/stdalign.m4 index 78577cb..324e91d 100644 --- a/gnulib-m4/stdalign.m4 +++ b/gnulib-m4/stdalign.m4 @@ -1,4 +1,4 @@ -# Check for stdalign.h that conforms to C11. +# Check for alignas and alignof that conform to C23. dnl Copyright 2011-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -9,12 +9,18 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_STDALIGN_H], [ - AC_CACHE_CHECK([for working stdalign.h], + AC_CACHE_CHECK([for alignas and alignof], [gl_cv_header_working_stdalign_h], - [AC_COMPILE_IFELSE( + [gl_save_CFLAGS=$CFLAGS + for gl_working in "yes, keywords" "yes, macros"; do + AS_CASE([$gl_working], + [*stdalign.h*], [CFLAGS="$gl_save_CFLAGS -DINCLUDE_STDALIGN_H"]) + AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#include - #include + #ifdef INCLUDE_STDALIGN_H + #include + #endif #include /* Test that alignof yields a result consistent with offsetof. @@ -30,7 +36,7 @@ AC_DEFUN([gl_STDALIGN_H], char test_long[ao (long int) % _Alignof (long int) == 0 ? 1 : -1]; char test_alignof[alignof (double) == _Alignof (double) ? 1 : -1]; - /* Test _Alignas only on platforms where gnulib can help. */ + /* Test alignas only on platforms where gnulib can help. */ #if \ ((defined __cplusplus && 201103 <= __cplusplus) \ || (__TINYC__ && defined __attribute__) \ @@ -45,12 +51,84 @@ AC_DEFUN([gl_STDALIGN_H], ? 1 : -1]; #endif ]])], - [gl_cv_header_working_stdalign_h=yes], - [gl_cv_header_working_stdalign_h=no])]) - - if test $gl_cv_header_working_stdalign_h = yes; then - GL_GENERATE_STDALIGN_H=false - else - GL_GENERATE_STDALIGN_H=true - fi + [gl_cv_header_working_stdalign_h=$gl_working], + [gl_cv_header_working_stdalign_h=no]) + + CFLAGS=$gl_save_CFLAGS + test "$gl_cv_header_working_stdalign_h" != no && break + done]) + + GL_GENERATE_STDALIGN_H=false + AS_CASE([$gl_cv_header_working_stdalign_h], + [no], + [GL_GENERATE_STDALIGN_H=true], + [yes*keyword*], + [AC_DEFINE([HAVE_C_ALIGNASOF], [1], + [Define to 1 if the alignas and alignof keywords work.])]) + + AC_CHECK_HEADERS_ONCE([stdalign.h]) + + dnl The "zz" puts this toward config.h's end, to avoid potential + dnl collisions with other definitions. + AH_VERBATIM([zzalignas], +[#if !defined HAVE_C_ALIGNASOF && __cplusplus < 201103 && !defined alignof +# if HAVE_STDALIGN_H +# include +# else + /* Substitute. Keep consistent with gnulib/lib/stdalign.in.h. */ +# ifndef _GL_STDALIGN_H +# define _GL_STDALIGN_H +# undef _Alignas +# undef _Alignof +# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ + || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ + && !defined __clang__) \ + || (defined __clang__ && __clang_major__ < 8)) +# ifdef __cplusplus +# if (201103 <= __cplusplus || defined _MSC_VER) +# define _Alignof(type) alignof (type) +# else + template struct __alignof_helper { char __a; __t __b; }; +# define _Alignof(type) offsetof (__alignof_helper, __b) +# define _GL_STDALIGN_NEEDS_STDDEF 1 +# endif +# else +# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b) +# define _GL_STDALIGN_NEEDS_STDDEF 1 +# endif +# endif +# if ! (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)) +# define alignof _Alignof +# endif +# define __alignof_is_defined 1 +# if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 +# if defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER) +# define _Alignas(a) alignas (a) +# elif (!defined __attribute__ \ + && ((defined __APPLE__ && defined __MACH__ \ + ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ + : __GNUC__ && !defined __ibmxl__) \ + || (4 <= __clang_major__) \ + || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ + || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__)) +# define _Alignas(a) __attribute__ ((__aligned__ (a))) +# elif 1300 <= _MSC_VER +# define _Alignas(a) __declspec (align (a)) +# endif +# endif +# if ((defined _Alignas \ + && !(defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))) \ + || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) +# define alignas _Alignas +# endif +# if (defined alignas \ + || (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))) +# define __alignas_is_defined 1 +# endif +# if _GL_STDALIGN_NEEDS_STDDEF +# include +# endif +# endif /* _GL_STDALIGN_H */ +# endif +#endif]) ]) diff --git a/gnulib-m4/stdbool.m4 b/gnulib-m4/stdbool.m4 deleted file mode 100644 index 3e6c400..0000000 --- a/gnulib-m4/stdbool.m4 +++ /dev/null @@ -1,117 +0,0 @@ -# Check for stdbool.h that conforms to C99. - -dnl Copyright (C) 2002-2006, 2009-2022 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. - -#serial 9 - -# Prepare for substituting if it is not supported. - -AC_DEFUN([gl_STDBOOL_H], -[ - AC_REQUIRE([AC_CHECK_HEADER_STDBOOL]) - AC_REQUIRE([AC_CANONICAL_HOST]) - - dnl On some platforms, does not exist or does not conform to C99. - dnl On Solaris 10 with CC=cc CXX=CC, exists but is not usable - dnl in C++ mode (and no exists). In this case, we use our - dnl replacement, also in C mode (for binary compatibility between C and C++). - if test "$ac_cv_header_stdbool_h" = yes; then - case "$host_os" in - solaris*) - if test -z "$GCC"; then - GL_GENERATE_STDBOOL_H=true - else - GL_GENERATE_STDBOOL_H=false - fi - ;; - *) - GL_GENERATE_STDBOOL_H=false - ;; - esac - else - GL_GENERATE_STDBOOL_H=true - fi - - if test "$ac_cv_type__Bool" = yes; then - HAVE__BOOL=1 - else - HAVE__BOOL=0 - fi - AC_SUBST([HAVE__BOOL]) -]) - -# This version of the macro is needed in autoconf <= 2.68. - -AC_DEFUN([AC_CHECK_HEADER_STDBOOL], - [AC_CACHE_CHECK([for stdbool.h that conforms to C99], - [ac_cv_header_stdbool_h], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ - #include - - #ifdef __cplusplus - typedef bool Bool; - #else - typedef _Bool Bool; - #ifndef bool - "error: bool is not defined" - #endif - #ifndef false - "error: false is not defined" - #endif - #if false - "error: false is not 0" - #endif - #ifndef true - "error: true is not defined" - #endif - #if true != 1 - "error: true is not 1" - #endif - #endif - - #ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" - #endif - - struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ - char f[(Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; - /* Catch a bug in an HP-UX C compiler. See - https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html - */ - Bool q = true; - Bool *pq = &q; - bool *qq = &q; - ]], - [[ - bool e = &s; - *pq |= q; *pq |= ! q; - *qq |= q; *qq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq + !qq); - ]])], - [ac_cv_header_stdbool_h=yes], - [ac_cv_header_stdbool_h=no])]) - AC_CHECK_TYPES([_Bool]) -]) diff --git a/gnulib-m4/stdio_h.m4 b/gnulib-m4/stdio_h.m4 index cc80e77..42e9607 100644 --- a/gnulib-m4/stdio_h.m4 +++ b/gnulib-m4/stdio_h.m4 @@ -1,4 +1,4 @@ -# stdio_h.m4 serial 57 +# stdio_h.m4 serial 59 dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -40,41 +40,32 @@ AC_DEFUN_ONCE([gl_STDIO_H], attribute "__gnu_printf__" instead of "__printf__"]) fi - dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c" - dnl "expected source file, required through AC_LIBSOURCES, not found". It is - dnl also an optimization, to avoid performing a configure check whose result - dnl is not used. But it does not make the test of GNULIB_STDIO_H_NONBLOCKING - dnl or GNULIB_NONBLOCKING redundant. + dnl This ifdef is an optimization, to avoid performing a configure check whose + dnl result is not used. But it does not make the test of + dnl GNULIB_STDIO_H_NONBLOCKING or GNULIB_NONBLOCKING redundant. m4_ifdef([gl_NONBLOCKING_IO], [ gl_NONBLOCKING_IO if test $gl_cv_have_nonblocking != yes; then REPLACE_STDIO_READ_FUNCS=1 - AC_LIBOBJ([stdio-read]) fi ]) - dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c" - dnl "expected source file, required through AC_LIBSOURCES, not found". It is - dnl also an optimization, to avoid performing a configure check whose result - dnl is not used. But it does not make the test of GNULIB_STDIO_H_SIGPIPE or - dnl GNULIB_SIGPIPE redundant. + dnl This ifdef is an optimization, to avoid performing a configure check whose + dnl result is not used. But it does not make the test of + dnl GNULIB_STDIO_H_SIGPIPE or GNULIB_SIGPIPE redundant. m4_ifdef([gl_SIGNAL_SIGPIPE], [ gl_SIGNAL_SIGPIPE if test $gl_cv_header_signal_h_SIGPIPE != yes; then REPLACE_STDIO_WRITE_FUNCS=1 - AC_LIBOBJ([stdio-write]) fi ]) - dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c" - dnl "expected source file, required through AC_LIBSOURCES, not found". It is - dnl also an optimization, to avoid performing a configure check whose result - dnl is not used. But it does not make the test of GNULIB_STDIO_H_NONBLOCKING - dnl or GNULIB_NONBLOCKING redundant. + dnl This ifdef is an optimization, to avoid performing a configure check whose + dnl result is not used. But it does not make the test of + dnl GNULIB_STDIO_H_NONBLOCKING or GNULIB_NONBLOCKING redundant. m4_ifdef([gl_NONBLOCKING_IO], [ gl_NONBLOCKING_IO if test $gl_cv_have_nonblocking != yes; then REPLACE_STDIO_WRITE_FUNCS=1 - AC_LIBOBJ([stdio-write]) fi ]) diff --git a/gnulib-m4/sys_stat_h.m4 b/gnulib-m4/sys_stat_h.m4 index b5a9789..2adbfde 100644 --- a/gnulib-m4/sys_stat_h.m4 +++ b/gnulib-m4/sys_stat_h.m4 @@ -1,4 +1,4 @@ -# sys_stat_h.m4 serial 41 -*- Autoconf -*- +# sys_stat_h.m4 serial 42 -*- Autoconf -*- dnl Copyright (C) 2006-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -46,7 +46,7 @@ AC_DEFUN_ONCE([gl_SYS_STAT_H], dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use. gl_WARN_ON_USE_PREPARE([[#include - ]], [fchmodat fstat fstatat futimens getumask lchmod lstat + ]], [chmod fchmodat fstat fstatat futimens getumask lchmod lstat mkdirat mkfifo mkfifoat mknod mknodat stat utimensat]) AC_REQUIRE([AC_C_RESTRICT]) @@ -72,6 +72,7 @@ AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], [ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHMOD]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT]) @@ -112,6 +113,7 @@ AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], HAVE_MKNOD=1; AC_SUBST([HAVE_MKNOD]) HAVE_MKNODAT=1; AC_SUBST([HAVE_MKNODAT]) HAVE_UTIMENSAT=1; AC_SUBST([HAVE_UTIMENSAT]) + REPLACE_CHMOD=0; AC_SUBST([REPLACE_CHMOD]) REPLACE_FCHMODAT=0; AC_SUBST([REPLACE_FCHMODAT]) REPLACE_FSTAT=0; AC_SUBST([REPLACE_FSTAT]) REPLACE_FSTATAT=0; AC_SUBST([REPLACE_FSTATAT]) diff --git a/gnulib-m4/time_h.m4 b/gnulib-m4/time_h.m4 index 98d7b6e..4ac8fd0 100644 --- a/gnulib-m4/time_h.m4 +++ b/gnulib-m4/time_h.m4 @@ -2,7 +2,7 @@ # Copyright (C) 2000-2001, 2003-2007, 2009-2022 Free Software Foundation, Inc. -# serial 19 +# serial 20 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -19,6 +19,12 @@ AC_DEFUN_ONCE([gl_TIME_H], gl_NEXT_HEADERS([time.h]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use. + gl_WARN_ON_USE_PREPARE([[ +#include + ]], [asctime_r ctime_r]) + AC_REQUIRE([AC_C_RESTRICT]) AC_CACHE_CHECK([for TIME_UTC in ], diff --git a/gnulib-m4/unistd_h.m4 b/gnulib-m4/unistd_h.m4 index f93f97a..4c66ccc 100644 --- a/gnulib-m4/unistd_h.m4 +++ b/gnulib-m4/unistd_h.m4 @@ -222,6 +222,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_ACCESS=0; AC_SUBST([REPLACE_ACCESS]) REPLACE_CHOWN=0; AC_SUBST([REPLACE_CHOWN]) REPLACE_CLOSE=0; AC_SUBST([REPLACE_CLOSE]) + REPLACE_COPY_FILE_RANGE=0; AC_SUBST([REPLACE_COPY_FILE_RANGE]) REPLACE_DUP=0; AC_SUBST([REPLACE_DUP]) REPLACE_DUP2=0; AC_SUBST([REPLACE_DUP2]) REPLACE_EXECL=0; AC_SUBST([REPLACE_EXECL]) diff --git a/gnulib-m4/warn-on-use.m4 b/gnulib-m4/warn-on-use.m4 index d43355a..a81731f 100644 --- a/gnulib-m4/warn-on-use.m4 +++ b/gnulib-m4/warn-on-use.m4 @@ -1,4 +1,4 @@ -# warn-on-use.m4 serial 9 +# warn-on-use.m4 serial 10 dnl Copyright (C) 2010-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -32,17 +32,30 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE], undefining macros.])])dnl for gl_func in m4_flatten([$2]); do AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl + dnl As a workaround to implicit built-in function declarations in + dnl clang (e.g. strndup), reference ac_compile_for_check_decl instead + dnl of ac_compile. If, for whatever reason, the override of AC_PROG_CC + dnl in zzgnulib.m4 is inactive, use the original ac_compile. + ac_save_ac_compile="$ac_compile" + if test -n "$ac_compile_for_check_decl"; then + ac_compile="$ac_compile_for_check_decl" + fi AC_CACHE_CHECK([whether $gl_func is declared without a macro], [gl_Symbol], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1], [[#undef $gl_func (void) $gl_func;]])], [AS_VAR_SET([gl_Symbol], [yes])], [AS_VAR_SET([gl_Symbol], [no])])]) + ac_compile="$ac_save_ac_compile" AS_VAR_IF([gl_Symbol], [yes], [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1]) - dnl shortcut - if the raw declaration exists, then set a cache - dnl variable to allow skipping any later AC_CHECK_DECL efforts - eval ac_cv_have_decl_$gl_func=yes]) + dnl Shortcut for an AC_CHECK_DECL invocation that may come later: + dnl If the raw declaration exists with the given includes, then + dnl AC_CHECK_DECL with its many includes would see it as well. + dnl So, set a cache variable to allow skipping any later + dnl AC_CHECK_DECL invocation for $gl_func. + eval "ac_cv_have_decl_$gl_func=yes" + ]) AS_VAR_POPDEF([gl_Symbol])dnl done ]) diff --git a/gnulib-m4/year2038.m4 b/gnulib-m4/year2038.m4 index 06db589..2e4427e 100644 --- a/gnulib-m4/year2038.m4 +++ b/gnulib-m4/year2038.m4 @@ -1,4 +1,4 @@ -# year2038.m4 serial 7 +# year2038.m4 serial 8 dnl Copyright (C) 2017-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,6 +7,12 @@ dnl with or without modifications, as long as this notice is preserved. dnl Attempt to ensure that 'time_t' can go past the year 2038 and that dnl the functions 'time', 'stat', etc. work with post-2038 timestamps. +m4_ifdef([AC_SYS_YEAR2038], [ + AC_DEFUN([gl_YEAR2038_EARLY]) + AC_DEFUN([gl_YEAR2038], [AC_SYS_YEAR2038]) + AC_DEFUN([gl_YEAR2038_BODY], [_AC_SYS_YEAR2038]) +], [ + AC_DEFUN([gl_YEAR2038_EARLY], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -122,3 +128,5 @@ AC_DEFUN([gl_YEAR2038], [ gl_YEAR2038_BODY([require-year2038-safe]) ]) + +]) # m4_ifndef AC_SYS_YEAR2038 -- cgit v1.2.3