From: Bruno Haible Date: Sun, 26 Jul 2020 15:52:11 +0000 (+0200) Subject: Update after gnulib changed. X-Git-Tag: v0.21~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64e8745b4a2bd4ccd110a5c0dd8ad13569feea3e;p=thirdparty%2Fgettext.git Update after gnulib changed. * gettext-runtime/m4/intl.m4 (gt_INTL_SUBDIR_CORE): Don't require gt_INTTYPES_PRI. * gettext-runtime/m4/inttypes-pri.m4: Remove file. * gettext-runtime/m4/Makefile.am (EXTRA_DIST): Remove it. * Makefile.am (distcheck-hook): Don't compare inttypes-pri.m4. * gettext-runtime/m4/size_max.m4: Update from gnulib. --- diff --git a/Makefile.am b/Makefile.am index 428789e4f..815e3c7d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,7 +76,6 @@ distcheck-hook: cmp -s $(srcdir)/gettext-runtime/m4/gettext.m4 $(srcdir)/gettext-tools/gnulib-m4/gettext.m4 cmp -s $(srcdir)/gettext-runtime/m4/iconv.m4 $(srcdir)/gettext-tools/gnulib-m4/iconv.m4 cmp -s $(srcdir)/gettext-runtime/m4/intlmacosx.m4 $(srcdir)/gettext-tools/gnulib-m4/intlmacosx.m4 - cmp -s $(srcdir)/gettext-runtime/m4/inttypes-pri.m4 $(srcdir)/gettext-tools/gnulib-m4/inttypes-pri.m4 cmp -s $(srcdir)/gettext-runtime/m4/inttypes_h.m4 $(srcdir)/gettext-tools/gnulib-m4/inttypes_h.m4 cmp -s $(srcdir)/gettext-runtime/m4/nls.m4 $(srcdir)/gettext-tools/gnulib-m4/nls.m4 cmp -s $(srcdir)/gettext-runtime/m4/po.m4 $(srcdir)/gettext-tools/gnulib-m4/po.m4 diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am index 8f2487a11..3a8c206b9 100644 --- a/gettext-runtime/m4/Makefile.am +++ b/gettext-runtime/m4/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-runtime/m4 directory of GNU gettext -## Copyright (C) 2003, 2005-2013, 2017-2019 Free Software Foundation, Inc. +## Copyright (C) 2003, 2005-2013, 2017-2020 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -29,7 +29,6 @@ intdiv0.m4 \ intl.m4 \ intlmacosx.m4 \ intmax.m4 \ -inttypes-pri.m4 \ inttypes_h.m4 \ nls.m4 \ po.m4 \ diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4 index 4147309b9..043176d03 100644 --- a/gettext-runtime/m4/intl.m4 +++ b/gettext-runtime/m4/intl.m4 @@ -1,4 +1,4 @@ -# intl.m4 serial 43 (gettext-0.21) +# intl.m4 serial 44 (gettext-0.21) dnl Copyright (C) 1995-2014, 2016-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -227,7 +227,6 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE], AC_REQUIRE([AC_FUNC_MMAP])dnl AC_REQUIRE([gt_INTDIV0])dnl AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl - AC_REQUIRE([gt_INTTYPES_PRI])dnl AC_REQUIRE([gl_LOCK])dnl AC_LINK_IFELSE( diff --git a/gettext-runtime/m4/inttypes-pri.m4 b/gettext-runtime/m4/inttypes-pri.m4 deleted file mode 100644 index ac40a053e..000000000 --- a/gettext-runtime/m4/inttypes-pri.m4 +++ /dev/null @@ -1,42 +0,0 @@ -# inttypes-pri.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1997-2002, 2006, 2008-2020 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 Bruno Haible. - -AC_PREREQ([2.53]) - -# Define PRI_MACROS_BROKEN if exists and defines the PRI* -# macros to non-string values. This is the case on AIX 4.3.3. - -AC_DEFUN([gt_INTTYPES_PRI], -[ - AC_CHECK_HEADERS([inttypes.h]) - if test $ac_cv_header_inttypes_h = yes; then - AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], - [gt_cv_inttypes_pri_broken], - [ - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#ifdef PRId32 -char *p = PRId32; -#endif - ]], - [[]])], - [gt_cv_inttypes_pri_broken=no], - [gt_cv_inttypes_pri_broken=yes]) - ]) - fi - if test "$gt_cv_inttypes_pri_broken" = yes; then - AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], [1], - [Define if exists and defines unusable PRI* macros.]) - PRI_MACROS_BROKEN=1 - else - PRI_MACROS_BROKEN=0 - fi - AC_SUBST([PRI_MACROS_BROKEN]) -]) diff --git a/gettext-runtime/m4/size_max.m4 b/gettext-runtime/m4/size_max.m4 index 5240d799c..6ebb93f21 100644 --- a/gettext-runtime/m4/size_max.m4 +++ b/gettext-runtime/m4/size_max.m4 @@ -1,4 +1,4 @@ -# size_max.m4 serial 11 +# size_max.m4 serial 12 dnl Copyright (C) 2003, 2005-2006, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -13,7 +13,7 @@ AC_DEFUN([gl_SIZE_MAX], AC_CHECK_HEADERS([stdint.h]) dnl First test whether the system already has SIZE_MAX. AC_CACHE_CHECK([for SIZE_MAX], [gl_cv_size_max], [ - gl_cv_size_max= + gl_cv_size_max=no AC_EGREP_CPP([Found it], [ #include #if HAVE_STDINT_H @@ -23,7 +23,7 @@ AC_DEFUN([gl_SIZE_MAX], Found it #endif ], [gl_cv_size_max=yes]) - if test -z "$gl_cv_size_max"; then + if test $gl_cv_size_max != yes; then dnl Define it ourselves. Here we assume that the type 'size_t' is not wider dnl than the type 'unsigned long'. Try hard to find a definition that can dnl be used in a preprocessor #if, i.e. doesn't contain a cast. diff --git a/libtextstyle/.gitignore b/libtextstyle/.gitignore index acafa2111..509a54296 100644 --- a/libtextstyle/.gitignore +++ b/libtextstyle/.gitignore @@ -109,8 +109,6 @@ /lib/libcroco/ /lib/libxml/ /lib/limits.in.h -/lib/localtime-buffer.c -/lib/localtime-buffer.h /lib/log10.c /lib/malloc.c /lib/malloca.c