commit: adf5c6408b580082807cd7c9d3deab78c9cbb0a2
parent 85ed21c785a3cf823767886e40101ff7e819d854
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Fri, 24 May 2024 09:14:27 +0200
sys-devel/gettext: Apply M4 cleanup patch
Diffstat:
3 files changed, 1782 insertions(+), 59 deletions(-)
diff --git a/sys-devel/gettext/files/gettext-0.3.2-m4_cleanup.patch b/sys-devel/gettext/files/gettext-0.3.2-m4_cleanup.patch
@@ -0,0 +1,1722 @@
+From f2466c319fee707e6c753c1311dd15367f04793b Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Date: Fri, 24 May 2024 08:38:44 +0200
+Subject: [PATCH] m4: Only expose what GNU gettext also exposes
+Upstream: https://github.com/sabotage-linux/gettext-tiny/pull/67
+
+Otherwise gettext-tiny m4 libs ends up overriding other versions
+of vendored gnulib, making autoreconf fail.
+
+Additionally I checked that each m4 file has it's required
+automake functions, which can be listed with the following command:
+
+ $ grep AC_REQUIRE m4/*.m4 | grep AM
+---
+ m4/ansi-c++.m4 | 128 ---------------
+ m4/codeset.m4 | 24 ---
+ m4/configheader.m4 | 1 -
+ m4/fcntl-o.m4 | 134 ----------------
+ m4/glibc2.m4 | 31 ----
+ m4/glibc21.m4 | 34 ----
+ m4/intdiv0.m4 | 87 ----------
+ m4/intldir.m4 | 19 ---
+ m4/intmax.m4 | 36 -----
+ m4/inttypes-pri.m4 | 42 -----
+ m4/inttypes_h.m4 | 29 ----
+ m4/lcmessage.m4 | 35 ----
+ m4/lock.m4 | 47 ------
+ m4/longlong.m4 | 113 -------------
+ m4/printf-posix.m4 | 48 ------
+ m4/size_max.m4 | 79 ---------
+ m4/stdint_h.m4 | 27 ----
+ m4/threadlib.m4 | 391 ---------------------------------------------
+ m4/uintmax_t.m4 | 30 ----
+ m4/visibility.m4 | 77 ---------
+ m4/wchar_t.m4 | 24 ---
+ m4/wint_t.m4 | 74 ---------
+ m4/xsize.m4 | 12 --
+ 23 files changed, 1522 deletions(-)
+ delete mode 100644 m4/ansi-c++.m4
+ delete mode 100644 m4/codeset.m4
+ delete mode 100644 m4/configheader.m4
+ delete mode 100644 m4/fcntl-o.m4
+ delete mode 100644 m4/glibc2.m4
+ delete mode 100644 m4/glibc21.m4
+ delete mode 100644 m4/intdiv0.m4
+ delete mode 100644 m4/intldir.m4
+ delete mode 100644 m4/intmax.m4
+ delete mode 100644 m4/inttypes-pri.m4
+ delete mode 100644 m4/inttypes_h.m4
+ delete mode 100644 m4/lcmessage.m4
+ delete mode 100644 m4/lock.m4
+ delete mode 100644 m4/longlong.m4
+ delete mode 100644 m4/printf-posix.m4
+ delete mode 100644 m4/size_max.m4
+ delete mode 100644 m4/stdint_h.m4
+ delete mode 100644 m4/threadlib.m4
+ delete mode 100644 m4/uintmax_t.m4
+ delete mode 100644 m4/visibility.m4
+ delete mode 100644 m4/wchar_t.m4
+ delete mode 100644 m4/wint_t.m4
+ delete mode 100644 m4/xsize.m4
+
+diff --git a/m4/ansi-c++.m4 b/m4/ansi-c++.m4
+deleted file mode 100644
+index c299860..0000000
+--- a/m4/ansi-c++.m4
++++ /dev/null
+@@ -1,128 +0,0 @@
+-# ansi-c++.m4 serial 9
+-dnl Copyright (C) 2002-2003, 2005, 2010-2017 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.
+-
+-# Sets CXX_CHOICE to 'yes' or 'no', depending on the preferred use of C++.
+-# The default is 'yes'. If the configure.ac contains a definition of the
+-# macro gl_CXX_CHOICE_DEFAULT_NO, then the default is 'no'. In both cases,
+-# the user can change the value by passing the option --disable-cxx or
+-# --enable-cxx, respectively.
+-
+-AC_DEFUN([gl_CXX_CHOICE],
+-[
+- AC_MSG_CHECKING([whether to use C++])
+- dnl Plus signs are supported in AC_ARG_ENABLE starting with autoconf-2.66.
+- m4_version_prereq([2.66],
+- [m4_ifdef([gl_CXX_CHOICE_DEFAULT_NO],
+- [AC_ARG_ENABLE([c++],
+- [ --enable-c++ also build C++ sources],
+- [CXX_CHOICE="$enableval"],
+- [CXX_CHOICE=no])],
+- [AC_ARG_ENABLE([c++],
+- [ --disable-c++ do not build C++ sources],
+- [CXX_CHOICE="$enableval"],
+- [CXX_CHOICE=yes])])],
+- [m4_ifdef([gl_CXX_CHOICE_DEFAULT_NO],
+- [AC_ARG_ENABLE([cxx],
+- [ --enable-cxx also build C++ sources],
+- [CXX_CHOICE="$enableval"],
+- [CXX_CHOICE=no])],
+- [AC_ARG_ENABLE([cxx],
+- [ --disable-cxx do not build C++ sources],
+- [CXX_CHOICE="$enableval"],
+- [CXX_CHOICE=yes])])])
+- AC_MSG_RESULT([$CXX_CHOICE])
+- AC_SUBST([CXX_CHOICE])
+-])
+-
+-# gl_PROG_ANSI_CXX([ANSICXX_VARIABLE], [ANSICXX_CONDITIONAL])
+-# Sets ANSICXX_VARIABLE to the name of a sufficiently ANSI C++ compliant
+-# compiler, or to "no" if none is found.
+-# Defines the Automake condition ANSICXX_CONDITIONAL to true if such a compiler
+-# was found, or to false if not.
+-
+-AC_DEFUN([gl_PROG_ANSI_CXX],
+-[
+- AC_REQUIRE([gl_CXX_CHOICE])
+- m4_if([$1], [CXX], [],
+- [gl_save_CXX="$CXX"])
+- if test "$CXX_CHOICE" = no; then
+- CXX=no
+- fi
+- if test -z "$CXX"; then
+- if test -n "$CCC"; then
+- CXX="$CCC"
+- else
+- AC_CHECK_TOOLS([CXX],
+- [g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC],
+- [:])
+- fi
+- fi
+- if test "$CXX" != no; then
+- dnl Use a modified version of AC_PROG_CXX_WORKS that does not exit
+- dnl upon failure.
+- AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
+- AC_LANG_PUSH([C++])
+- AC_ARG_VAR([CXX], [C++ compiler command])
+- AC_ARG_VAR([CXXFLAGS], [C++ compiler flags])
+- echo 'int main () { return 0; }' > conftest.$ac_ext
+- if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
+- gl_cv_prog_ansicxx_works=yes
+- if (./conftest; exit) 2>/dev/null; then
+- gl_cv_prog_ansicxx_cross=no
+- else
+- gl_cv_prog_ansicxx_cross=yes
+- fi
+- else
+- gl_cv_prog_ansicxx_works=no
+- fi
+- rm -fr conftest*
+- AC_LANG_POP([C++])
+- AC_MSG_RESULT([$gl_cv_prog_ansicxx_works])
+- if test $gl_cv_prog_ansicxx_works = no; then
+- CXX=no
+- else
+- dnl Test for namespaces.
+- dnl We don't bother supporting pre-ANSI-C++ compilers.
+- AC_MSG_CHECKING([whether the C++ compiler supports namespaces])
+- AC_LANG_PUSH([C++])
+- cat <<EOF > conftest.$ac_ext
+-#include <iostream>
+-namespace test { using namespace std; }
+-std::ostream* ptr;
+-int main () { return 0; }
+-EOF
+- if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
+- gl_cv_prog_ansicxx_namespaces=yes
+- else
+- gl_cv_prog_ansicxx_namespaces=no
+- fi
+- rm -fr conftest*
+- AC_LANG_POP([C++])
+- AC_MSG_RESULT([$gl_cv_prog_ansicxx_namespaces])
+- if test $gl_cv_prog_ansicxx_namespaces = no; then
+- CXX=no
+- fi
+- fi
+- fi
+- m4_if([$1], [CXX], [],
+- [$1="$CXX"
+- CXX="$gl_save_CXX"])
+- AC_SUBST([$1])
+-
+- AM_CONDITIONAL([$2], [test "$$1" != no])
+-
+- if test "$$1" != no; then
+- dnl This macro invocation resolves an automake error:
+- dnl /usr/local/share/automake-1.11/am/depend2.am: am__fastdepCXX does not appear in AM_CONDITIONAL
+- dnl /usr/local/share/automake-1.11/am/depend2.am: The usual way to define 'am__fastdepCXX' is to add 'AC_PROG_CXX'
+- dnl /usr/local/share/automake-1.11/am/depend2.am: to 'configure.ac' and run 'aclocal' and 'autoconf' again.
+- _AM_DEPENDENCIES([CXX])
+- else
+- AM_CONDITIONAL([am__fastdepCXX], [false])
+- fi
+-])
+diff --git a/m4/codeset.m4 b/m4/codeset.m4
+deleted file mode 100644
+index bc98201..0000000
+--- a/m4/codeset.m4
++++ /dev/null
+@@ -1,24 +0,0 @@
+-# codeset.m4 serial 5 (gettext-0.18.2)
+-dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016 Free Software Foundation,
+-dnl 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_DEFUN([AM_LANGINFO_CODESET],
+-[
+- AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
+- [AC_LINK_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[#include <langinfo.h>]],
+- [[char* cs = nl_langinfo(CODESET); return !cs;]])],
+- [am_cv_langinfo_codeset=yes],
+- [am_cv_langinfo_codeset=no])
+- ])
+- if test $am_cv_langinfo_codeset = yes; then
+- AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
+- [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+- fi
+-])
+diff --git a/m4/configheader.m4 b/m4/configheader.m4
+deleted file mode 100644
+index f06f1d8..0000000
+--- a/m4/configheader.m4
++++ /dev/null
+@@ -1 +0,0 @@
+-AC_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4
+deleted file mode 100644
+index 3c3b63c..0000000
+--- a/m4/fcntl-o.m4
++++ /dev/null
+@@ -1,134 +0,0 @@
+-# fcntl-o.m4 serial 4
+-dnl Copyright (C) 2006, 2009-2017 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 Written by Paul Eggert.
+-
+-# Test whether the flags O_NOATIME and O_NOFOLLOW actually work.
+-# Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise.
+-# Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise.
+-AC_DEFUN([gl_FCNTL_O_FLAGS],
+-[
+- dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
+- dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
+- dnl AC_GNU_SOURCE.
+- m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+- [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
+- [AC_REQUIRE([AC_GNU_SOURCE])])
+-
+- AC_CHECK_HEADERS_ONCE([unistd.h])
+- AC_CHECK_FUNCS_ONCE([symlink])
+- AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
+- [AC_RUN_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[#include <sys/types.h>
+- #include <sys/stat.h>
+- #if HAVE_UNISTD_H
+- # include <unistd.h>
+- #else /* on Windows with MSVC */
+- # include <io.h>
+- # include <stdlib.h>
+- # defined sleep(n) _sleep ((n) * 1000)
+- #endif
+- #include <fcntl.h>
+- #ifndef O_NOATIME
+- #define O_NOATIME 0
+- #endif
+- #ifndef O_NOFOLLOW
+- #define O_NOFOLLOW 0
+- #endif
+- static int const constants[] =
+- {
+- O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
+- O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
+- };
+- ]],
+- [[
+- int result = !constants;
+- #if HAVE_SYMLINK
+- {
+- static char const sym[] = "conftest.sym";
+- if (symlink ("/dev/null", sym) != 0)
+- result |= 2;
+- else
+- {
+- int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
+- if (fd >= 0)
+- {
+- close (fd);
+- result |= 4;
+- }
+- }
+- if (unlink (sym) != 0 || symlink (".", sym) != 0)
+- result |= 2;
+- else
+- {
+- int fd = open (sym, O_RDONLY | O_NOFOLLOW);
+- if (fd >= 0)
+- {
+- close (fd);
+- result |= 4;
+- }
+- }
+- unlink (sym);
+- }
+- #endif
+- {
+- static char const file[] = "confdefs.h";
+- int fd = open (file, O_RDONLY | O_NOATIME);
+- if (fd < 0)
+- result |= 8;
+- else
+- {
+- struct stat st0;
+- if (fstat (fd, &st0) != 0)
+- result |= 16;
+- else
+- {
+- char c;
+- sleep (1);
+- if (read (fd, &c, 1) != 1)
+- result |= 24;
+- else
+- {
+- if (close (fd) != 0)
+- result |= 32;
+- else
+- {
+- struct stat st1;
+- if (stat (file, &st1) != 0)
+- result |= 40;
+- else
+- if (st0.st_atime != st1.st_atime)
+- result |= 64;
+- }
+- }
+- }
+- }
+- }
+- return result;]])],
+- [gl_cv_header_working_fcntl_h=yes],
+- [case $? in #(
+- 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
+- 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
+- 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
+- *) gl_cv_header_working_fcntl_h='no';;
+- esac],
+- [gl_cv_header_working_fcntl_h=cross-compiling])])
+-
+- case $gl_cv_header_working_fcntl_h in #(
+- *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
+- *) ac_val=1;;
+- esac
+- AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$ac_val],
+- [Define to 1 if O_NOATIME works.])
+-
+- case $gl_cv_header_working_fcntl_h in #(
+- *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
+- *) ac_val=1;;
+- esac
+- AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
+- [Define to 1 if O_NOFOLLOW works.])
+-])
+diff --git a/m4/glibc2.m4 b/m4/glibc2.m4
+deleted file mode 100644
+index 926edba..0000000
+--- a/m4/glibc2.m4
++++ /dev/null
+@@ -1,31 +0,0 @@
+-# glibc2.m4 serial 3
+-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2017 Free Software Foundation,
+-dnl 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.
+-
+-# Test for the GNU C Library, version 2.0 or newer.
+-# From Bruno Haible.
+-
+-AC_DEFUN([gt_GLIBC2],
+- [
+- AC_CACHE_CHECK([whether we are using the GNU C Library 2 or newer],
+- [ac_cv_gnu_library_2],
+- [AC_EGREP_CPP([Lucky GNU user],
+- [
+-#include <features.h>
+-#ifdef __GNU_LIBRARY__
+- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
+- Lucky GNU user
+- #endif
+-#endif
+- ],
+- [ac_cv_gnu_library_2=yes],
+- [ac_cv_gnu_library_2=no])
+- ]
+- )
+- AC_SUBST([GLIBC2])
+- GLIBC2="$ac_cv_gnu_library_2"
+- ]
+-)
+diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
+deleted file mode 100644
+index 2e30ed6..0000000
+--- a/m4/glibc21.m4
++++ /dev/null
+@@ -1,34 +0,0 @@
+-# glibc21.m4 serial 5
+-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2017 Free Software Foundation,
+-dnl 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.
+-
+-# Test for the GNU C Library, version 2.1 or newer, or uClibc.
+-# From Bruno Haible.
+-
+-AC_DEFUN([gl_GLIBC21],
+- [
+- AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc],
+- [ac_cv_gnu_library_2_1],
+- [AC_EGREP_CPP([Lucky],
+- [
+-#include <features.h>
+-#ifdef __GNU_LIBRARY__
+- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+- Lucky GNU user
+- #endif
+-#endif
+-#ifdef __UCLIBC__
+- Lucky user
+-#endif
+- ],
+- [ac_cv_gnu_library_2_1=yes],
+- [ac_cv_gnu_library_2_1=no])
+- ]
+- )
+- AC_SUBST([GLIBC21])
+- GLIBC21="$ac_cv_gnu_library_2_1"
+- ]
+-)
+diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
+deleted file mode 100644
+index bbbc114..0000000
+--- a/m4/intdiv0.m4
++++ /dev/null
+@@ -1,87 +0,0 @@
+-# intdiv0.m4 serial 6 (gettext-0.18.2)
+-dnl Copyright (C) 2002, 2007-2008, 2010-2017 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_DEFUN([gt_INTDIV0],
+-[
+- AC_REQUIRE([AC_PROG_CC])dnl
+- AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-
+- AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
+- gt_cv_int_divbyzero_sigfpe,
+- [
+- gt_cv_int_divbyzero_sigfpe=
+-changequote(,)dnl
+- case "$host_os" in
+- macos* | darwin[6-9]* | darwin[1-9][0-9]*)
+- # On Mac OS X 10.2 or newer, just assume the same as when cross-
+- # compiling. If we were to perform the real test, 1 Crash Report
+- # dialog window would pop up.
+- case "$host_cpu" in
+- i[34567]86 | x86_64)
+- gt_cv_int_divbyzero_sigfpe="guessing yes" ;;
+- esac
+- ;;
+- esac
+-changequote([,])dnl
+- if test -z "$gt_cv_int_divbyzero_sigfpe"; then
+- AC_RUN_IFELSE(
+- [AC_LANG_SOURCE([[
+-#include <stdlib.h>
+-#include <signal.h>
+-
+-static void
+-sigfpe_handler (int sig)
+-{
+- /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
+- _exit (sig != SIGFPE);
+-}
+-
+-int x = 1;
+-int y = 0;
+-int z;
+-int nan;
+-
+-int main ()
+-{
+- signal (SIGFPE, sigfpe_handler);
+-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
+-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+- signal (SIGTRAP, sigfpe_handler);
+-#endif
+-/* Linux/SPARC yields signal SIGILL. */
+-#if defined (__sparc__) && defined (__linux__)
+- signal (SIGILL, sigfpe_handler);
+-#endif
+-
+- z = x / y;
+- nan = y / y;
+- exit (2);
+-}
+-]])],
+- [gt_cv_int_divbyzero_sigfpe=yes],
+- [gt_cv_int_divbyzero_sigfpe=no],
+- [
+- # Guess based on the CPU.
+-changequote(,)dnl
+- case "$host_cpu" in
+- alpha* | i[34567]86 | x86_64 | m68k | s390*)
+- gt_cv_int_divbyzero_sigfpe="guessing yes";;
+- *)
+- gt_cv_int_divbyzero_sigfpe="guessing no";;
+- esac
+-changequote([,])dnl
+- ])
+- fi
+- ])
+- case "$gt_cv_int_divbyzero_sigfpe" in
+- *yes) value=1;;
+- *) value=0;;
+- esac
+- AC_DEFINE_UNQUOTED([INTDIV0_RAISES_SIGFPE], [$value],
+- [Define if integer division by zero raises signal SIGFPE.])
+-])
+diff --git a/m4/intldir.m4 b/m4/intldir.m4
+deleted file mode 100644
+index c688f46..0000000
+--- a/m4/intldir.m4
++++ /dev/null
+@@ -1,19 +0,0 @@
+-# intldir.m4 serial 2 (gettext-0.18)
+-dnl Copyright (C) 2006, 2009-2014, 2016 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
+-dnl This file can be used in projects which are not available under
+-dnl the GNU General Public License or the GNU Library General Public
+-dnl License but which still want to provide support for the GNU gettext
+-dnl functionality.
+-dnl Please note that the actual code of the GNU gettext library is covered
+-dnl by the GNU Library General Public License, and the rest of the GNU
+-dnl gettext package is covered by the GNU General Public License.
+-dnl They are *not* in the public domain.
+-
+-AC_PREREQ([2.52])
+-
+-dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
+-AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
+diff --git a/m4/intmax.m4 b/m4/intmax.m4
+deleted file mode 100644
+index b432fae..0000000
+--- a/m4/intmax.m4
++++ /dev/null
+@@ -1,36 +0,0 @@
+-# intmax.m4 serial 6 (gettext-0.18.2)
+-dnl Copyright (C) 2002-2005, 2008-2017 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.
+-dnl Test whether the system has the 'intmax_t' type, but don't attempt to
+-dnl find a replacement if it is lacking.
+-
+-AC_DEFUN([gt_TYPE_INTMAX_T],
+-[
+- AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+- AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+- AC_CACHE_CHECK([for intmax_t], [gt_cv_c_intmax_t],
+- [AC_COMPILE_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[
+-#include <stddef.h>
+-#include <stdlib.h>
+-#if HAVE_STDINT_H_WITH_UINTMAX
+-#include <stdint.h>
+-#endif
+-#if HAVE_INTTYPES_H_WITH_UINTMAX
+-#include <inttypes.h>
+-#endif
+- ]],
+- [[intmax_t x = -1;
+- return !x;]])],
+- [gt_cv_c_intmax_t=yes],
+- [gt_cv_c_intmax_t=no])])
+- if test $gt_cv_c_intmax_t = yes; then
+- AC_DEFINE([HAVE_INTMAX_T], [1],
+- [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
+- fi
+-])
+diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
+deleted file mode 100644
+index 2055787..0000000
+--- a/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-2017 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 <inttypes.h> 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 <inttypes.h>
+-#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 <inttypes.h> exists and defines unusable PRI* macros.])
+- PRI_MACROS_BROKEN=1
+- else
+- PRI_MACROS_BROKEN=0
+- fi
+- AC_SUBST([PRI_MACROS_BROKEN])
+-])
+diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
+deleted file mode 100644
+index 9240305..0000000
+--- a/m4/inttypes_h.m4
++++ /dev/null
+@@ -1,29 +0,0 @@
+-# inttypes_h.m4 serial 10
+-dnl Copyright (C) 1997-2004, 2006, 2008-2017 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.
+-
+-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
+-# doesn't clash with <sys/types.h>, and declares uintmax_t.
+-
+-AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
+-[
+- AC_CACHE_CHECK([for inttypes.h], [gl_cv_header_inttypes_h],
+- [AC_COMPILE_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[
+-#include <sys/types.h>
+-#include <inttypes.h>
+- ]],
+- [[uintmax_t i = (uintmax_t) -1; return !i;]])],
+- [gl_cv_header_inttypes_h=yes],
+- [gl_cv_header_inttypes_h=no])])
+- if test $gl_cv_header_inttypes_h = yes; then
+- AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], [1],
+- [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+- and declares uintmax_t. ])
+- fi
+-])
+diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
+deleted file mode 100644
+index 1c24d6d..0000000
+--- a/m4/lcmessage.m4
++++ /dev/null
+@@ -1,35 +0,0 @@
+-# lcmessage.m4 serial 7 (gettext-0.18.2)
+-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014, 2016 Free Software
+-dnl 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
+-dnl This file can be used in projects which are not available under
+-dnl the GNU General Public License or the GNU Library General Public
+-dnl License but which still want to provide support for the GNU gettext
+-dnl functionality.
+-dnl Please note that the actual code of the GNU gettext library is covered
+-dnl by the GNU Library General Public License, and the rest of the GNU
+-dnl gettext package is covered by the GNU General Public License.
+-dnl They are *not* in the public domain.
+-
+-dnl Authors:
+-dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
+-
+-# Check whether LC_MESSAGES is available in <locale.h>.
+-
+-AC_DEFUN([gt_LC_MESSAGES],
+-[
+- AC_CACHE_CHECK([for LC_MESSAGES], [gt_cv_val_LC_MESSAGES],
+- [AC_LINK_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[#include <locale.h>]],
+- [[return LC_MESSAGES]])],
+- [gt_cv_val_LC_MESSAGES=yes],
+- [gt_cv_val_LC_MESSAGES=no])])
+- if test $gt_cv_val_LC_MESSAGES = yes; then
+- AC_DEFINE([HAVE_LC_MESSAGES], [1],
+- [Define if your <locale.h> file defines LC_MESSAGES.])
+- fi
+-])
+diff --git a/m4/lock.m4 b/m4/lock.m4
+deleted file mode 100644
+index cb04a67..0000000
+--- a/m4/lock.m4
++++ /dev/null
+@@ -1,47 +0,0 @@
+-# lock.m4 serial 14
+-dnl Copyright (C) 2005-2017 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_DEFUN([gl_LOCK],
+-[
+- AC_REQUIRE([gl_THREADLIB])
+- if test "$gl_threads_api" = posix; then
+- # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
+- # pthread_rwlock_* functions.
+- has_rwlock=false
+- AC_CHECK_TYPE([pthread_rwlock_t],
+- [has_rwlock=true
+- AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
+- [Define if the POSIX multithreading library has read/write locks.])],
+- [],
+- [#include <pthread.h>])
+- if $has_rwlock; then
+- gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER
+- fi
+- # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
+- AC_COMPILE_IFELSE([
+- AC_LANG_PROGRAM(
+- [[#include <pthread.h>]],
+- [[
+-#if __FreeBSD__ == 4
+-error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
+-#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
+- && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
+-error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
+-#else
+-int x = (int)PTHREAD_MUTEX_RECURSIVE;
+-return !x;
+-#endif
+- ]])],
+- [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], [1],
+- [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
+- fi
+- gl_PREREQ_LOCK
+-])
+-
+-# Prerequisites of lib/glthread/lock.c.
+-AC_DEFUN([gl_PREREQ_LOCK], [:])
+diff --git a/m4/longlong.m4 b/m4/longlong.m4
+deleted file mode 100644
+index 9a3294b..0000000
+--- a/m4/longlong.m4
++++ /dev/null
+@@ -1,113 +0,0 @@
+-# longlong.m4 serial 17
+-dnl Copyright (C) 1999-2007, 2009-2017 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.
+-
+-# Define HAVE_LONG_LONG_INT if 'long long int' works.
+-# This fixes a bug in Autoconf 2.61, and can be faster
+-# than what's in Autoconf 2.62 through 2.68.
+-
+-# Note: If the type 'long long int' exists but is only 32 bits large
+-# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
+-# defined. In this case you can treat 'long long int' like 'long int'.
+-
+-AC_DEFUN([AC_TYPE_LONG_LONG_INT],
+-[
+- AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+- AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
+- [ac_cv_type_long_long_int=yes
+- if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+- ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
+- if test $ac_cv_type_long_long_int = yes; then
+- dnl Catch a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
+- dnl If cross compiling, assume the bug is not important, since
+- dnl nobody cross compiles for this platform as far as we know.
+- AC_RUN_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[@%:@include <limits.h>
+- @%:@ifndef LLONG_MAX
+- @%:@ define HALF \
+- (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+- @%:@ define LLONG_MAX (HALF - 1 + HALF)
+- @%:@endif]],
+- [[long long int n = 1;
+- int i;
+- for (i = 0; ; i++)
+- {
+- long long int m = n << i;
+- if (m >> i != n)
+- return 1;
+- if (LLONG_MAX / 2 < m)
+- break;
+- }
+- return 0;]])],
+- [],
+- [ac_cv_type_long_long_int=no],
+- [:])
+- fi
+- fi])
+- if test $ac_cv_type_long_long_int = yes; then
+- AC_DEFINE([HAVE_LONG_LONG_INT], [1],
+- [Define to 1 if the system has the type 'long long int'.])
+- fi
+-])
+-
+-# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
+-# This fixes a bug in Autoconf 2.61, and can be faster
+-# than what's in Autoconf 2.62 through 2.68.
+-
+-# Note: If the type 'unsigned long long int' exists but is only 32 bits
+-# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
+-# will not be defined. In this case you can treat 'unsigned long long int'
+-# like 'unsigned long int'.
+-
+-AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
+-[
+- AC_CACHE_CHECK([for unsigned long long int],
+- [ac_cv_type_unsigned_long_long_int],
+- [ac_cv_type_unsigned_long_long_int=yes
+- if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+- AC_LINK_IFELSE(
+- [_AC_TYPE_LONG_LONG_SNIPPET],
+- [],
+- [ac_cv_type_unsigned_long_long_int=no])
+- fi])
+- if test $ac_cv_type_unsigned_long_long_int = yes; then
+- AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
+- [Define to 1 if the system has the type 'unsigned long long int'.])
+- fi
+-])
+-
+-# Expands to a C program that can be used to test for simultaneous support
+-# of 'long long' and 'unsigned long long'. We don't want to say that
+-# 'long long' is available if 'unsigned long long' is not, or vice versa,
+-# because too many programs rely on the symmetry between signed and unsigned
+-# integer types (excluding 'bool').
+-AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
+-[
+- AC_LANG_PROGRAM(
+- [[/* For now, do not test the preprocessor; as of 2007 there are too many
+- implementations with broken preprocessors. Perhaps this can
+- be revisited in 2012. In the meantime, code should not expect
+- #if to work with literals wider than 32 bits. */
+- /* Test literals. */
+- long long int ll = 9223372036854775807ll;
+- long long int nll = -9223372036854775807LL;
+- unsigned long long int ull = 18446744073709551615ULL;
+- /* Test constant expressions. */
+- typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+- ? 1 : -1)];
+- typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+- ? 1 : -1)];
+- int i = 63;]],
+- [[/* Test availability of runtime routines for shift and division. */
+- long long int llmax = 9223372036854775807ll;
+- unsigned long long int ullmax = 18446744073709551615ull;
+- return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+- | (llmax / ll) | (llmax % ll)
+- | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+- | (ullmax / ull) | (ullmax % ull));]])
+-])
+diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
+deleted file mode 100644
+index 0577933..0000000
+--- a/m4/printf-posix.m4
++++ /dev/null
+@@ -1,48 +0,0 @@
+-# printf-posix.m4 serial 6 (gettext-0.18.2)
+-dnl Copyright (C) 2003, 2007, 2009-2017 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.
+-dnl Test whether the printf() function supports POSIX/XSI format strings with
+-dnl positions.
+-
+-AC_DEFUN([gt_PRINTF_POSIX],
+-[
+- AC_REQUIRE([AC_PROG_CC])
+- AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
+- gt_cv_func_printf_posix,
+- [
+- AC_RUN_IFELSE(
+- [AC_LANG_SOURCE([[
+-#include <stdio.h>
+-#include <string.h>
+-/* The string "%2$d %1$d", with dollar characters protected from the shell's
+- dollar expansion (possibly an autoconf bug). */
+-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+-static char buf[100];
+-int main ()
+-{
+- sprintf (buf, format, 33, 55);
+- return (strcmp (buf, "55 33") != 0);
+-}]])],
+- [gt_cv_func_printf_posix=yes],
+- [gt_cv_func_printf_posix=no],
+- [
+- AC_EGREP_CPP([notposix], [
+-#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+- notposix
+-#endif
+- ],
+- [gt_cv_func_printf_posix="guessing no"],
+- [gt_cv_func_printf_posix="guessing yes"])
+- ])
+- ])
+- case $gt_cv_func_printf_posix in
+- *yes)
+- AC_DEFINE([HAVE_POSIX_PRINTF], [1],
+- [Define if your printf() function supports format strings with positions.])
+- ;;
+- esac
+-])
+diff --git a/m4/size_max.m4 b/m4/size_max.m4
+deleted file mode 100644
+index 05ad1b6..0000000
+--- a/m4/size_max.m4
++++ /dev/null
+@@ -1,79 +0,0 @@
+-# size_max.m4 serial 10
+-dnl Copyright (C) 2003, 2005-2006, 2008-2017 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_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=
+- AC_EGREP_CPP([Found it], [
+-#include <limits.h>
+-#if HAVE_STDINT_H
+-#include <stdint.h>
+-#endif
+-#ifdef SIZE_MAX
+-Found it
+-#endif
+-], [gl_cv_size_max=yes])
+- if test -z "$gl_cv_size_max"; 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.
+- AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1],
+- [#include <stddef.h>
+-#include <limits.h>], [size_t_bits_minus_1=])
+- AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)],
+- [#include <stddef.h>], [fits_in_uint=])
+- if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
+- if test $fits_in_uint = 1; then
+- dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+- dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+- AC_COMPILE_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[#include <stddef.h>
+- extern size_t foo;
+- extern unsigned long foo;
+- ]],
+- [[]])],
+- [fits_in_uint=0])
+- fi
+- dnl We cannot use 'expr' to simplify this expression, because 'expr'
+- dnl works only with 'long' integers in the host environment, while we
+- dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
+- if test $fits_in_uint = 1; then
+- gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
+- else
+- gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
+- fi
+- else
+- dnl Shouldn't happen, but who knows...
+- gl_cv_size_max='((size_t)~(size_t)0)'
+- fi
+- fi
+- ])
+- if test "$gl_cv_size_max" != yes; then
+- AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
+- [Define as the maximum value of type 'size_t', if the system doesn't define it.])
+- fi
+- dnl Don't redefine SIZE_MAX in config.h if config.h is re-included after
+- dnl <stdint.h>. Remember that the #undef in AH_VERBATIM gets replaced with
+- dnl #define by AC_DEFINE_UNQUOTED.
+- AH_VERBATIM([SIZE_MAX],
+-[/* Define as the maximum value of type 'size_t', if the system doesn't define
+- it. */
+-#ifndef SIZE_MAX
+-# undef SIZE_MAX
+-#endif])
+-])
+-
+-dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
+-dnl Remove this when we can assume autoconf >= 2.61.
+-m4_ifdef([AC_COMPUTE_INT], [], [
+- AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
+-])
+diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
+deleted file mode 100644
+index 786eaa3..0000000
+--- a/m4/stdint_h.m4
++++ /dev/null
+@@ -1,27 +0,0 @@
+-# stdint_h.m4 serial 9
+-dnl Copyright (C) 1997-2004, 2006, 2008-2017 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.
+-
+-# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
+-# doesn't clash with <sys/types.h>, and declares uintmax_t.
+-
+-AC_DEFUN([gl_AC_HEADER_STDINT_H],
+-[
+- AC_CACHE_CHECK([for stdint.h], [gl_cv_header_stdint_h],
+- [AC_COMPILE_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[#include <sys/types.h>
+- #include <stdint.h>]],
+- [[uintmax_t i = (uintmax_t) -1; return !i;]])],
+- [gl_cv_header_stdint_h=yes],
+- [gl_cv_header_stdint_h=no])])
+- if test $gl_cv_header_stdint_h = yes; then
+- AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], [1],
+- [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+- and declares uintmax_t. ])
+- fi
+-])
+diff --git a/m4/threadlib.m4 b/m4/threadlib.m4
+deleted file mode 100644
+index f79fde2..0000000
+--- a/m4/threadlib.m4
++++ /dev/null
+@@ -1,391 +0,0 @@
+-# threadlib.m4 serial 12
+-dnl Copyright (C) 2005-2017 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.
+-
+-dnl gl_THREADLIB
+-dnl ------------
+-dnl Tests for a multithreading library to be used.
+-dnl If the configure.ac contains a definition of the gl_THREADLIB_DEFAULT_NO
+-dnl (it must be placed before the invocation of gl_THREADLIB_EARLY!), then the
+-dnl default is 'no', otherwise it is system dependent. In both cases, the user
+-dnl can change the choice through the options --enable-threads=choice or
+-dnl --disable-threads.
+-dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
+-dnl USE_PTH_THREADS, USE_WINDOWS_THREADS
+-dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
+-dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
+-dnl libtool).
+-dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
+-dnl programs that really need multithread functionality. The difference
+-dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
+-dnl symbols, typically LIBTHREAD is empty whereas LIBMULTITHREAD is not.
+-dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
+-dnl multithread-safe programs.
+-
+-AC_DEFUN([gl_THREADLIB_EARLY],
+-[
+- AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
+-])
+-
+-dnl The guts of gl_THREADLIB_EARLY. Needs to be expanded only once.
+-
+-AC_DEFUN([gl_THREADLIB_EARLY_BODY],
+-[
+- dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
+- dnl influences the result of the autoconf tests that test for *_unlocked
+- dnl declarations, on AIX 5 at least. Therefore it must come early.
+- AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
+- AC_BEFORE([$0], [gl_ARGP])dnl
+-
+- AC_REQUIRE([AC_CANONICAL_HOST])
+- dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems.
+- dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
+- dnl AC_GNU_SOURCE.
+- m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+- [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
+- [AC_REQUIRE([AC_GNU_SOURCE])])
+- dnl Check for multithreading.
+- m4_ifdef([gl_THREADLIB_DEFAULT_NO],
+- [m4_divert_text([DEFAULTS], [gl_use_threads_default=no])],
+- [m4_divert_text([DEFAULTS], [gl_use_threads_default=])])
+- AC_ARG_ENABLE([threads],
+-AC_HELP_STRING([--enable-threads={posix|solaris|pth|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
+-AC_HELP_STRING([--disable-threads], [build without multithread safety])]),
+- [gl_use_threads=$enableval],
+- [if test -n "$gl_use_threads_default"; then
+- gl_use_threads="$gl_use_threads_default"
+- else
+-changequote(,)dnl
+- case "$host_os" in
+- dnl Disable multithreading by default on OSF/1, because it interferes
+- dnl with fork()/exec(): When msgexec is linked with -lpthread, its
+- dnl child process gets an endless segmentation fault inside execvp().
+- dnl Disable multithreading by default on Cygwin 1.5.x, because it has
+- dnl bugs that lead to endless loops or crashes. See
+- dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
+- osf*) gl_use_threads=no ;;
+- cygwin*)
+- case `uname -r` in
+- 1.[0-5].*) gl_use_threads=no ;;
+- *) gl_use_threads=yes ;;
+- esac
+- ;;
+- *) gl_use_threads=yes ;;
+- esac
+-changequote([,])dnl
+- fi
+- ])
+- if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+- # For using <pthread.h>:
+- case "$host_os" in
+- osf*)
+- # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
+- # groks <pthread.h>. cc also understands the flag -pthread, but
+- # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
+- # 2. putting a flag into CPPFLAGS that has an effect on the linker
+- # causes the AC_LINK_IFELSE test below to succeed unexpectedly,
+- # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
+- CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+- ;;
+- esac
+- # Some systems optimize for single-threaded programs by default, and
+- # need special flags to disable these optimizations. For example, the
+- # definition of 'errno' in <errno.h>.
+- case "$host_os" in
+- aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
+- solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
+- esac
+- fi
+-])
+-
+-dnl The guts of gl_THREADLIB. Needs to be expanded only once.
+-
+-AC_DEFUN([gl_THREADLIB_BODY],
+-[
+- AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
+- gl_threads_api=none
+- LIBTHREAD=
+- LTLIBTHREAD=
+- LIBMULTITHREAD=
+- LTLIBMULTITHREAD=
+- if test "$gl_use_threads" != no; then
+- dnl Check whether the compiler and linker support weak declarations.
+- AC_CACHE_CHECK([whether imported symbols can be declared weak],
+- [gl_cv_have_weak],
+- [gl_cv_have_weak=no
+- dnl First, test whether the compiler accepts it syntactically.
+- AC_LINK_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[extern void xyzzy ();
+-#pragma weak xyzzy]],
+- [[xyzzy();]])],
+- [gl_cv_have_weak=maybe])
+- if test $gl_cv_have_weak = maybe; then
+- dnl Second, test whether it actually works. On Cygwin 1.7.2, with
+- dnl gcc 4.3, symbols declared weak always evaluate to the address 0.
+- AC_RUN_IFELSE(
+- [AC_LANG_SOURCE([[
+-#include <stdio.h>
+-#pragma weak fputs
+-int main ()
+-{
+- return (fputs == NULL);
+-}]])],
+- [gl_cv_have_weak=yes],
+- [gl_cv_have_weak=no],
+- [dnl When cross-compiling, assume that only ELF platforms support
+- dnl weak symbols.
+- AC_EGREP_CPP([Extensible Linking Format],
+- [#ifdef __ELF__
+- Extensible Linking Format
+- #endif
+- ],
+- [gl_cv_have_weak="guessing yes"],
+- [gl_cv_have_weak="guessing no"])
+- ])
+- fi
+- ])
+- if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+- # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
+- # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
+- AC_CHECK_HEADER([pthread.h],
+- [gl_have_pthread_h=yes], [gl_have_pthread_h=no])
+- if test "$gl_have_pthread_h" = yes; then
+- # Other possible tests:
+- # -lpthreads (FSU threads, PCthreads)
+- # -lgthreads
+- gl_have_pthread=
+- # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
+- # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
+- # the second one only in libpthread, and lock.c needs it.
+- #
+- # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
+- # needs -pthread for some reason. See:
+- # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html
+- save_LIBS=$LIBS
+- for gl_pthread in '' '-pthread'; do
+- LIBS="$LIBS $gl_pthread"
+- AC_LINK_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[#include <pthread.h>
+- pthread_mutex_t m;
+- pthread_mutexattr_t ma;
+- ]],
+- [[pthread_mutex_lock (&m);
+- pthread_mutexattr_init (&ma);]])],
+- [gl_have_pthread=yes
+- LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
+- LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread])
+- LIBS=$save_LIBS
+- test -n "$gl_have_pthread" && break
+- done
+-
+- # Test for libpthread by looking for pthread_kill. (Not pthread_self,
+- # since it is defined as a macro on OSF/1.)
+- if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then
+- # The program links fine without libpthread. But it may actually
+- # need to link with libpthread in order to create multiple threads.
+- AC_CHECK_LIB([pthread], [pthread_kill],
+- [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+- # On Solaris and HP-UX, most pthread functions exist also in libc.
+- # Therefore pthread_in_use() needs to actually try to create a
+- # thread: pthread_create from libc will fail, whereas
+- # pthread_create will actually create a thread.
+- # On Solaris 10 or newer, this test is no longer needed, because
+- # libc contains the fully functional pthread functions.
+- case "$host_os" in
+- solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*)
+- AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
+- [Define if the pthread_in_use() detection is hard.])
+- esac
+- ])
+- elif test -z "$gl_have_pthread"; then
+- # Some library is needed. Try libpthread and libc_r.
+- AC_CHECK_LIB([pthread], [pthread_kill],
+- [gl_have_pthread=yes
+- LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
+- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread])
+- if test -z "$gl_have_pthread"; then
+- # For FreeBSD 4.
+- AC_CHECK_LIB([c_r], [pthread_kill],
+- [gl_have_pthread=yes
+- LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
+- LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r])
+- fi
+- fi
+- if test -n "$gl_have_pthread"; then
+- gl_threads_api=posix
+- AC_DEFINE([USE_POSIX_THREADS], [1],
+- [Define if the POSIX multithreading library can be used.])
+- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+- if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+- AC_DEFINE([USE_POSIX_THREADS_WEAK], [1],
+- [Define if references to the POSIX multithreading library should be made weak.])
+- LIBTHREAD=
+- LTLIBTHREAD=
+- fi
+- fi
+- fi
+- fi
+- fi
+- if test -z "$gl_have_pthread"; then
+- if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
+- gl_have_solaristhread=
+- gl_save_LIBS="$LIBS"
+- LIBS="$LIBS -lthread"
+- AC_LINK_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[
+-#include <thread.h>
+-#include <synch.h>
+- ]],
+- [[thr_self();]])],
+- [gl_have_solaristhread=yes])
+- LIBS="$gl_save_LIBS"
+- if test -n "$gl_have_solaristhread"; then
+- gl_threads_api=solaris
+- LIBTHREAD=-lthread
+- LTLIBTHREAD=-lthread
+- LIBMULTITHREAD="$LIBTHREAD"
+- LTLIBMULTITHREAD="$LTLIBTHREAD"
+- AC_DEFINE([USE_SOLARIS_THREADS], [1],
+- [Define if the old Solaris multithreading library can be used.])
+- if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+- AC_DEFINE([USE_SOLARIS_THREADS_WEAK], [1],
+- [Define if references to the old Solaris multithreading library should be made weak.])
+- LIBTHREAD=
+- LTLIBTHREAD=
+- fi
+- fi
+- fi
+- fi
+- if test "$gl_use_threads" = pth; then
+- gl_save_CPPFLAGS="$CPPFLAGS"
+- AC_LIB_LINKFLAGS([pth])
+- gl_have_pth=
+- gl_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIBPTH"
+- AC_LINK_IFELSE(
+- [AC_LANG_PROGRAM([[#include <pth.h>]], [[pth_self();]])],
+- [gl_have_pth=yes])
+- LIBS="$gl_save_LIBS"
+- if test -n "$gl_have_pth"; then
+- gl_threads_api=pth
+- LIBTHREAD="$LIBPTH"
+- LTLIBTHREAD="$LTLIBPTH"
+- LIBMULTITHREAD="$LIBTHREAD"
+- LTLIBMULTITHREAD="$LTLIBTHREAD"
+- AC_DEFINE([USE_PTH_THREADS], [1],
+- [Define if the GNU Pth multithreading library can be used.])
+- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+- if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+- AC_DEFINE([USE_PTH_THREADS_WEAK], [1],
+- [Define if references to the GNU Pth multithreading library should be made weak.])
+- LIBTHREAD=
+- LTLIBTHREAD=
+- fi
+- fi
+- else
+- CPPFLAGS="$gl_save_CPPFLAGS"
+- fi
+- fi
+- if test -z "$gl_have_pthread"; then
+- case "$gl_use_threads" in
+- yes | windows | win32) # The 'win32' is for backward compatibility.
+- if { case "$host_os" in
+- mingw*) true;;
+- *) false;;
+- esac
+- }; then
+- gl_threads_api=windows
+- AC_DEFINE([USE_WINDOWS_THREADS], [1],
+- [Define if the native Windows multithreading API can be used.])
+- fi
+- ;;
+- esac
+- fi
+- fi
+- AC_MSG_CHECKING([for multithread API to use])
+- AC_MSG_RESULT([$gl_threads_api])
+- AC_SUBST([LIBTHREAD])
+- AC_SUBST([LTLIBTHREAD])
+- AC_SUBST([LIBMULTITHREAD])
+- AC_SUBST([LTLIBMULTITHREAD])
+-])
+-
+-AC_DEFUN([gl_THREADLIB],
+-[
+- AC_REQUIRE([gl_THREADLIB_EARLY])
+- AC_REQUIRE([gl_THREADLIB_BODY])
+-])
+-
+-
+-dnl gl_DISABLE_THREADS
+-dnl ------------------
+-dnl Sets the gl_THREADLIB default so that threads are not used by default.
+-dnl The user can still override it at installation time, by using the
+-dnl configure option '--enable-threads'.
+-
+-AC_DEFUN([gl_DISABLE_THREADS], [
+- m4_divert_text([INIT_PREPARE], [gl_use_threads_default=no])
+-])
+-
+-
+-dnl Survey of platforms:
+-dnl
+-dnl Platform Available Compiler Supports test-lock
+-dnl flavours option weak result
+-dnl --------------- --------- --------- -------- ---------
+-dnl Linux 2.4/glibc posix -lpthread Y OK
+-dnl
+-dnl GNU Hurd/glibc posix
+-dnl
+-dnl Ubuntu 14.04 posix -pthread Y OK
+-dnl
+-dnl FreeBSD 5.3 posix -lc_r Y
+-dnl posix -lkse ? Y
+-dnl posix -lpthread ? Y
+-dnl posix -lthr Y
+-dnl
+-dnl FreeBSD 5.2 posix -lc_r Y
+-dnl posix -lkse Y
+-dnl posix -lthr Y
+-dnl
+-dnl FreeBSD 4.0,4.10 posix -lc_r Y OK
+-dnl
+-dnl NetBSD 1.6 --
+-dnl
+-dnl OpenBSD 3.4 posix -lpthread Y OK
+-dnl
+-dnl Mac OS X 10.[123] posix -lpthread Y OK
+-dnl
+-dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK
+-dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK
+-dnl
+-dnl HP-UX 11 posix -lpthread N (cc) OK
+-dnl Y (gcc)
+-dnl
+-dnl IRIX 6.5 posix -lpthread Y 0.5
+-dnl
+-dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK
+-dnl
+-dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK
+-dnl -lpthread (gcc) Y
+-dnl
+-dnl Cygwin posix -lpthread Y OK
+-dnl
+-dnl Any of the above pth -lpth 0.0
+-dnl
+-dnl Mingw windows N OK
+-dnl
+-dnl BeOS 5 --
+-dnl
+-dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
+-dnl turned off:
+-dnl OK if all three tests terminate OK,
+-dnl 0.5 if the first test terminates OK but the second one loops endlessly,
+-dnl 0.0 if the first test already loops endlessly.
+diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
+deleted file mode 100644
+index 7e3b3df..0000000
+--- a/m4/uintmax_t.m4
++++ /dev/null
+@@ -1,30 +0,0 @@
+-# uintmax_t.m4 serial 12
+-dnl Copyright (C) 1997-2004, 2007-2017 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_PREREQ([2.13])
+-
+-# Define uintmax_t to 'unsigned long' or 'unsigned long long'
+-# if it is not already defined in <stdint.h> or <inttypes.h>.
+-
+-AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
+-[
+- AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+- AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+- if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
+- AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+- test $ac_cv_type_unsigned_long_long_int = yes \
+- && ac_type='unsigned long long' \
+- || ac_type='unsigned long'
+- AC_DEFINE_UNQUOTED([uintmax_t], [$ac_type],
+- [Define to unsigned long or unsigned long long
+- if <stdint.h> and <inttypes.h> don't define.])
+- else
+- AC_DEFINE([HAVE_UINTMAX_T], [1],
+- [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
+- fi
+-])
+diff --git a/m4/visibility.m4 b/m4/visibility.m4
+deleted file mode 100644
+index ce00e72..0000000
+--- a/m4/visibility.m4
++++ /dev/null
+@@ -1,77 +0,0 @@
+-# visibility.m4 serial 5 (gettext-0.18.2)
+-dnl Copyright (C) 2005, 2008, 2010-2017 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.
+-
+-dnl Tests whether the compiler supports the command-line option
+-dnl -fvisibility=hidden and the function and variable attributes
+-dnl __attribute__((__visibility__("hidden"))) and
+-dnl __attribute__((__visibility__("default"))).
+-dnl Does *not* test for __visibility__("protected") - which has tricky
+-dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
+-dnl Mac OS X.
+-dnl Does *not* test for __visibility__("internal") - which has processor
+-dnl dependent semantics.
+-dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
+-dnl "really only recommended for legacy code".
+-dnl Set the variable CFLAG_VISIBILITY.
+-dnl Defines and sets the variable HAVE_VISIBILITY.
+-
+-AC_DEFUN([gl_VISIBILITY],
+-[
+- AC_REQUIRE([AC_PROG_CC])
+- CFLAG_VISIBILITY=
+- HAVE_VISIBILITY=0
+- if test -n "$GCC"; then
+- dnl First, check whether -Werror can be added to the command line, or
+- dnl whether it leads to an error because of some other option that the
+- dnl user has put into $CC $CFLAGS $CPPFLAGS.
+- AC_MSG_CHECKING([whether the -Werror option is usable])
+- AC_CACHE_VAL([gl_cv_cc_vis_werror], [
+- gl_save_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -Werror"
+- AC_COMPILE_IFELSE(
+- [AC_LANG_PROGRAM([[]], [[]])],
+- [gl_cv_cc_vis_werror=yes],
+- [gl_cv_cc_vis_werror=no])
+- CFLAGS="$gl_save_CFLAGS"])
+- AC_MSG_RESULT([$gl_cv_cc_vis_werror])
+- dnl Now check whether visibility declarations are supported.
+- AC_MSG_CHECKING([for simple visibility declarations])
+- AC_CACHE_VAL([gl_cv_cc_visibility], [
+- gl_save_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -fvisibility=hidden"
+- dnl We use the option -Werror and a function dummyfunc, because on some
+- dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
+- dnl "visibility attribute not supported in this configuration; ignored"
+- dnl at the first function definition in every compilation unit, and we
+- dnl don't want to use the option in this case.
+- if test $gl_cv_cc_vis_werror = yes; then
+- CFLAGS="$CFLAGS -Werror"
+- fi
+- AC_COMPILE_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+- extern __attribute__((__visibility__("default"))) int exportedvar;
+- extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+- extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+- void dummyfunc (void) {}
+- ]],
+- [[]])],
+- [gl_cv_cc_visibility=yes],
+- [gl_cv_cc_visibility=no])
+- CFLAGS="$gl_save_CFLAGS"])
+- AC_MSG_RESULT([$gl_cv_cc_visibility])
+- if test $gl_cv_cc_visibility = yes; then
+- CFLAG_VISIBILITY="-fvisibility=hidden"
+- HAVE_VISIBILITY=1
+- fi
+- fi
+- AC_SUBST([CFLAG_VISIBILITY])
+- AC_SUBST([HAVE_VISIBILITY])
+- AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
+- [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
+-])
+diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
+deleted file mode 100644
+index 11783d2..0000000
+--- a/m4/wchar_t.m4
++++ /dev/null
+@@ -1,24 +0,0 @@
+-# wchar_t.m4 serial 4 (gettext-0.18.2)
+-dnl Copyright (C) 2002-2003, 2008-2017 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.
+-dnl Test whether <stddef.h> has the 'wchar_t' type.
+-dnl Prerequisite: AC_PROG_CC
+-
+-AC_DEFUN([gt_TYPE_WCHAR_T],
+-[
+- AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+- [AC_COMPILE_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[#include <stddef.h>
+- wchar_t foo = (wchar_t)'\0';]],
+- [[]])],
+- [gt_cv_c_wchar_t=yes],
+- [gt_cv_c_wchar_t=no])])
+- if test $gt_cv_c_wchar_t = yes; then
+- AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
+- fi
+-])
+diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
+deleted file mode 100644
+index 6f0ac84..0000000
+--- a/m4/wint_t.m4
++++ /dev/null
+@@ -1,74 +0,0 @@
+-# wint_t.m4 serial 6
+-dnl Copyright (C) 2003, 2007-2017 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.
+-dnl Test whether <wchar.h> has the 'wint_t' type and whether gnulib's
+-dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
+-dnl Prerequisite: AC_PROG_CC
+-
+-AC_DEFUN([gt_TYPE_WINT_T],
+-[
+- AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
+- [AC_COMPILE_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[
+-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+- <wchar.h>.
+- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+- before <wchar.h>. */
+-#include <stddef.h>
+-#include <stdio.h>
+-#include <time.h>
+-#include <wchar.h>
+- wint_t foo = (wchar_t)'\0';]],
+- [[]])],
+- [gt_cv_c_wint_t=yes],
+- [gt_cv_c_wint_t=no])])
+- if test $gt_cv_c_wint_t = yes; then
+- AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
+-
+- dnl Determine whether gnulib's <wchar.h> or <wctype.h> would, if present,
+- dnl override 'wint_t'.
+- AC_CACHE_CHECK([whether wint_t is too small],
+- [gl_cv_type_wint_t_too_small],
+- [AC_COMPILE_IFELSE(
+- [AC_LANG_PROGRAM([[
+-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+- <wchar.h>.
+- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+- included before <wchar.h>. */
+-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+-# include <stddef.h>
+-# include <stdio.h>
+-# include <time.h>
+-#endif
+-#include <wchar.h>
+- int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1];
+- ]])],
+- [gl_cv_type_wint_t_too_small=no],
+- [gl_cv_type_wint_t_too_small=yes])])
+- if test $gl_cv_type_wint_t_too_small = yes; then
+- GNULIB_OVERRIDES_WINT_T=1
+- else
+- GNULIB_OVERRIDES_WINT_T=0
+- fi
+- else
+- GNULIB_OVERRIDES_WINT_T=0
+- fi
+- AC_SUBST([GNULIB_OVERRIDES_WINT_T])
+-])
+-
+-dnl Prerequisites of the 'wint_t' override.
+-AC_DEFUN([gl_TYPE_WINT_T_PREREQ],
+-[
+- AC_CHECK_HEADERS_ONCE([crtdefs.h])
+- if test $ac_cv_header_crtdefs_h = yes; then
+- HAVE_CRTDEFS_H=1
+- else
+- HAVE_CRTDEFS_H=0
+- fi
+- AC_SUBST([HAVE_CRTDEFS_H])
+-])
+diff --git a/m4/xsize.m4 b/m4/xsize.m4
+deleted file mode 100644
+index 5f85057..0000000
+--- a/m4/xsize.m4
++++ /dev/null
+@@ -1,12 +0,0 @@
+-# xsize.m4 serial 5
+-dnl Copyright (C) 2003-2004, 2008-2017 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_XSIZE],
+-[
+- dnl Prerequisites of lib/xsize.h.
+- AC_REQUIRE([gl_SIZE_MAX])
+- AC_CHECK_HEADERS([stdint.h])
+-])
diff --git a/sys-devel/gettext/gettext-0.3.2-r3.ebuild b/sys-devel/gettext/gettext-0.3.2-r3.ebuild
@@ -1,59 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Stub and/or lightweight replacements of the GNU gettext suite"
-HOMEPAGE="https://github.com/sabotage-linux/gettext-tiny"
-SRC_URI="https://github.com/sabotage-linux/gettext-tiny/archive/refs/tags/v${PV}.tar.gz -> gettext-tiny-${PV}.tar.gz"
-S="${WORKDIR}/gettext-tiny-${PV}/"
-
-LICENSE="MIT"
-SLOT="tiny"
-KEYWORDS="~amd64"
-IUSE="shim"
-
-RDEPEND="!sys-devel/gettext:0"
-
-PATCHES=(
- "${FILESDIR}"/gettext-0.3.2-respect-CFLAGS.patch
- "${FILESDIR}"/gettext-0.3.2-xgettext-version-output.patch
- "${FILESDIR}"/gettext-0.3.2-autopoint-parenthesis.patch
-)
-
-DOCS=( README.md docs )
-
-src_prepare() {
- default
-
- # Needs to be set early, otherwise scripts like autopoint have a wrong prefix value
- sed -i "s;^prefix=.*;prefix=${EPREFIX}/usr;" Makefile || die
-
- multilib_copy_sources
-}
-
-multilib_src_compile() {
- tc-export AR RANLIB CC
-
- emake
-}
-
-multilib_src_install() {
- local libintl_type
-
- if use shim ; then
- if use elibc_musl ; then
- libintl_type=MUSL
- else
- libintl_type=NOOP
- fi
- else
- # If they don't want the shim (e.g. glibc users who have their own libintl),
- # don't install a libintl and just install the binaries.
- libintl_type=NONE
- fi
-
- emake LIBINTL="${libintl_type}" DESTDIR="${D}" libdir="${EPREFIX}/usr/$(get_libdir)" install
-}
diff --git a/sys-devel/gettext/gettext-0.3.2-r4.ebuild b/sys-devel/gettext/gettext-0.3.2-r4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Stub and/or lightweight replacements of the GNU gettext suite"
+HOMEPAGE="https://github.com/sabotage-linux/gettext-tiny"
+SRC_URI="https://github.com/sabotage-linux/gettext-tiny/archive/refs/tags/v${PV}.tar.gz -> gettext-tiny-${PV}.tar.gz"
+S="${WORKDIR}/gettext-tiny-${PV}/"
+
+LICENSE="MIT"
+SLOT="tiny"
+KEYWORDS="~amd64"
+IUSE="shim"
+
+RDEPEND="!sys-devel/gettext:0"
+
+PATCHES=(
+ "${FILESDIR}"/gettext-0.3.2-respect-CFLAGS.patch
+ "${FILESDIR}"/gettext-0.3.2-xgettext-version-output.patch
+ "${FILESDIR}"/gettext-0.3.2-autopoint-parenthesis.patch
+ "${FILESDIR}"/gettext-0.3.2-m4_cleanup.patch
+)
+
+DOCS=( README.md docs )
+
+src_prepare() {
+ default
+
+ # Needs to be set early, otherwise scripts like autopoint have a wrong prefix value
+ sed -i "s;^prefix=.*;prefix=${EPREFIX}/usr;" Makefile || die
+
+ multilib_copy_sources
+}
+
+multilib_src_compile() {
+ tc-export AR RANLIB CC
+
+ emake
+}
+
+multilib_src_install() {
+ local libintl_type
+
+ if use shim ; then
+ if use elibc_musl ; then
+ libintl_type=MUSL
+ else
+ libintl_type=NOOP
+ fi
+ else
+ # If they don't want the shim (e.g. glibc users who have their own libintl),
+ # don't install a libintl and just install the binaries.
+ libintl_type=NONE
+ fi
+
+ emake LIBINTL="${libintl_type}" DESTDIR="${D}" libdir="${EPREFIX}/usr/$(get_libdir)" install
+}
