[graphics/krita] 3rdparty/ext_gettext: 3rdparty: use GNU diff to patch gettext
L. E. Segovia
null at kde.org
Thu Mar 25 23:00:36 GMT 2021
Git commit c0848428c8c3a10bc16e98ce5ea3920da7313697 by L. E. Segovia.
Committed on 25/03/2021 at 22:58.
Pushed by lsegovia into branch 'master'.
3rdparty: use GNU diff to patch gettext
This fixes compilation on macOS with APFS filesystems.
This reverts commit 77137ccc68b2e4af9575e47051faab6179f27aad.
CCMAIL: kimageshop at kde.org
A +3303 -0 3rdparty/ext_gettext/0001-Fix-libgettextpo-linking-on-macOS.patch
D +0 -1940 3rdparty/ext_gettext/0005-Fix-libgettextpo-linking-on-macOS.patch
M +2 -2 3rdparty/ext_gettext/CMakeLists.txt
https://invent.kde.org/graphics/krita/commit/c0848428c8c3a10bc16e98ce5ea3920da7313697
diff --git a/3rdparty/ext_gettext/0001-Fix-libgettextpo-linking-on-macOS.patch b/3rdparty/ext_gettext/0001-Fix-libgettextpo-linking-on-macOS.patch
new file mode 100644
index 0000000000..7202849243
--- /dev/null
+++ b/3rdparty/ext_gettext/0001-Fix-libgettextpo-linking-on-macOS.patch
@@ -0,0 +1,3303 @@
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/Makefile.in gettext-0.21/Makefile.in
+--- gettext-0.21.orig/Makefile.in 2020-07-26 21:05:10.000000000 +0000
++++ gettext-0.21/Makefile.in 2021-03-25 21:41:54.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -207,6 +207,8 @@
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ DIST_TARGETS = dist-gzip
++# Exists only to be overridden by the user if desired.
++AM_DISTCHECK_DVI_TARGET = dvi
+ distuninstallcheck_listfiles = find . -type f -print
+ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+@@ -650,7 +652,7 @@
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=../.. --prefix="$$dc_install_base" \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+- && $(MAKE) $(AM_MAKEFLAGS) dvi \
++ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+@@ -709,7 +711,8 @@
+ installdirs-am:
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
+-install-exec: install-exec-recursive
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive
+ install-data: install-data-recursive
+ uninstall: uninstall-recursive
+
+@@ -813,7 +816,7 @@
+ uninstall-am:
+
+ .MAKE: $(am__recursive_targets) all check install install-am \
+- install-strip
++ install-exec install-strip
+
+ .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am clean clean-cscope clean-generic \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/aclocal.m4 gettext-0.21/aclocal.m4
+--- gettext-0.21.orig/aclocal.m4 2020-04-11 10:02:47.000000000 +0000
++++ gettext-0.21/aclocal.m4 2021-03-25 21:41:49.000000000 +0000
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
++# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
+
+ # Copyright (C) 1996-2020 Free Software Foundation, Inc.
+
+@@ -35,7 +35,7 @@
+ [am__api_version='1.16'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.16.2], [],
++m4_if([$1], [1.16.3], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -51,7 +51,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.16.2])dnl
++[AM_AUTOMAKE_VERSION([1.16.3])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+@@ -387,12 +387,7 @@
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/build-aux/config.guess gettext-0.21/build-aux/config.guess
+--- gettext-0.21.orig/build-aux/config.guess 2020-07-26 15:30:31.000000000 +0000
++++ gettext-0.21/build-aux/config.guess 2021-03-25 21:40:58.000000000 +0000
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-# Copyright 1992-2020 Free Software Foundation, Inc.
++# Copyright 1992-2021 Free Software Foundation, Inc.
+
+-timestamp='2020-07-12'
++timestamp='2021-01-25'
+
+ # 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
+@@ -27,12 +27,12 @@
+ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+ #
+ # You can get the latest version of this script from:
+-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
++# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
+ #
+ # Please send patches to <config-patches at gnu.org>.
+
+
+-me=`echo "$0" | sed -e 's,.*/,,'`
++me=$(echo "$0" | sed -e 's,.*/,,')
+
+ usage="\
+ Usage: $0 [OPTION]
+@@ -50,7 +50,7 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright 1992-2020 Free Software Foundation, Inc.
++Copyright 1992-2021 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -103,7 +103,7 @@
+ test "$tmp" && return 0
+ : "${TMPDIR=/tmp}"
+ # shellcheck disable=SC2039
+- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null) && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+@@ -131,16 +131,14 @@
+ PATH=$PATH:/.attbin ; export PATH
+ fi
+
+-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
++UNAME_MACHINE=$( (uname -m) 2>/dev/null) || UNAME_MACHINE=unknown
++UNAME_RELEASE=$( (uname -r) 2>/dev/null) || UNAME_RELEASE=unknown
++UNAME_SYSTEM=$( (uname -s) 2>/dev/null) || UNAME_SYSTEM=unknown
++UNAME_VERSION=$( (uname -v) 2>/dev/null) || UNAME_VERSION=unknown
+
+ case "$UNAME_SYSTEM" in
+ Linux|GNU|GNU/*)
+- # If the system lacks a compiler, then just pick glibc.
+- # We could probably try harder.
+- LIBC=gnu
++ LIBC=unknown
+
+ set_cc_for_build
+ cat <<-EOF > "$dummy.c"
+@@ -149,17 +147,29 @@
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+- #else
++ #elif defined(__GLIBC__)
+ LIBC=gnu
++ #else
++ #include <stdarg.h>
++ /* First heuristic to detect musl libc. */
++ #ifdef __DEFINED_va_list
++ LIBC=musl
++ #endif
+ #endif
+ EOF
+- eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
++ eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g')"
+
+- # If ldd exists, use it to detect musl libc.
+- if command -v ldd >/dev/null && \
+- ldd --version 2>&1 | grep -q ^musl
+- then
+- LIBC=musl
++ # Second heuristic to detect musl libc.
++ if [ "$LIBC" = unknown ] &&
++ command -v ldd >/dev/null &&
++ ldd --version 2>&1 | grep -q ^musl; then
++ LIBC=musl
++ fi
++
++ # If the system lacks a compiler, then just pick glibc.
++ # We could probably try harder.
++ if [ "$LIBC" = unknown ]; then
++ LIBC=gnu
+ fi
+ ;;
+ esac
+@@ -178,20 +188,20 @@
+ #
+ # Note: NetBSD doesn't particularly care about the vendor
+ # portion of the name. We always set it to "unknown".
+- sysctl="sysctl -n hw.machine_arch"
+- UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+- "/sbin/$sysctl" 2>/dev/null || \
+- "/usr/sbin/$sysctl" 2>/dev/null || \
+- echo unknown)`
++ UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null || \
++ /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
++ /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
++ echo unknown))
+ case "$UNAME_MACHINE_ARCH" in
++ aarch64eb) machine=aarch64_be-unknown ;;
+ armeb) machine=armeb-unknown ;;
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
+ earmv*)
+- arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+- endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
++ arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,')
++ endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p')
+ machine="${arch}${endian}"-unknown
+ ;;
+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+@@ -222,7 +232,7 @@
+ case "$UNAME_MACHINE_ARCH" in
+ earm*)
+ expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+- abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
++ abi=$(echo "$UNAME_MACHINE_ARCH" | sed -e "$expr")
+ ;;
+ esac
+ # The OS release
+@@ -235,7 +245,7 @@
+ release='-gnu'
+ ;;
+ *)
+- release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
++ release=$(echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2)
+ ;;
+ esac
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+@@ -244,15 +254,15 @@
+ echo "$machine-${os}${release}${abi-}"
+ exit ;;
+ *:Bitrig:*:*)
+- UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++ UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//')
+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
+ exit ;;
+ *:OpenBSD:*:*)
+- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
++ UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//')
+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+ exit ;;
+ *:LibertyBSD:*:*)
+- UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
++ UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//')
+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+ exit ;;
+ *:MidnightBSD:*:*)
+@@ -288,17 +298,17 @@
+ alpha:OSF1:*:*)
+ case $UNAME_RELEASE in
+ *4.0)
+- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
++ UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $3}')
+ ;;
+ *5.*)
+- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++ UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $4}')
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+- ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
++ ALPHA_CPU_TYPE=$(/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1)
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+ UNAME_MACHINE=alpha ;;
+@@ -336,7 +346,7 @@
+ # A Tn.n version is a released field test version.
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+- echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
++ echo "$UNAME_MACHINE"-dec-osf"$(echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)"
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+@@ -370,7 +380,7 @@
+ exit ;;
+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+- if test "`(/bin/universe) 2>/dev/null`" = att ; then
++ if test "$( (/bin/universe) 2>/dev/null)" = att ; then
+ echo pyramid-pyramid-sysv3
+ else
+ echo pyramid-pyramid-bsd
+@@ -383,17 +393,17 @@
+ echo sparc-icl-nx6
+ exit ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+- case `/usr/bin/uname -p` in
++ case $(/usr/bin/uname -p) in
+ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
+ s390x:SunOS:*:*)
+- echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
++ echo "$UNAME_MACHINE"-ibm-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')"
+ exit ;;
+ sun4H:SunOS:5.*:*)
+- echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
++ echo sparc-hal-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
+ exit ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+- echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
++ echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')"
+ exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux"$UNAME_RELEASE"
+@@ -404,7 +414,7 @@
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+- if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
++ if test "$CC_FOR_BUILD" != no_compiler_found; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+@@ -412,30 +422,30 @@
+ SUN_ARCH=x86_64
+ fi
+ fi
+- echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
++ echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
+ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+- echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
++ echo sparc-sun-solaris3"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
+ exit ;;
+ sun4*:SunOS:*:*)
+- case "`/usr/bin/arch -k`" in
++ case "$(/usr/bin/arch -k)" in
+ Series*|S4*)
+- UNAME_RELEASE=`uname -v`
++ UNAME_RELEASE=$(uname -v)
+ ;;
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+- echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
++ echo sparc-sun-sunos"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/')"
+ exit ;;
+ sun3*:SunOS:*:*)
+ echo m68k-sun-sunos"$UNAME_RELEASE"
+ exit ;;
+ sun*:*:4.2BSD:*)
+- UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
++ UNAME_RELEASE=$( (sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null)
+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+- case "`/bin/arch`" in
++ case "$(/bin/arch)" in
+ sun3)
+ echo m68k-sun-sunos"$UNAME_RELEASE"
+ ;;
+@@ -515,8 +525,8 @@
+ }
+ EOF
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+- dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+- SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
++ dummyarg=$(echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p') &&
++ SYSTEM_NAME=$("$dummy" "$dummyarg") &&
+ { echo "$SYSTEM_NAME"; exit; }
+ echo mips-mips-riscos"$UNAME_RELEASE"
+ exit ;;
+@@ -543,11 +553,11 @@
+ exit ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+- UNAME_PROCESSOR=`/usr/bin/uname -p`
+- if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
++ UNAME_PROCESSOR=$(/usr/bin/uname -p)
++ if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
+ then
+- if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
+- [ "$TARGET_BINARY_INTERFACE"x = x ]
++ if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
++ test "$TARGET_BINARY_INTERFACE"x = x
+ then
+ echo m88k-dg-dgux"$UNAME_RELEASE"
+ else
+@@ -571,17 +581,17 @@
+ echo m68k-tektronix-bsd
+ exit ;;
+ *:IRIX*:*:*)
+- echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
++ echo mips-sgi-irix"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/g')"
+ exit ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
++ exit ;; # Note that: echo "'$(uname -s)'" gives 'AIX '
+ i*86:AIX:*:*)
+ echo i386-ibm-aix
+ exit ;;
+ ia64:AIX:*:*)
+- if [ -x /usr/bin/oslevel ] ; then
+- IBM_REV=`/usr/bin/oslevel`
++ if test -x /usr/bin/oslevel ; then
++ IBM_REV=$(/usr/bin/oslevel)
+ else
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ fi
+@@ -601,7 +611,7 @@
+ exit(0);
+ }
+ EOF
+- if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
++ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy")
+ then
+ echo "$SYSTEM_NAME"
+ else
+@@ -614,15 +624,15 @@
+ fi
+ exit ;;
+ *:AIX:*:[4567])
+- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
++ IBM_CPU_ID=$(/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }')
+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+- if [ -x /usr/bin/lslpp ] ; then
+- IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+- awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
++ if test -x /usr/bin/lslpp ; then
++ IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc |
++ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/)
+ else
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ fi
+@@ -650,14 +660,14 @@
+ echo m68k-hp-bsd4.4
+ exit ;;
+ 9000/[34678]??:HP-UX:*:*)
+- HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++ HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//')
+ case "$UNAME_MACHINE" in
+ 9000/31?) HP_ARCH=m68000 ;;
+ 9000/[34]??) HP_ARCH=m68k ;;
+ 9000/[678][0-9][0-9])
+- if [ -x /usr/bin/getconf ]; then
+- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++ if test -x /usr/bin/getconf; then
++ sc_cpu_version=$(/usr/bin/getconf SC_CPU_VERSION 2>/dev/null)
++ sc_kernel_bits=$(/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null)
+ case "$sc_cpu_version" in
+ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+@@ -669,7 +679,7 @@
+ esac ;;
+ esac
+ fi
+- if [ "$HP_ARCH" = "" ]; then
++ if test "$HP_ARCH" = ""; then
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
+
+@@ -704,11 +714,11 @@
+ exit (0);
+ }
+ EOF
+- (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
++ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=$("$dummy")
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+ fi ;;
+ esac
+- if [ "$HP_ARCH" = hppa2.0w ]
++ if test "$HP_ARCH" = hppa2.0w
+ then
+ set_cc_for_build
+
+@@ -732,7 +742,7 @@
+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+ exit ;;
+ ia64:HP-UX:*:*)
+- HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++ HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//')
+ echo ia64-hp-hpux"$HPUX_REV"
+ exit ;;
+ 3050*:HI-UX:*:*)
+@@ -762,7 +772,7 @@
+ exit (0);
+ }
+ EOF
+- $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
++ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") &&
+ { echo "$SYSTEM_NAME"; exit; }
+ echo unknown-hitachi-hiuxwe2
+ exit ;;
+@@ -782,7 +792,7 @@
+ echo hppa1.0-hp-osf
+ exit ;;
+ i*86:OSF1:*:*)
+- if [ -x /usr/sbin/sysversion ] ; then
++ if test -x /usr/sbin/sysversion ; then
+ echo "$UNAME_MACHINE"-unknown-osf1mk
+ else
+ echo "$UNAME_MACHINE"-unknown-osf1
+@@ -831,14 +841,14 @@
+ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+- FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+- FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+- FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
++ FUJITSU_PROC=$(uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)
++ FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///')
++ FUJITSU_REL=$(echo "$UNAME_RELEASE" | sed -e 's/ /_/')
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+- FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+- FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
++ FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///')
++ FUJITSU_REL=$(echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/')
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+@@ -851,25 +861,25 @@
+ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+ exit ;;
+ arm:FreeBSD:*:*)
+- UNAME_PROCESSOR=`uname -p`
++ UNAME_PROCESSOR=$(uname -p)
+ set_cc_for_build
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+- echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
++ echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi
+ else
+- echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
++ echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf
+ fi
+ exit ;;
+ *:FreeBSD:*:*)
+- UNAME_PROCESSOR=`/usr/bin/uname -p`
++ UNAME_PROCESSOR=$(/usr/bin/uname -p)
+ case "$UNAME_PROCESSOR" in
+ amd64)
+ UNAME_PROCESSOR=x86_64 ;;
+ i386)
+ UNAME_PROCESSOR=i586 ;;
+ esac
+- echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
++ echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
+ exit ;;
+ i*:CYGWIN*:*)
+ echo "$UNAME_MACHINE"-pc-cygwin
+@@ -905,15 +915,15 @@
+ echo x86_64-pc-cygwin
+ exit ;;
+ prep*:SunOS:5.*:*)
+- echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
++ echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
+ exit ;;
+ *:GNU:*:*)
+ # the GNU system
+- echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
++ echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')"
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+- echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
++ echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC"
+ exit ;;
+ *:Minix:*:*)
+ echo "$UNAME_MACHINE"-unknown-minix
+@@ -926,7 +936,7 @@
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
++ case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+@@ -985,6 +995,9 @@
+ k1om:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
++ loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++ exit ;;
+ m32r*:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+@@ -1035,7 +1048,7 @@
+ #endif
+ #endif
+ EOF
+- eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`"
++ eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')"
+ test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
+ ;;
+ mips64el:Linux:*:*)
+@@ -1055,7 +1068,7 @@
+ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++ case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2) in
+ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+ *) echo hppa-unknown-linux-"$LIBC" ;;
+@@ -1073,7 +1086,7 @@
+ ppcle:Linux:*:*)
+ echo powerpcle-unknown-linux-"$LIBC"
+ exit ;;
+- riscv32:Linux:*:* | riscv64:Linux:*:*)
++ riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+@@ -1097,7 +1110,7 @@
+ x86_64:Linux:*:*)
+ set_cc_for_build
+ LIBCABI=$LIBC
+- if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
++ if test "$CC_FOR_BUILD" != no_compiler_found; then
+ if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_X32 >/dev/null
+@@ -1145,7 +1158,7 @@
+ echo "$UNAME_MACHINE"-pc-msdosdjgpp
+ exit ;;
+ i*86:*:4.*:*)
+- UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
++ UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//')
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+ else
+@@ -1154,7 +1167,7 @@
+ exit ;;
+ i*86:*:5:[678]*)
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
+- case `/bin/uname -X | grep "^Machine"` in
++ case $(/bin/uname -X | grep "^Machine") in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+@@ -1163,10 +1176,10 @@
+ exit ;;
+ i*86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
++ UNAME_REL=$(sed -n 's/.*Version //p' </usr/options/cb.name)
+ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
+- UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
++ UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //'))
+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+@@ -1216,7 +1229,7 @@
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++ && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+@@ -1227,7 +1240,7 @@
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
+- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++ && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+@@ -1260,7 +1273,7 @@
+ exit ;;
+ *:SINIX-*:*:*)
+ if uname -p 2>/dev/null >/dev/null ; then
+- UNAME_MACHINE=`(uname -p) 2>/dev/null`
++ UNAME_MACHINE=$( (uname -p) 2>/dev/null)
+ echo "$UNAME_MACHINE"-sni-sysv4
+ else
+ echo ns32k-sni-sysv
+@@ -1294,7 +1307,7 @@
+ echo mips-sony-newsos6
+ exit ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+- if [ -d /usr/nec ]; then
++ if test -d /usr/nec; then
+ echo mips-nec-sysv"$UNAME_RELEASE"
+ else
+ echo mips-unknown-sysv"$UNAME_RELEASE"
+@@ -1346,7 +1359,7 @@
+ echo aarch64-apple-darwin"$UNAME_RELEASE"
+ exit ;;
+ *:Darwin:*:*)
+- UNAME_PROCESSOR=`uname -p`
++ UNAME_PROCESSOR=$(uname -p)
+ case $UNAME_PROCESSOR in
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+@@ -1359,7 +1372,7 @@
+ else
+ set_cc_for_build
+ fi
+- if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
++ if test "$CC_FOR_BUILD" != no_compiler_found; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+@@ -1383,7 +1396,7 @@
+ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
+ exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+- UNAME_PROCESSOR=`uname -p`
++ UNAME_PROCESSOR=$(uname -p)
+ if test "$UNAME_PROCESSOR" = x86; then
+ UNAME_PROCESSOR=i386
+ UNAME_MACHINE=pc
+@@ -1451,10 +1464,10 @@
+ echo mips-sei-seiux"$UNAME_RELEASE"
+ exit ;;
+ *:DragonFly:*:*)
+- echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
++ echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
+ exit ;;
+ *:*VMS:*:*)
+- UNAME_MACHINE=`(uname -p) 2>/dev/null`
++ UNAME_MACHINE=$( (uname -p) 2>/dev/null)
+ case "$UNAME_MACHINE" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+@@ -1464,13 +1477,13 @@
+ echo i386-pc-xenix
+ exit ;;
+ i*86:skyos:*:*)
+- echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
++ echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')"
+ exit ;;
+ i*86:rdos:*:*)
+ echo "$UNAME_MACHINE"-pc-rdos
+ exit ;;
+- i*86:AROS:*:*)
+- echo "$UNAME_MACHINE"-pc-aros
++ *:AROS:*:*)
++ echo "$UNAME_MACHINE"-unknown-aros
+ exit ;;
+ x86_64:VMkernel:*:*)
+ echo "$UNAME_MACHINE"-unknown-esx
+@@ -1522,7 +1535,7 @@
+ #define __ARCHITECTURE__ "m68k"
+ #endif
+ int version;
+- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
++ version=$( (hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null);
+ if (version < 4)
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+ else
+@@ -1614,7 +1627,7 @@
+ }
+ EOF
+
+-$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` &&
++$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=$($dummy) &&
+ { echo "$SYSTEM_NAME"; exit; }
+
+ # Apollos put the system type in the environment.
+@@ -1639,14 +1652,14 @@
+ operating system you are using. If your script is old, overwrite *all*
+ copies of config.guess and config.sub with the latest versions from:
+
+- https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
++ https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
+ and
+- https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
++ https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+ EOF
+
+-year=`echo $timestamp | sed 's,-.*,,'`
++year=$(echo $timestamp | sed 's,-.*,,')
+ # shellcheck disable=SC2003
+-if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then
++if test "$(expr "$(date +%Y)" - "$year")" -lt 3 ; then
+ cat >&2 <<EOF
+
+ If $0 has already been updated, send the following data and any
+@@ -1655,20 +1668,20 @@
+
+ config.guess timestamp = $timestamp
+
+-uname -m = `(uname -m) 2>/dev/null || echo unknown`
+-uname -r = `(uname -r) 2>/dev/null || echo unknown`
+-uname -s = `(uname -s) 2>/dev/null || echo unknown`
+-uname -v = `(uname -v) 2>/dev/null || echo unknown`
+-
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+-/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
+-
+-hostinfo = `(hostinfo) 2>/dev/null`
+-/bin/universe = `(/bin/universe) 2>/dev/null`
+-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
+-/bin/arch = `(/bin/arch) 2>/dev/null`
+-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
++uname -m = $( (uname -m) 2>/dev/null || echo unknown)
++uname -r = $( (uname -r) 2>/dev/null || echo unknown)
++uname -s = $( (uname -s) 2>/dev/null || echo unknown)
++uname -v = $( (uname -v) 2>/dev/null || echo unknown)
++
++/usr/bin/uname -p = $( (/usr/bin/uname -p) 2>/dev/null)
++/bin/uname -X = $( (/bin/uname -X) 2>/dev/null)
++
++hostinfo = $( (hostinfo) 2>/dev/null)
++/bin/universe = $( (/bin/universe) 2>/dev/null)
++/usr/bin/arch -k = $( (/usr/bin/arch -k) 2>/dev/null)
++/bin/arch = $( (/bin/arch) 2>/dev/null)
++/usr/bin/oslevel = $( (/usr/bin/oslevel) 2>/dev/null)
++/usr/convex/getsysinfo = $( (/usr/convex/getsysinfo) 2>/dev/null)
+
+ UNAME_MACHINE = "$UNAME_MACHINE"
+ UNAME_RELEASE = "$UNAME_RELEASE"
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/build-aux/config.sub gettext-0.21/build-aux/config.sub
+--- gettext-0.21.orig/build-aux/config.sub 2020-07-17 20:25:52.000000000 +0000
++++ gettext-0.21/build-aux/config.sub 2021-03-25 21:40:59.000000000 +0000
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-# Copyright 1992-2020 Free Software Foundation, Inc.
++# Copyright 1992-2021 Free Software Foundation, Inc.
+
+-timestamp='2020-07-10'
++timestamp='2021-03-10'
+
+ # 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
+@@ -33,7 +33,7 @@
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
+ # You can get the latest version of this script from:
+-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
++# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+@@ -50,7 +50,7 @@
+ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # It is wrong to echo any other type of specification.
+
+-me=`echo "$0" | sed -e 's,.*/,,'`
++me=$(echo "$0" | sed -e 's,.*/,,')
+
+ usage="\
+ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+@@ -67,7 +67,7 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright 1992-2020 Free Software Foundation, Inc.
++Copyright 1992-2021 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -769,22 +769,22 @@
+ vendor=hp
+ ;;
+ i*86v32)
+- cpu=`echo "$1" | sed -e 's/86.*/86/'`
++ cpu=$(echo "$1" | sed -e 's/86.*/86/')
+ vendor=pc
+ basic_os=sysv32
+ ;;
+ i*86v4*)
+- cpu=`echo "$1" | sed -e 's/86.*/86/'`
++ cpu=$(echo "$1" | sed -e 's/86.*/86/')
+ vendor=pc
+ basic_os=sysv4
+ ;;
+ i*86v)
+- cpu=`echo "$1" | sed -e 's/86.*/86/'`
++ cpu=$(echo "$1" | sed -e 's/86.*/86/')
+ vendor=pc
+ basic_os=sysv
+ ;;
+ i*86sol2)
+- cpu=`echo "$1" | sed -e 's/86.*/86/'`
++ cpu=$(echo "$1" | sed -e 's/86.*/86/')
+ vendor=pc
+ basic_os=solaris2
+ ;;
+@@ -917,7 +917,7 @@
+ ;;
+ leon-*|leon[3-9]-*)
+ cpu=sparc
+- vendor=`echo "$basic_machine" | sed 's/-.*//'`
++ vendor=$(echo "$basic_machine" | sed 's/-.*//')
+ ;;
+
+ *-*)
+@@ -1084,7 +1084,7 @@
+ cpu=mipsisa64sb1el
+ ;;
+ sh5e[lb]-*)
+- cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
++ cpu=$(echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/')
+ ;;
+ spur-*)
+ cpu=spur
+@@ -1102,7 +1102,7 @@
+ cpu=x86_64
+ ;;
+ xscale-* | xscalee[bl]-*)
+- cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
++ cpu=$(echo "$cpu" | sed 's/^xscale/arm/')
+ ;;
+ arm64-*)
+ cpu=aarch64
+@@ -1185,6 +1185,7 @@
+ | k1om \
+ | le32 | le64 \
+ | lm32 \
++ | loongarch32 | loongarch64 | loongarchx32 \
+ | m32c | m32r | m32rle \
+ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+@@ -1229,7 +1230,7 @@
+ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+ | pru \
+ | pyramid \
+- | riscv | riscv32 | riscv64 \
++ | riscv | riscv32 | riscv32be | riscv64 | riscv64be \
+ | rl78 | romp | rs6000 | rx \
+ | s390 | s390x \
+ | score \
+@@ -1241,6 +1242,7 @@
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+ | spu \
+ | tahoe \
++ | thumbv7* \
+ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+ | tron \
+ | ubicom32 \
+@@ -1278,7 +1280,7 @@
+
+ # Decode manufacturer-specific aliases for certain operating systems.
+
+-if [ x$basic_os != x ]
++if test x$basic_os != x
+ then
+
+ # First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
+@@ -1286,11 +1288,15 @@
+ case $basic_os in
+ gnu/linux*)
+ kernel=linux
+- os=`echo $basic_os | sed -e 's|gnu/linux|gnu|'`
++ os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|')
++ ;;
++ os2-emx)
++ kernel=os2
++ os=$(echo $basic_os | sed -e 's|os2-emx|emx|')
+ ;;
+ nto-qnx*)
+ kernel=nto
+- os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'`
++ os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|')
+ ;;
+ *-*)
+ # shellcheck disable=SC2162
+@@ -1301,11 +1307,11 @@
+ # Default OS when just kernel was specified
+ nto*)
+ kernel=nto
+- os=`echo $basic_os | sed -e 's|nto|qnx|'`
++ os=$(echo $basic_os | sed -e 's|nto|qnx|')
+ ;;
+ linux*)
+ kernel=linux
+- os=`echo $basic_os | sed -e 's|linux|gnu|'`
++ os=$(echo $basic_os | sed -e 's|linux|gnu|')
+ ;;
+ *)
+ kernel=
+@@ -1326,7 +1332,7 @@
+ os=cnk
+ ;;
+ solaris1 | solaris1.*)
+- os=`echo $os | sed -e 's|solaris1|sunos4|'`
++ os=$(echo $os | sed -e 's|solaris1|sunos4|')
+ ;;
+ solaris)
+ os=solaris2
+@@ -1355,7 +1361,7 @@
+ os=sco3.2v4
+ ;;
+ sco3.2.[4-9]*)
+- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
++ os=$(echo $os | sed -e 's/sco3.2./sco3.2v/')
+ ;;
+ sco*v* | scout)
+ # Don't match below
+@@ -1367,13 +1373,7 @@
+ os=psos
+ ;;
+ qnx*)
+- case $cpu in
+- x86 | i*86)
+- ;;
+- *)
+- os=nto-$os
+- ;;
+- esac
++ os=qnx
+ ;;
+ hiux*)
+ os=hiuxwe2
+@@ -1391,7 +1391,7 @@
+ os=lynxos
+ ;;
+ mac[0-9]*)
+- os=`echo "$os" | sed -e 's|mac|macos|'`
++ os=$(echo "$os" | sed -e 's|mac|macos|')
+ ;;
+ opened*)
+ os=openedition
+@@ -1400,10 +1400,10 @@
+ os=os400
+ ;;
+ sunos5*)
+- os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
++ os=$(echo "$os" | sed -e 's|sunos5|solaris2|')
+ ;;
+ sunos6*)
+- os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
++ os=$(echo "$os" | sed -e 's|sunos6|solaris3|')
+ ;;
+ wince*)
+ os=wince
+@@ -1437,7 +1437,7 @@
+ ;;
+ # Preserve the version number of sinix5.
+ sinix5.*)
+- os=`echo $os | sed -e 's|sinix|sysv|'`
++ os=$(echo $os | sed -e 's|sinix|sysv|')
+ ;;
+ sinix*)
+ os=sysv4
+@@ -1683,11 +1683,14 @@
+
+ # Now, validate our (potentially fixed-up) OS.
+ case $os in
+- # Sometimes we do "kernel-abi", so those need to count as OSes.
++ # Sometimes we do "kernel-libc", so those need to count as OSes.
+ musl* | newlib* | uclibc*)
+ ;;
+- # Likewise for "kernel-libc"
+- eabi | eabihf | gnueabi | gnueabihf)
++ # Likewise for "kernel-abi"
++ eabi* | gnueabi*)
++ ;;
++ # VxWorks passes extra cpu info in the 4th filed.
++ simlinux | simwindows | spe)
+ ;;
+ # Now accept the basic system types.
+ # The portable systems comes first.
+@@ -1709,7 +1712,7 @@
+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+ | udi* | lites* | ieee* | go32* | aux* | hcos* \
+- | chorusrdb* | cegcc* | glidix* \
++ | chorusrdb* | cegcc* | glidix* | serenity* \
+ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+ | midipix* | mingw32* | mingw64* | mint* \
+ | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+@@ -1722,7 +1725,7 @@
+ | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+- | nsk* | powerunix* | genode* | zvmoe* )
++ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*)
+ ;;
+ # This one is extra strict with allowed versions
+ sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
+@@ -1741,6 +1744,8 @@
+ case $kernel-$os in
+ linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* )
+ ;;
++ uclinux-uclibc* )
++ ;;
+ -dietlibc* | -newlib* | -musl* | -uclibc* )
+ # These are just libc implementations, not actual OSes, and thus
+ # require a kernel.
+@@ -1749,8 +1754,12 @@
+ ;;
+ kfreebsd*-gnu* | kopensolaris*-gnu*)
+ ;;
++ vxworks-simlinux | vxworks-simwindows | vxworks-spe)
++ ;;
+ nto-qnx*)
+ ;;
++ os2-emx)
++ ;;
+ *-eabi* | *-gnueabi*)
+ ;;
+ -*)
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/build-aux/install-sh gettext-0.21/build-aux/install-sh
+--- gettext-0.21.orig/build-aux/install-sh 2020-07-26 21:03:52.000000000 +0000
++++ gettext-0.21/build-aux/install-sh 2021-03-25 21:41:03.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+
+-scriptversion=2018-03-11.20; # UTC
++scriptversion=2020-11-14.01; # UTC
+
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -69,6 +69,11 @@
+ # Desired mode of installed file.
+ mode=0755
+
++# Create dirs (including intermediate dirs) using mode 755.
++# This is like GNU 'install' as of coreutils 8.32 (2020).
++mkdir_umask=22
++
++backupsuffix=
+ chgrpcmd=
+ chmodcmd=$chmodprog
+ chowncmd=
+@@ -99,18 +104,28 @@
+ --version display version info and exit.
+
+ -c (ignored)
+- -C install only if different (preserve the last data modification time)
++ -C install only if different (preserve data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
++ -p pass -p to $cpprog.
+ -s $stripprog installed files.
++ -S SUFFIX attempt to back up existing files, with suffix SUFFIX.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
+
+ Environment variables override the default commands:
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
++
++By default, rm is invoked with -f; when overridden with RMPROG,
++it's up to you to specify -f if you want it.
++
++If -S is not specified, no backups are attempted.
++
++Email bug reports to bug-automake at gnu.org.
++Automake home page: https://www.gnu.org/software/automake/
+ "
+
+ while test $# -ne 0; do
+@@ -137,8 +152,13 @@
+ -o) chowncmd="$chownprog $2"
+ shift;;
+
++ -p) cpprog="$cpprog -p";;
++
+ -s) stripcmd=$stripprog;;
+
++ -S) backupsuffix="$2"
++ shift;;
++
+ -t)
+ is_target_a_directory=always
+ dst_arg=$2
+@@ -255,6 +275,10 @@
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
++ # Don't chown directories that already exist.
++ if test $dstdir_status = 0; then
++ chowncmd=""
++ fi
+ else
+
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+@@ -301,22 +325,6 @@
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+- # Create intermediate dirs using mode 755 as modified by the umask.
+- # This is like FreeBSD 'install' as of 1997-10-28.
+- umask=`umask`
+- case $stripcmd.$umask in
+- # Optimize common cases.
+- *[2367][2367]) mkdir_umask=$umask;;
+- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+-
+- *[0-7])
+- mkdir_umask=`expr $umask + 22 \
+- - $umask % 100 % 40 + $umask % 20 \
+- - $umask % 10 % 4 + $umask % 2
+- `;;
+- *) mkdir_umask=$umask,go-w;;
+- esac
+-
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+@@ -326,52 +334,49 @@
+ fi
+
+ posix_mkdir=false
+- case $umask in
+- *[123567][0-7][0-7])
+- # POSIX mkdir -p sets u+wx bits regardless of umask, which
+- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+- ;;
+- *)
+- # Note that $RANDOM variable is not portable (e.g. dash); Use it
+- # here however when possible just to lower collision chance.
+- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+-
+- trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+-
+- # Because "mkdir -p" follows existing symlinks and we likely work
+- # directly in world-writeable /tmp, make sure that the '$tmpdir'
+- # directory is successfully created first before we actually test
+- # 'mkdir -p' feature.
+- if (umask $mkdir_umask &&
+- $mkdirprog $mkdir_mode "$tmpdir" &&
+- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+- then
+- if test -z "$dir_arg" || {
+- # Check for POSIX incompatibilities with -m.
+- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+- # other-writable bit of parent directory when it shouldn't.
+- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+- test_tmpdir="$tmpdir/a"
+- ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+- case $ls_ld_tmpdir in
+- d????-?r-*) different_mode=700;;
+- d????-?--*) different_mode=755;;
+- *) false;;
+- esac &&
+- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+- }
+- }
+- then posix_mkdir=:
+- fi
+- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+- else
+- # Remove any dirs left behind by ancient mkdir implementations.
+- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+- fi
+- trap '' 0;;
+- esac;;
++ # The $RANDOM variable is not portable (e.g., dash). Use it
++ # here however when possible just to lower collision chance.
++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++
++ trap '
++ ret=$?
++ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
++ exit $ret
++ ' 0
++
++ # Because "mkdir -p" follows existing symlinks and we likely work
++ # directly in world-writeable /tmp, make sure that the '$tmpdir'
++ # directory is successfully created first before we actually test
++ # 'mkdir -p'.
++ if (umask $mkdir_umask &&
++ $mkdirprog $mkdir_mode "$tmpdir" &&
++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
++ then
++ if test -z "$dir_arg" || {
++ # Check for POSIX incompatibilities with -m.
++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++ # other-writable bit of parent directory when it shouldn't.
++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++ test_tmpdir="$tmpdir/a"
++ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
++ case $ls_ld_tmpdir in
++ d????-?r-*) different_mode=700;;
++ d????-?--*) different_mode=755;;
++ *) false;;
++ esac &&
++ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
++ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++ }
++ }
++ then posix_mkdir=:
++ fi
++ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
++ else
++ # Remove any dirs left behind by ancient mkdir implementations.
++ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
++ fi
++ trap '' 0;;
+ esac
+
+ if
+@@ -382,7 +387,7 @@
+ then :
+ else
+
+- # The umask is ridiculous, or mkdir does not conform to POSIX,
++ # mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
+
+@@ -411,7 +416,7 @@
+ prefixes=
+ else
+ if $posix_mkdir; then
+- (umask=$mkdir_umask &&
++ (umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+@@ -488,6 +493,13 @@
+ then
+ rm -f "$dsttmp"
+ else
++ # If $backupsuffix is set, and the file being installed
++ # already exists, attempt a backup. Don't worry if it fails,
++ # e.g., if mv doesn't support -f.
++ if test -n "$backupsuffix" && test -f "$dst"; then
++ $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
++ fi
++
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+@@ -502,9 +514,9 @@
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+- $doit $rmcmd -f "$dst" 2>/dev/null ||
++ $doit $rmcmd "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
++ { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/build-aux/test-driver gettext-0.21/build-aux/test-driver
+--- gettext-0.21.orig/build-aux/test-driver 2020-07-26 21:03:59.000000000 +0000
++++ gettext-0.21/build-aux/test-driver 2021-03-25 21:41:12.000000000 +0000
+@@ -42,11 +42,13 @@
+ {
+ cat <<END
+ Usage:
+- test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+- [--expect-failure={yes|no}] [--color-tests={yes|no}]
+- [--enable-hard-errors={yes|no}] [--]
++ test-driver --test-name NAME --log-file PATH --trs-file PATH
++ [--expect-failure {yes|no}] [--color-tests {yes|no}]
++ [--enable-hard-errors {yes|no}] [--]
+ TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
++
+ The '--test-name', '--log-file' and '--trs-file' options are mandatory.
++See the GNU Automake documentation for information.
+ END
+ }
+
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/configure gettext-0.21/configure
+--- gettext-0.21.orig/configure 2020-07-26 20:58:55.000000000 +0000
++++ gettext-0.21/configure 2021-03-25 21:41:51.000000000 +0000
+@@ -2100,12 +2100,7 @@
+ am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/Makefile.in gettext-0.21/gettext-runtime/Makefile.in
+--- gettext-0.21.orig/gettext-runtime/Makefile.in 2020-07-26 21:03:58.000000000 +0000
++++ gettext-0.21/gettext-runtime/Makefile.in 2021-03-25 21:41:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -373,6 +373,8 @@
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ DIST_TARGETS = dist-gzip
++# Exists only to be overridden by the user if desired.
++AM_DISTCHECK_DVI_TARGET = dvi
+ distuninstallcheck_listfiles = find . -type f -print
+ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+@@ -1710,7 +1712,7 @@
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=../.. --prefix="$$dc_install_base" \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+- && $(MAKE) $(AM_MAKEFLAGS) dvi \
++ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/aclocal.m4 gettext-0.21/gettext-runtime/aclocal.m4
+--- gettext-0.21.orig/gettext-runtime/aclocal.m4 2020-07-26 15:47:15.000000000 +0000
++++ gettext-0.21/gettext-runtime/aclocal.m4 2021-03-25 21:41:06.000000000 +0000
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
++# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
+
+ # Copyright (C) 1996-2020 Free Software Foundation, Inc.
+
+@@ -35,7 +35,7 @@
+ [am__api_version='1.16'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.16.2], [],
++m4_if([$1], [1.16.3], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -51,7 +51,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.16.2])dnl
++[AM_AUTOMAKE_VERSION([1.16.3])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+@@ -703,12 +703,7 @@
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/configure gettext-0.21/gettext-runtime/configure
+--- gettext-0.21.orig/gettext-runtime/configure 2020-07-26 21:03:56.000000000 +0000
++++ gettext-0.21/gettext-runtime/configure 2021-03-25 21:41:08.000000000 +0000
+@@ -3797,12 +3797,7 @@
+ am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+@@ -6152,23 +6147,23 @@
+ if $JAVAC --version 2>/dev/null | sed -e 1q | grep gcj > /dev/null; then
+ if $JAVAC --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
+ rm -f conftest.class
+- if { echo "$as_me:6155: $JAVAC -d . conftest.java" >&5
++ if { echo "$as_me:6150: $JAVAC -d . conftest.java" >&5
+ $JAVAC -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:6162: $JAVAC -fsource=$source_version -d . conftest.java" >&5
++ if { echo "$as_me:6157: $JAVAC -fsource=$source_version -d . conftest.java" >&5
+ $JAVAC -fsource="$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
+- && { echo "$as_me:6167: $JAVAC -d . conftestfail.java" >&5
++ && { echo "$as_me:6162: $JAVAC -d . conftestfail.java" >&5
+ $JAVAC -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:6171: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
++ && ! { echo "$as_me:6166: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
+ $JAVAC -fsource="$source_version" -d . conftestfail.java >&5 2>&1
+ }; then
+ CONF_JAVAC="$JAVAC -fsource=$source_version"
+@@ -6182,7 +6177,7 @@
+ else
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:6185: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
++ if { echo "$as_me:6180: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
+ $JAVAC -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+@@ -6195,7 +6190,7 @@
+ else
+ if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
+ rm -f conftest.class
+- if { echo "$as_me:6198: $JAVAC -d . conftest.java" >&5
++ if { echo "$as_me:6193: $JAVAC -d . conftest.java" >&5
+ $JAVAC -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class; then
+@@ -6207,7 +6202,7 @@
+ if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
+ javac_works=
+ rm -f conftest.class
+- if { echo "$as_me:6210: $JAVAC -d . conftest.java" >&5
++ if { echo "$as_me:6205: $JAVAC -d . conftest.java" >&5
+ $JAVAC -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class; then
+@@ -6215,7 +6210,7 @@
+ fi
+ javac_noassert_works=
+ rm -f conftest.class
+- if { echo "$as_me:6218: $JAVAC -fno-assert -d . conftest.java" >&5
++ if { echo "$as_me:6213: $JAVAC -fno-assert -d . conftest.java" >&5
+ $JAVAC -fno-assert -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class; then
+@@ -6223,11 +6218,11 @@
+ fi
+ if test -n "$javac_works" && test -n "$javac_noassert_works"; then
+ rm -f conftestfail.class
+- if { echo "$as_me:6226: $JAVAC -d . conftestfail.java" >&5
++ if { echo "$as_me:6221: $JAVAC -d . conftestfail.java" >&5
+ $JAVAC -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:6230: $JAVAC -fno-assert -d . conftestfail.java" >&5
++ && ! { echo "$as_me:6225: $JAVAC -fno-assert -d . conftestfail.java" >&5
+ $JAVAC -fno-assert -d . conftestfail.java >&5 2>&1
+ }; then
+ javac_works=
+@@ -6255,23 +6250,23 @@
+ esac
+ fi
+ rm -f conftest.class
+- if { echo "$as_me:6258: $JAVAC -d . conftest.java" >&5
++ if { echo "$as_me:6253: $JAVAC -d . conftest.java" >&5
+ $JAVAC -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:6265: $JAVAC -source $source_version -d . conftest.java" >&5
++ if { echo "$as_me:6260: $JAVAC -source $source_version -d . conftest.java" >&5
+ $JAVAC -source "$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
+- && { echo "$as_me:6270: $JAVAC -d . conftestfail.java" >&5
++ && { echo "$as_me:6265: $JAVAC -d . conftestfail.java" >&5
+ $JAVAC -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:6274: $JAVAC -source $source_version -d . conftestfail.java" >&5
++ && ! { echo "$as_me:6269: $JAVAC -source $source_version -d . conftestfail.java" >&5
+ $JAVAC -source "$source_version" -d . conftestfail.java >&5 2>&1
+ }; then
+ CONF_JAVAC="$JAVAC -source $source_version"
+@@ -6284,23 +6279,23 @@
+ fi
+ else
+ rm -f conftest.class
+- if { echo "$as_me:6287: $JAVAC -target $target_version -d . conftest.java" >&5
++ if { echo "$as_me:6282: $JAVAC -target $target_version -d . conftest.java" >&5
+ $JAVAC -target "$target_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:6294: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
++ if { echo "$as_me:6289: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
+ $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
+- && { echo "$as_me:6299: $JAVAC -target $target_version -d . conftestfail.java" >&5
++ && { echo "$as_me:6294: $JAVAC -target $target_version -d . conftestfail.java" >&5
+ $JAVAC -target "$target_version" -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:6303: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
++ && ! { echo "$as_me:6298: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
+ $JAVAC -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
+ }; then
+ CONF_JAVAC="$JAVAC -target $target_version -source $source_version"
+@@ -6313,7 +6308,7 @@
+ fi
+ else
+ rm -f conftest.class
+- if { echo "$as_me:6316: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
++ if { echo "$as_me:6311: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
+ $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+@@ -6431,28 +6426,28 @@
+
+ if test -z "$HAVE_JAVACOMP" && test -n "$HAVE_GCJ_IN_PATH"; then
+ if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[01]/d' | grep '^[3-9]' >/dev/null; then
+- if { echo "$as_me:6434: gcj -C -d . conftestlib.java" >&5
++ if { echo "$as_me:6429: gcj -C -d . conftestlib.java" >&5
+ gcj -C -d . conftestlib.java >&5 2>&1
+ }; then
+ if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
+ rm -f conftest.class
+- if { echo "$as_me:6439: gcj -C -d . conftest.java" >&5
++ if { echo "$as_me:6434: gcj -C -d . conftest.java" >&5
+ gcj -C -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:6446: gcj -C -fsource=$source_version -d . conftest.java" >&5
++ if { echo "$as_me:6441: gcj -C -fsource=$source_version -d . conftest.java" >&5
+ gcj -C -fsource="$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
+- && { echo "$as_me:6451: gcj -C -d . conftestfail.java" >&5
++ && { echo "$as_me:6446: gcj -C -d . conftestfail.java" >&5
+ gcj -C -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:6455: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
++ && ! { echo "$as_me:6450: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
+ gcj -C -fsource="$source_version" -d . conftestfail.java >&5 2>&1
+ }; then
+ CONF_JAVAC="gcj -C -fsource=$source_version"
+@@ -6466,7 +6461,7 @@
+ else
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:6469: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
++ if { echo "$as_me:6464: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
+ gcj -C -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+@@ -6479,7 +6474,7 @@
+ else
+ if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
+ rm -f conftest.class
+- if { echo "$as_me:6482: gcj -C -d . conftest.java" >&5
++ if { echo "$as_me:6477: gcj -C -d . conftest.java" >&5
+ gcj -C -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class; then
+@@ -6490,7 +6485,7 @@
+ else
+ if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
+ rm -f conftest.class
+- if { echo "$as_me:6493: gcj -C -fno-assert -d . conftest.java" >&5
++ if { echo "$as_me:6488: gcj -C -fno-assert -d . conftest.java" >&5
+ gcj -C -fno-assert -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class; then
+@@ -6499,7 +6494,7 @@
+ HAVE_JAVACOMP=1
+ else
+ rm -f conftest.class
+- if { echo "$as_me:6502: gcj -C -d . conftest.java" >&5
++ if { echo "$as_me:6497: gcj -C -d . conftest.java" >&5
+ gcj -C -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class; then
+@@ -6524,23 +6519,23 @@
+ esac
+ fi
+ rm -f conftest.class
+- if { echo "$as_me:6527: javac -d . conftest.java" >&5
++ if { echo "$as_me:6522: javac -d . conftest.java" >&5
+ javac -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:6534: javac -source $source_version -d . conftest.java" >&5
++ if { echo "$as_me:6529: javac -source $source_version -d . conftest.java" >&5
+ javac -source "$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
+- && { echo "$as_me:6539: javac -d . conftestfail.java" >&5
++ && { echo "$as_me:6534: javac -d . conftestfail.java" >&5
+ javac -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:6543: javac -source $source_version -d . conftestfail.java" >&5
++ && ! { echo "$as_me:6538: javac -source $source_version -d . conftestfail.java" >&5
+ javac -source "$source_version" -d . conftestfail.java >&5 2>&1
+ }; then
+ CONF_JAVAC="javac -source $source_version"
+@@ -6553,23 +6548,23 @@
+ fi
+ else
+ rm -f conftest.class
+- if { echo "$as_me:6556: javac -target $target_version -d . conftest.java" >&5
++ if { echo "$as_me:6551: javac -target $target_version -d . conftest.java" >&5
+ javac -target "$target_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:6563: javac -target $target_version -source $source_version -d . conftest.java" >&5
++ if { echo "$as_me:6558: javac -target $target_version -source $source_version -d . conftest.java" >&5
+ javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
+- && { echo "$as_me:6568: javac -target $target_version -d . conftestfail.java" >&5
++ && { echo "$as_me:6563: javac -target $target_version -d . conftestfail.java" >&5
+ javac -target "$target_version" -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:6572: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
++ && ! { echo "$as_me:6567: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
+ javac -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
+ }; then
+ CONF_JAVAC="javac -target $target_version -source $source_version"
+@@ -6582,7 +6577,7 @@
+ fi
+ else
+ rm -f conftest.class
+- if { echo "$as_me:6585: javac -target $target_version -source $source_version -d . conftest.java" >&5
++ if { echo "$as_me:6580: javac -target $target_version -source $source_version -d . conftest.java" >&5
+ javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/doc/Makefile.in gettext-0.21/gettext-runtime/doc/Makefile.in
+--- gettext-0.21.orig/gettext-runtime/doc/Makefile.in 2020-07-26 21:03:58.000000000 +0000
++++ gettext-0.21/gettext-runtime/doc/Makefile.in 2021-03-25 21:41:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/gnulib-lib/Makefile.in gettext-0.21/gettext-runtime/gnulib-lib/Makefile.in
+--- gettext-0.21.orig/gettext-runtime/gnulib-lib/Makefile.in 2020-07-26 21:03:58.000000000 +0000
++++ gettext-0.21/gettext-runtime/gnulib-lib/Makefile.in 2021-03-25 21:41:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -1834,7 +1834,8 @@
+ installdirs-am:
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
+-install-exec: install-exec-recursive
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive
+ install-data: install-data-recursive
+ uninstall: uninstall-recursive
+
+@@ -1943,7 +1944,7 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+ .MAKE: $(am__recursive_targets) all check install install-am \
+- install-strip uninstall-am
++ install-exec install-strip uninstall-am
+
+ .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-am clean clean-generic clean-libtool \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/intl/Makefile.in gettext-0.21/gettext-runtime/intl/Makefile.in
+--- gettext-0.21.orig/gettext-runtime/intl/Makefile.in 2020-07-26 21:03:58.000000000 +0000
++++ gettext-0.21/gettext-runtime/intl/Makefile.in 2021-03-25 21:41:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -1787,7 +1787,8 @@
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+-install-exec: install-exec-am
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
+
+@@ -1822,9 +1823,9 @@
+ -rm -f plural.c
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
++ at PACKAGE_IS_GETTEXT_TOOLS_FALSE@@PRELOADABLE_LIBINTL_FALSE@@USE_INCLUDED_LIBINTL_FALSE at uninstall-local:
+ @PRELOADABLE_LIBINTL_FALSE@@USE_INCLUDED_LIBINTL_FALSE at install-exec-local:
+ @PACKAGE_IS_GETTEXT_TOOLS_FALSE@@USE_INCLUDED_LIBINTL_FALSE at install-data-local:
+- at PACKAGE_IS_GETTEXT_TOOLS_FALSE@@PRELOADABLE_LIBINTL_FALSE@@USE_INCLUDED_LIBINTL_FALSE at uninstall-local:
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-local \
+@@ -1894,7 +1895,7 @@
+
+ uninstall-am: uninstall-local uninstall-nodist_includeHEADERS
+
+-.MAKE: all check install install-am install-strip
++.MAKE: all check install install-am install-exec install-strip
+
+ .PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
+ clean-generic clean-libtool clean-local \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/intl-csharp/Makefile.in gettext-0.21/gettext-runtime/intl-csharp/Makefile.in
+--- gettext-0.21.orig/gettext-runtime/intl-csharp/Makefile.in 2020-07-26 21:03:58.000000000 +0000
++++ gettext-0.21/gettext-runtime/intl-csharp/Makefile.in 2021-03-25 21:41:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/intl-java/Makefile.in gettext-0.21/gettext-runtime/intl-java/Makefile.in
+--- gettext-0.21.orig/gettext-runtime/intl-java/Makefile.in 2020-07-26 21:03:58.000000000 +0000
++++ gettext-0.21/gettext-runtime/intl-java/Makefile.in 2021-03-25 21:41:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/libasprintf/Makefile.in gettext-0.21/gettext-runtime/libasprintf/Makefile.in
+--- gettext-0.21.orig/gettext-runtime/libasprintf/Makefile.in 2020-07-26 21:03:52.000000000 +0000
++++ gettext-0.21/gettext-runtime/libasprintf/Makefile.in 2021-03-25 21:41:03.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -368,6 +368,8 @@
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ DIST_TARGETS = dist-gzip
++# Exists only to be overridden by the user if desired.
++AM_DISTCHECK_DVI_TARGET = dvi
+ distuninstallcheck_listfiles = find . -type f -print
+ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+@@ -1086,7 +1088,7 @@
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=../.. --prefix="$$dc_install_base" \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+- && $(MAKE) $(AM_MAKEFLAGS) dvi \
++ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+@@ -1148,7 +1150,8 @@
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+-install-exec: install-exec-am
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
+
+@@ -1348,7 +1351,7 @@
+ uninstall-libLTLIBRARIES uninstall-local uninstall-pdf-am \
+ uninstall-ps-am
+
+-.MAKE: all check install install-am install-strip
++.MAKE: all check install install-am install-exec install-strip
+
+ .PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \
+ check-am clean clean-aminfo clean-cscope clean-generic \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/libasprintf/aclocal.m4 gettext-0.21/gettext-runtime/libasprintf/aclocal.m4
+--- gettext-0.21.orig/gettext-runtime/libasprintf/aclocal.m4 2020-07-26 15:30:32.000000000 +0000
++++ gettext-0.21/gettext-runtime/libasprintf/aclocal.m4 2021-03-25 21:41:01.000000000 +0000
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
++# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
+
+ # Copyright (C) 1996-2020 Free Software Foundation, Inc.
+
+@@ -35,7 +35,7 @@
+ [am__api_version='1.16'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.16.2], [],
++m4_if([$1], [1.16.3], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -51,7 +51,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.16.2])dnl
++[AM_AUTOMAKE_VERSION([1.16.3])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+@@ -703,12 +703,7 @@
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/libasprintf/configure gettext-0.21/gettext-runtime/libasprintf/configure
+--- gettext-0.21.orig/gettext-runtime/libasprintf/configure 2020-07-26 21:03:51.000000000 +0000
++++ gettext-0.21/gettext-runtime/libasprintf/configure 2021-03-25 21:41:02.000000000 +0000
+@@ -2873,12 +2873,7 @@
+ am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/m4/Makefile.in gettext-0.21/gettext-runtime/m4/Makefile.in
+--- gettext-0.21.orig/gettext-runtime/m4/Makefile.in 2020-07-26 21:03:58.000000000 +0000
++++ gettext-0.21/gettext-runtime/m4/Makefile.in 2021-03-25 21:41:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/man/Makefile.in gettext-0.21/gettext-runtime/man/Makefile.in
+--- gettext-0.21.orig/gettext-runtime/man/Makefile.in 2020-07-26 21:03:58.000000000 +0000
++++ gettext-0.21/gettext-runtime/man/Makefile.in 2021-03-25 21:41:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/src/Makefile.in gettext-0.21/gettext-runtime/src/Makefile.in
+--- gettext-0.21.orig/gettext-runtime/src/Makefile.in 2020-07-26 21:03:59.000000000 +0000
++++ gettext-0.21/gettext-runtime/src/Makefile.in 2021-03-25 21:41:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-runtime/tests/Makefile.in gettext-0.21/gettext-runtime/tests/Makefile.in
+--- gettext-0.21.orig/gettext-runtime/tests/Makefile.in 2020-07-26 21:03:59.000000000 +0000
++++ gettext-0.21/gettext-runtime/tests/Makefile.in 2021-03-25 21:41:12.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -433,6 +433,7 @@
+ bases='$(TEST_LOGS)'; \
+ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+ bases=`echo $$bases`
++AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
+ RECHECK_LOGS = $(TEST_LOGS)
+ AM_RECURSIVE_TARGETS = check recheck
+ TEST_SUITE_LOG = test-suite.log
+@@ -1601,7 +1602,7 @@
+ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
+ fi; \
+ echo "$${col}$$br$${std}"; \
+- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
++ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \
+ echo "$${col}$$br$${std}"; \
+ create_testsuite_report --maybe-color; \
+ echo "$$col$$br$$std"; \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/Makefile.in gettext-0.21/gettext-tools/Makefile.in
+--- gettext-0.21.orig/gettext-tools/Makefile.in 2020-07-26 21:04:55.000000000 +0000
++++ gettext-0.21/gettext-tools/Makefile.in 2021-03-25 21:41:38.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -564,6 +564,8 @@
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ DIST_TARGETS = dist-gzip
++# Exists only to be overridden by the user if desired.
++AM_DISTCHECK_DVI_TARGET = dvi
+ distuninstallcheck_listfiles = find . -type f -print
+ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+@@ -2598,7 +2600,7 @@
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=../.. --prefix="$$dc_install_base" \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+- && $(MAKE) $(AM_MAKEFLAGS) dvi \
++ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/aclocal.m4 gettext-0.21/gettext-tools/aclocal.m4
+--- gettext-0.21.orig/gettext-tools/aclocal.m4 2020-07-26 20:59:09.000000000 +0000
++++ gettext-0.21/gettext-tools/aclocal.m4 2021-03-25 21:41:29.000000000 +0000
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
++# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
+
+ # Copyright (C) 1996-2020 Free Software Foundation, Inc.
+
+@@ -35,7 +35,7 @@
+ [am__api_version='1.16'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.16.2], [],
++m4_if([$1], [1.16.3], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -51,7 +51,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.16.2])dnl
++[AM_AUTOMAKE_VERSION([1.16.3])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+@@ -750,12 +750,7 @@
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/configure gettext-0.21/gettext-tools/configure
+--- gettext-0.21.orig/gettext-tools/configure 2020-07-26 20:59:18.000000000 +0000
++++ gettext-0.21/gettext-tools/configure 2021-03-25 21:41:34.000000000 +0000
+@@ -4723,12 +4723,7 @@
+ am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+@@ -7238,7 +7233,7 @@
+ > conftestver.class
+ target_version=`{
+ unset JAVA_HOME
+- echo "$as_me:7241: CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver" >&5
++ echo "$as_me:7236: CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver" >&5
+ CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver 2>&5
+ }`
+ case "$target_version" in
+@@ -7323,23 +7318,23 @@
+ if $JAVAC --version 2>/dev/null | sed -e 1q | grep gcj > /dev/null; then
+ if $JAVAC --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
+ rm -f conftest.class
+- if { echo "$as_me:7326: $JAVAC -d . conftest.java" >&5
++ if { echo "$as_me:7321: $JAVAC -d . conftest.java" >&5
+ $JAVAC -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:7333: $JAVAC -fsource=$source_version -d . conftest.java" >&5
++ if { echo "$as_me:7328: $JAVAC -fsource=$source_version -d . conftest.java" >&5
+ $JAVAC -fsource="$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
+- && { echo "$as_me:7338: $JAVAC -d . conftestfail.java" >&5
++ && { echo "$as_me:7333: $JAVAC -d . conftestfail.java" >&5
+ $JAVAC -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:7342: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
++ && ! { echo "$as_me:7337: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
+ $JAVAC -fsource="$source_version" -d . conftestfail.java >&5 2>&1
+ }; then
+ CONF_JAVAC="$JAVAC -fsource=$source_version"
+@@ -7353,7 +7348,7 @@
+ else
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:7356: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
++ if { echo "$as_me:7351: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
+ $JAVAC -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+@@ -7366,7 +7361,7 @@
+ else
+ if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
+ rm -f conftest.class
+- if { echo "$as_me:7369: $JAVAC -d . conftest.java" >&5
++ if { echo "$as_me:7364: $JAVAC -d . conftest.java" >&5
+ $JAVAC -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class; then
+@@ -7378,7 +7373,7 @@
+ if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
+ javac_works=
+ rm -f conftest.class
+- if { echo "$as_me:7381: $JAVAC -d . conftest.java" >&5
++ if { echo "$as_me:7376: $JAVAC -d . conftest.java" >&5
+ $JAVAC -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class; then
+@@ -7386,7 +7381,7 @@
+ fi
+ javac_noassert_works=
+ rm -f conftest.class
+- if { echo "$as_me:7389: $JAVAC -fno-assert -d . conftest.java" >&5
++ if { echo "$as_me:7384: $JAVAC -fno-assert -d . conftest.java" >&5
+ $JAVAC -fno-assert -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class; then
+@@ -7394,11 +7389,11 @@
+ fi
+ if test -n "$javac_works" && test -n "$javac_noassert_works"; then
+ rm -f conftestfail.class
+- if { echo "$as_me:7397: $JAVAC -d . conftestfail.java" >&5
++ if { echo "$as_me:7392: $JAVAC -d . conftestfail.java" >&5
+ $JAVAC -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:7401: $JAVAC -fno-assert -d . conftestfail.java" >&5
++ && ! { echo "$as_me:7396: $JAVAC -fno-assert -d . conftestfail.java" >&5
+ $JAVAC -fno-assert -d . conftestfail.java >&5 2>&1
+ }; then
+ javac_works=
+@@ -7426,23 +7421,23 @@
+ esac
+ fi
+ rm -f conftest.class
+- if { echo "$as_me:7429: $JAVAC -d . conftest.java" >&5
++ if { echo "$as_me:7424: $JAVAC -d . conftest.java" >&5
+ $JAVAC -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:7436: $JAVAC -source $source_version -d . conftest.java" >&5
++ if { echo "$as_me:7431: $JAVAC -source $source_version -d . conftest.java" >&5
+ $JAVAC -source "$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
+- && { echo "$as_me:7441: $JAVAC -d . conftestfail.java" >&5
++ && { echo "$as_me:7436: $JAVAC -d . conftestfail.java" >&5
+ $JAVAC -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:7445: $JAVAC -source $source_version -d . conftestfail.java" >&5
++ && ! { echo "$as_me:7440: $JAVAC -source $source_version -d . conftestfail.java" >&5
+ $JAVAC -source "$source_version" -d . conftestfail.java >&5 2>&1
+ }; then
+ CONF_JAVAC="$JAVAC -source $source_version"
+@@ -7455,23 +7450,23 @@
+ fi
+ else
+ rm -f conftest.class
+- if { echo "$as_me:7458: $JAVAC -target $target_version -d . conftest.java" >&5
++ if { echo "$as_me:7453: $JAVAC -target $target_version -d . conftest.java" >&5
+ $JAVAC -target "$target_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:7465: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
++ if { echo "$as_me:7460: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
+ $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
+- && { echo "$as_me:7470: $JAVAC -target $target_version -d . conftestfail.java" >&5
++ && { echo "$as_me:7465: $JAVAC -target $target_version -d . conftestfail.java" >&5
+ $JAVAC -target "$target_version" -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:7474: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
++ && ! { echo "$as_me:7469: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
+ $JAVAC -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
+ }; then
+ CONF_JAVAC="$JAVAC -target $target_version -source $source_version"
+@@ -7484,7 +7479,7 @@
+ fi
+ else
+ rm -f conftest.class
+- if { echo "$as_me:7487: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
++ if { echo "$as_me:7482: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
+ $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+@@ -7602,28 +7597,28 @@
+
+ if test -z "$HAVE_JAVACOMP" && test -n "$HAVE_GCJ_IN_PATH"; then
+ if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[01]/d' | grep '^[3-9]' >/dev/null; then
+- if { echo "$as_me:7605: gcj -C -d . conftestlib.java" >&5
++ if { echo "$as_me:7600: gcj -C -d . conftestlib.java" >&5
+ gcj -C -d . conftestlib.java >&5 2>&1
+ }; then
+ if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
+ rm -f conftest.class
+- if { echo "$as_me:7610: gcj -C -d . conftest.java" >&5
++ if { echo "$as_me:7605: gcj -C -d . conftest.java" >&5
+ gcj -C -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:7617: gcj -C -fsource=$source_version -d . conftest.java" >&5
++ if { echo "$as_me:7612: gcj -C -fsource=$source_version -d . conftest.java" >&5
+ gcj -C -fsource="$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
+- && { echo "$as_me:7622: gcj -C -d . conftestfail.java" >&5
++ && { echo "$as_me:7617: gcj -C -d . conftestfail.java" >&5
+ gcj -C -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:7626: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
++ && ! { echo "$as_me:7621: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
+ gcj -C -fsource="$source_version" -d . conftestfail.java >&5 2>&1
+ }; then
+ CONF_JAVAC="gcj -C -fsource=$source_version"
+@@ -7637,7 +7632,7 @@
+ else
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:7640: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
++ if { echo "$as_me:7635: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
+ gcj -C -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+@@ -7650,7 +7645,7 @@
+ else
+ if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
+ rm -f conftest.class
+- if { echo "$as_me:7653: gcj -C -d . conftest.java" >&5
++ if { echo "$as_me:7648: gcj -C -d . conftest.java" >&5
+ gcj -C -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class; then
+@@ -7661,7 +7656,7 @@
+ else
+ if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
+ rm -f conftest.class
+- if { echo "$as_me:7664: gcj -C -fno-assert -d . conftest.java" >&5
++ if { echo "$as_me:7659: gcj -C -fno-assert -d . conftest.java" >&5
+ gcj -C -fno-assert -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class; then
+@@ -7670,7 +7665,7 @@
+ HAVE_JAVACOMP=1
+ else
+ rm -f conftest.class
+- if { echo "$as_me:7673: gcj -C -d . conftest.java" >&5
++ if { echo "$as_me:7668: gcj -C -d . conftest.java" >&5
+ gcj -C -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class; then
+@@ -7695,23 +7690,23 @@
+ esac
+ fi
+ rm -f conftest.class
+- if { echo "$as_me:7698: javac -d . conftest.java" >&5
++ if { echo "$as_me:7693: javac -d . conftest.java" >&5
+ javac -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:7705: javac -source $source_version -d . conftest.java" >&5
++ if { echo "$as_me:7700: javac -source $source_version -d . conftest.java" >&5
+ javac -source "$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
+- && { echo "$as_me:7710: javac -d . conftestfail.java" >&5
++ && { echo "$as_me:7705: javac -d . conftestfail.java" >&5
+ javac -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:7714: javac -source $source_version -d . conftestfail.java" >&5
++ && ! { echo "$as_me:7709: javac -source $source_version -d . conftestfail.java" >&5
+ javac -source "$source_version" -d . conftestfail.java >&5 2>&1
+ }; then
+ CONF_JAVAC="javac -source $source_version"
+@@ -7724,23 +7719,23 @@
+ fi
+ else
+ rm -f conftest.class
+- if { echo "$as_me:7727: javac -target $target_version -d . conftest.java" >&5
++ if { echo "$as_me:7722: javac -target $target_version -d . conftest.java" >&5
+ javac -target "$target_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
+ rm -f conftest.class
+ rm -f conftestfail.class
+- if { echo "$as_me:7734: javac -target $target_version -source $source_version -d . conftest.java" >&5
++ if { echo "$as_me:7729: javac -target $target_version -source $source_version -d . conftest.java" >&5
+ javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+ && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
+- && { echo "$as_me:7739: javac -target $target_version -d . conftestfail.java" >&5
++ && { echo "$as_me:7734: javac -target $target_version -d . conftestfail.java" >&5
+ javac -target "$target_version" -d . conftestfail.java >&5 2>&1
+ } \
+ && test -f conftestfail.class \
+- && ! { echo "$as_me:7743: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
++ && ! { echo "$as_me:7738: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
+ javac -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
+ }; then
+ CONF_JAVAC="javac -target $target_version -source $source_version"
+@@ -7753,7 +7748,7 @@
+ fi
+ else
+ rm -f conftest.class
+- if { echo "$as_me:7756: javac -target $target_version -source $source_version -d . conftest.java" >&5
++ if { echo "$as_me:7751: javac -target $target_version -source $source_version -d . conftest.java" >&5
+ javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
+ } \
+ && test -f conftest.class \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/doc/Makefile.in gettext-0.21/gettext-tools/doc/Makefile.in
+--- gettext-0.21.orig/gettext-tools/doc/Makefile.in 2020-07-26 21:04:56.000000000 +0000
++++ gettext-0.21/gettext-tools/doc/Makefile.in 2021-03-25 21:41:38.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/emacs/Makefile.in gettext-0.21/gettext-tools/emacs/Makefile.in
+--- gettext-0.21.orig/gettext-tools/emacs/Makefile.in 2020-07-26 21:04:56.000000000 +0000
++++ gettext-0.21/gettext-tools/emacs/Makefile.in 2021-03-25 21:41:38.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/examples/Makefile.in gettext-0.21/gettext-tools/examples/Makefile.in
+--- gettext-0.21.orig/gettext-tools/examples/Makefile.in 2020-07-26 21:04:44.000000000 +0000
++++ gettext-0.21/gettext-tools/examples/Makefile.in 2021-03-25 21:41:22.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -234,6 +234,8 @@
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ DIST_TARGETS = dist-gzip
++# Exists only to be overridden by the user if desired.
++AM_DISTCHECK_DVI_TARGET = dvi
+ distuninstallcheck_listfiles = find . -type f -print
+ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+@@ -1071,7 +1073,7 @@
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=../.. --prefix="$$dc_install_base" \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+- && $(MAKE) $(AM_MAKEFLAGS) dvi \
++ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/examples/aclocal.m4 gettext-0.21/gettext-tools/examples/aclocal.m4
+--- gettext-0.21.orig/gettext-tools/examples/aclocal.m4 2020-04-11 10:02:20.000000000 +0000
++++ gettext-0.21/gettext-tools/examples/aclocal.m4 2021-03-25 21:41:21.000000000 +0000
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
++# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
+
+ # Copyright (C) 1996-2020 Free Software Foundation, Inc.
+
+@@ -35,7 +35,7 @@
+ [am__api_version='1.16'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.16.2], [],
++m4_if([$1], [1.16.3], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -51,7 +51,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.16.2])dnl
++[AM_AUTOMAKE_VERSION([1.16.3])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+@@ -370,12 +370,7 @@
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/examples/configure gettext-0.21/gettext-tools/examples/configure
+--- gettext-0.21.orig/gettext-tools/examples/configure 2020-07-26 21:04:44.000000000 +0000
++++ gettext-0.21/gettext-tools/examples/configure 2021-03-25 21:41:21.000000000 +0000
+@@ -1927,12 +1927,7 @@
+ am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/examples/po/Makefile.in gettext-0.21/gettext-tools/examples/po/Makefile.in
+--- gettext-0.21.orig/gettext-tools/examples/po/Makefile.in 2020-07-26 21:04:44.000000000 +0000
++++ gettext-0.21/gettext-tools/examples/po/Makefile.in 2021-03-25 21:41:22.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/gnulib-lib/Makefile.in gettext-0.21/gettext-tools/gnulib-lib/Makefile.in
+--- gettext-0.21.orig/gettext-tools/gnulib-lib/Makefile.in 2020-07-26 21:04:56.000000000 +0000
++++ gettext-0.21/gettext-tools/gnulib-lib/Makefile.in 2021-03-25 21:41:39.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -3465,7 +3465,8 @@
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+-install-exec: install-exec-am
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
+
+@@ -3579,7 +3580,8 @@
+ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgdataDATA
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+-.MAKE: all check install install-am install-strip uninstall-am
++.MAKE: all check install install-am install-exec install-strip \
++ uninstall-am
+
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
+Only in gettext-0.21/gettext-tools/gnulib-m4: po.m4
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/gnulib-tests/Makefile.in gettext-0.21/gettext-tools/gnulib-tests/Makefile.in
+--- gettext-0.21.orig/gettext-tools/gnulib-tests/Makefile.in 2020-07-26 21:04:57.000000000 +0000
++++ gettext-0.21/gettext-tools/gnulib-tests/Makefile.in 2021-03-25 21:41:39.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -2531,6 +2531,7 @@
+ bases='$(TEST_LOGS)'; \
+ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+ bases=`echo $$bases`
++AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
+ RECHECK_LOGS = $(TEST_LOGS)
+ TEST_SUITE_LOG = test-suite.log
+ TEST_EXTENSIONS = @EXEEXT@ .test
+@@ -6251,7 +6252,7 @@
+ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
+ fi; \
+ echo "$${col}$$br$${std}"; \
+- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
++ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \
+ echo "$${col}$$br$${std}"; \
+ create_testsuite_report --maybe-color; \
+ echo "$$col$$br$$std"; \
+@@ -8230,7 +8231,8 @@
+ installdirs-am:
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
+-install-exec: install-exec-recursive
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive
+ install-data: install-data-recursive
+ uninstall: uninstall-recursive
+
+@@ -8940,7 +8942,7 @@
+ uninstall-am:
+
+ .MAKE: $(am__recursive_targets) all check check-am install install-am \
+- install-strip
++ install-exec install-strip
+
+ .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--depfiles check check-TESTS check-am clean \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/intl/Makefile.in gettext-0.21/gettext-tools/intl/Makefile.in
+--- gettext-0.21.orig/gettext-tools/intl/Makefile.in 2020-07-26 21:04:57.000000000 +0000
++++ gettext-0.21/gettext-tools/intl/Makefile.in 2021-03-25 21:41:39.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -2622,7 +2622,8 @@
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+-install-exec: install-exec-am
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
+
+@@ -2729,7 +2730,7 @@
+
+ uninstall-am: uninstall-local uninstall-nodist_includeHEADERS
+
+-.MAKE: all check install install-am install-strip
++.MAKE: all check install install-am install-exec install-strip
+
+ .PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
+ clean-generic clean-libtool clean-local \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/its/Makefile.in gettext-0.21/gettext-tools/its/Makefile.in
+--- gettext-0.21.orig/gettext-tools/its/Makefile.in 2020-07-26 21:04:57.000000000 +0000
++++ gettext-0.21/gettext-tools/its/Makefile.in 2021-03-25 21:41:40.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/libgettextpo/Makefile.am gettext-0.21/gettext-tools/libgettextpo/Makefile.am
+--- gettext-0.21.orig/gettext-tools/libgettextpo/Makefile.am 2020-07-26 20:31:02.000000000 +0000
++++ gettext-0.21/gettext-tools/libgettextpo/Makefile.am 2021-03-25 16:29:32.000000000 +0000
+@@ -107,7 +107,25 @@
+ # How to build libgettextpo.la.
+ # Don't make it depend on libgettextsrc.la or libgettextlib.la, since they
+ # define an uncontrolled amount of symbols.
+-libgettextpo_la_LIBADD = libgnu.la $(WOE32_LIBADD) $(LTLIBUNISTRING)
++# Amyspark: Need @LTLIBTEXTSTYLE@ because in macOS the linker will complain:
++# Undefined symbols for architecture x86_64:
++# "_file_ostream_create", referenced from:
++# _msgdomain_list_print in write-catalog.o
++# "_ostream_free", referenced from:
++# _msgdomain_list_print in write-catalog.o
++# "_ostream_write_mem", referenced from:
++# _message_print_comment in write-po.o
++# _wrap in write-po.o
++# "_ostream_write_str", referenced from:
++# _message_print_comment in write-po.o
++# _message_print_comment_dot in write-po.o
++# _message_print_comment_filepos in write-po.o
++# _message_print_comment_flags in write-po.o
++# _msgdomain_list_print_po in write-po.o
++# _wrap in write-po.o
++# ld: symbol(s) not found for architecture x86_64
++# clang: error: linker command failed with exit code 1 (use -v to see invocation)
++libgettextpo_la_LIBADD = libgnu.la ../../libtextstyle/lib/libtextstyle.la $(WOE32_LIBADD) $(LTLIBUNISTRING)
+ libgettextpo_la_LDFLAGS = \
+ -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
+ -rpath $(libdir) \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/libgettextpo/Makefile.in gettext-0.21/gettext-tools/libgettextpo/Makefile.in
+--- gettext-0.21.orig/gettext-tools/libgettextpo/Makefile.in 2020-07-26 21:04:58.000000000 +0000
++++ gettext-0.21/gettext-tools/libgettextpo/Makefile.in 2021-03-25 21:41:40.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -557,7 +557,8 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+ @WOE32_TRUE at am__DEPENDENCIES_1 = libgettextpo.res.lo
+ am__DEPENDENCIES_2 =
+-libgettextpo_la_DEPENDENCIES = libgnu.la $(am__DEPENDENCIES_1) \
++libgettextpo_la_DEPENDENCIES = libgnu.la \
++ ../../libtextstyle/lib/libtextstyle.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
+ am__libgettextpo_la_SOURCES_DIST = gettext-po.c ../src/str-list.c \
+ ../src/dir-list.c ../src/message.c ../src/msgl-ascii.c \
+@@ -2545,7 +2546,25 @@
+ # How to build libgettextpo.la.
+ # Don't make it depend on libgettextsrc.la or libgettextlib.la, since they
+ # define an uncontrolled amount of symbols.
+-libgettextpo_la_LIBADD = libgnu.la $(WOE32_LIBADD) $(LTLIBUNISTRING)
++# Amyspark: Need @LTLIBTEXTSTYLE@ because in macOS the linker will complain:
++# Undefined symbols for architecture x86_64:
++# "_file_ostream_create", referenced from:
++# _msgdomain_list_print in write-catalog.o
++# "_ostream_free", referenced from:
++# _msgdomain_list_print in write-catalog.o
++# "_ostream_write_mem", referenced from:
++# _message_print_comment in write-po.o
++# _wrap in write-po.o
++# "_ostream_write_str", referenced from:
++# _message_print_comment in write-po.o
++# _message_print_comment_dot in write-po.o
++# _message_print_comment_filepos in write-po.o
++# _message_print_comment_flags in write-po.o
++# _msgdomain_list_print_po in write-po.o
++# _wrap in write-po.o
++# ld: symbol(s) not found for architecture x86_64
++# clang: error: linker command failed with exit code 1 (use -v to see invocation)
++libgettextpo_la_LIBADD = libgnu.la ../../libtextstyle/lib/libtextstyle.la $(WOE32_LIBADD) $(LTLIBUNISTRING)
+ libgettextpo_la_LDFLAGS = -version-info \
+ $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) -rpath $(libdir) \
+ @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined $(am__append_2) \
+@@ -2976,7 +2995,8 @@
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+-install-exec: install-exec-am
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
+
+@@ -3087,7 +3107,7 @@
+
+ uninstall-am: uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS
+
+-.MAKE: all check install install-am install-strip
++.MAKE: all check install install-am install-exec install-strip
+
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/libgrep/Makefile.in gettext-0.21/gettext-tools/libgrep/Makefile.in
+--- gettext-0.21.orig/gettext-tools/libgrep/Makefile.in 2020-07-26 21:04:58.000000000 +0000
++++ gettext-0.21/gettext-tools/libgrep/Makefile.in 2021-03-25 21:41:40.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -2385,7 +2385,8 @@
+ installdirs:
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+-install-exec: install-exec-am
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
+
+@@ -2489,7 +2490,7 @@
+
+ uninstall-am:
+
+-.MAKE: all check install install-am install-strip
++.MAKE: all check install install-am install-exec install-strip
+
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/m4/Makefile.in gettext-0.21/gettext-tools/m4/Makefile.in
+--- gettext-0.21.orig/gettext-tools/m4/Makefile.in 2020-07-26 21:04:58.000000000 +0000
++++ gettext-0.21/gettext-tools/m4/Makefile.in 2021-03-25 21:41:40.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/man/Makefile.in gettext-0.21/gettext-tools/man/Makefile.in
+--- gettext-0.21.orig/gettext-tools/man/Makefile.in 2020-07-26 21:04:58.000000000 +0000
++++ gettext-0.21/gettext-tools/man/Makefile.in 2021-03-25 21:41:40.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/misc/Makefile.in gettext-0.21/gettext-tools/misc/Makefile.in
+--- gettext-0.21.orig/gettext-tools/misc/Makefile.in 2020-07-26 21:04:58.000000000 +0000
++++ gettext-0.21/gettext-tools/misc/Makefile.in 2021-03-25 21:41:40.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/projects/Makefile.in gettext-0.21/gettext-tools/projects/Makefile.in
+--- gettext-0.21.orig/gettext-tools/projects/Makefile.in 2020-07-26 21:04:59.000000000 +0000
++++ gettext-0.21/gettext-tools/projects/Makefile.in 2021-03-25 21:41:41.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/src/Makefile.in gettext-0.21/gettext-tools/src/Makefile.in
+--- gettext-0.21.orig/gettext-tools/src/Makefile.in 2020-07-26 21:04:59.000000000 +0000
++++ gettext-0.21/gettext-tools/src/Makefile.in 2021-03-25 21:41:41.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -4061,7 +4061,8 @@
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+-install-exec: install-exec-am
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
+
+@@ -4171,7 +4172,8 @@
+ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
+ uninstall-local
+
+-.MAKE: all check install install-am install-exec-am install-strip
++.MAKE: all check install install-am install-exec install-exec-am \
++ install-strip
+
+ .PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
+ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/styles/Makefile.in gettext-0.21/gettext-tools/styles/Makefile.in
+--- gettext-0.21.orig/gettext-tools/styles/Makefile.in 2020-07-26 21:05:00.000000000 +0000
++++ gettext-0.21/gettext-tools/styles/Makefile.in 2021-03-25 21:41:41.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/system-tests/Makefile.in gettext-0.21/gettext-tools/system-tests/Makefile.in
+--- gettext-0.21.orig/gettext-tools/system-tests/Makefile.in 2020-07-26 21:05:00.000000000 +0000
++++ gettext-0.21/gettext-tools/system-tests/Makefile.in 2021-03-25 21:41:41.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -759,6 +759,7 @@
+ bases='$(TEST_LOGS)'; \
+ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+ bases=`echo $$bases`
++AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
+ RECHECK_LOGS = $(TEST_LOGS)
+ AM_RECURSIVE_TARGETS = check recheck
+ TEST_SUITE_LOG = test-suite.log
+@@ -2781,7 +2782,7 @@
+ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
+ fi; \
+ echo "$${col}$$br$${std}"; \
+- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
++ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \
+ echo "$${col}$$br$${std}"; \
+ create_testsuite_report --maybe-color; \
+ echo "$$col$$br$$std"; \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gettext-tools/tests/Makefile.in gettext-0.21/gettext-tools/tests/Makefile.in
+--- gettext-0.21.orig/gettext-tools/tests/Makefile.in 2020-07-26 21:05:00.000000000 +0000
++++ gettext-0.21/gettext-tools/tests/Makefile.in 2021-03-25 21:41:42.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -788,6 +788,7 @@
+ bases='$(TEST_LOGS)'; \
+ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+ bases=`echo $$bases`
++AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
+ RECHECK_LOGS = $(TEST_LOGS)
+ AM_RECURSIVE_TARGETS = check recheck
+ TEST_SUITE_LOG = test-suite.log
+@@ -3082,7 +3083,7 @@
+ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
+ fi; \
+ echo "$${col}$$br$${std}"; \
+- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
++ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \
+ echo "$${col}$$br$${std}"; \
+ create_testsuite_report --maybe-color; \
+ echo "$$col$$br$$std"; \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/gnulib-local/Makefile.in gettext-0.21/gnulib-local/Makefile.in
+--- gettext-0.21.orig/gnulib-local/Makefile.in 2020-07-26 21:05:10.000000000 +0000
++++ gettext-0.21/gnulib-local/Makefile.in 2021-03-25 21:41:54.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/libtextstyle/Makefile.in gettext-0.21/libtextstyle/Makefile.in
+--- gettext-0.21.orig/libtextstyle/Makefile.in 2020-07-26 21:04:42.000000000 +0000
++++ gettext-0.21/libtextstyle/Makefile.in 2021-03-25 21:41:19.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -350,6 +350,8 @@
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ DIST_TARGETS = dist-gzip
++# Exists only to be overridden by the user if desired.
++AM_DISTCHECK_DVI_TARGET = dvi
+ distuninstallcheck_listfiles = find . -type f -print
+ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+@@ -2028,7 +2030,7 @@
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=../.. --prefix="$$dc_install_base" \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+- && $(MAKE) $(AM_MAKEFLAGS) dvi \
++ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/libtextstyle/aclocal.m4 gettext-0.21/libtextstyle/aclocal.m4
+--- gettext-0.21.orig/libtextstyle/aclocal.m4 2020-07-26 15:31:23.000000000 +0000
++++ gettext-0.21/libtextstyle/aclocal.m4 2021-03-25 21:41:15.000000000 +0000
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
++# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
+
+ # Copyright (C) 1996-2020 Free Software Foundation, Inc.
+
+@@ -35,7 +35,7 @@
+ [am__api_version='1.16'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.16.2], [],
++m4_if([$1], [1.16.3], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -51,7 +51,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.16.2])dnl
++[AM_AUTOMAKE_VERSION([1.16.3])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+@@ -703,12 +703,7 @@
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/libtextstyle/adhoc-tests/Makefile.in gettext-0.21/libtextstyle/adhoc-tests/Makefile.in
+--- gettext-0.21.orig/libtextstyle/adhoc-tests/Makefile.in 2020-07-26 21:04:42.000000000 +0000
++++ gettext-0.21/libtextstyle/adhoc-tests/Makefile.in 2021-03-25 21:41:20.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+Only in gettext-0.21/libtextstyle: autom4te.cache
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/libtextstyle/build-aux/install-sh gettext-0.21/libtextstyle/build-aux/install-sh
+--- gettext-0.21.orig/libtextstyle/build-aux/install-sh 2020-07-26 21:04:42.000000000 +0000
++++ gettext-0.21/libtextstyle/build-aux/install-sh 2021-03-25 21:41:19.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+
+-scriptversion=2018-03-11.20; # UTC
++scriptversion=2020-11-14.01; # UTC
+
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -69,6 +69,11 @@
+ # Desired mode of installed file.
+ mode=0755
+
++# Create dirs (including intermediate dirs) using mode 755.
++# This is like GNU 'install' as of coreutils 8.32 (2020).
++mkdir_umask=22
++
++backupsuffix=
+ chgrpcmd=
+ chmodcmd=$chmodprog
+ chowncmd=
+@@ -99,18 +104,28 @@
+ --version display version info and exit.
+
+ -c (ignored)
+- -C install only if different (preserve the last data modification time)
++ -C install only if different (preserve data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
++ -p pass -p to $cpprog.
+ -s $stripprog installed files.
++ -S SUFFIX attempt to back up existing files, with suffix SUFFIX.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
+
+ Environment variables override the default commands:
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
++
++By default, rm is invoked with -f; when overridden with RMPROG,
++it's up to you to specify -f if you want it.
++
++If -S is not specified, no backups are attempted.
++
++Email bug reports to bug-automake at gnu.org.
++Automake home page: https://www.gnu.org/software/automake/
+ "
+
+ while test $# -ne 0; do
+@@ -137,8 +152,13 @@
+ -o) chowncmd="$chownprog $2"
+ shift;;
+
++ -p) cpprog="$cpprog -p";;
++
+ -s) stripcmd=$stripprog;;
+
++ -S) backupsuffix="$2"
++ shift;;
++
+ -t)
+ is_target_a_directory=always
+ dst_arg=$2
+@@ -255,6 +275,10 @@
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
++ # Don't chown directories that already exist.
++ if test $dstdir_status = 0; then
++ chowncmd=""
++ fi
+ else
+
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+@@ -301,22 +325,6 @@
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+- # Create intermediate dirs using mode 755 as modified by the umask.
+- # This is like FreeBSD 'install' as of 1997-10-28.
+- umask=`umask`
+- case $stripcmd.$umask in
+- # Optimize common cases.
+- *[2367][2367]) mkdir_umask=$umask;;
+- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+-
+- *[0-7])
+- mkdir_umask=`expr $umask + 22 \
+- - $umask % 100 % 40 + $umask % 20 \
+- - $umask % 10 % 4 + $umask % 2
+- `;;
+- *) mkdir_umask=$umask,go-w;;
+- esac
+-
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+@@ -326,52 +334,49 @@
+ fi
+
+ posix_mkdir=false
+- case $umask in
+- *[123567][0-7][0-7])
+- # POSIX mkdir -p sets u+wx bits regardless of umask, which
+- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+- ;;
+- *)
+- # Note that $RANDOM variable is not portable (e.g. dash); Use it
+- # here however when possible just to lower collision chance.
+- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+-
+- trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+-
+- # Because "mkdir -p" follows existing symlinks and we likely work
+- # directly in world-writeable /tmp, make sure that the '$tmpdir'
+- # directory is successfully created first before we actually test
+- # 'mkdir -p' feature.
+- if (umask $mkdir_umask &&
+- $mkdirprog $mkdir_mode "$tmpdir" &&
+- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+- then
+- if test -z "$dir_arg" || {
+- # Check for POSIX incompatibilities with -m.
+- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+- # other-writable bit of parent directory when it shouldn't.
+- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+- test_tmpdir="$tmpdir/a"
+- ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+- case $ls_ld_tmpdir in
+- d????-?r-*) different_mode=700;;
+- d????-?--*) different_mode=755;;
+- *) false;;
+- esac &&
+- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+- }
+- }
+- then posix_mkdir=:
+- fi
+- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+- else
+- # Remove any dirs left behind by ancient mkdir implementations.
+- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+- fi
+- trap '' 0;;
+- esac;;
++ # The $RANDOM variable is not portable (e.g., dash). Use it
++ # here however when possible just to lower collision chance.
++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++
++ trap '
++ ret=$?
++ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
++ exit $ret
++ ' 0
++
++ # Because "mkdir -p" follows existing symlinks and we likely work
++ # directly in world-writeable /tmp, make sure that the '$tmpdir'
++ # directory is successfully created first before we actually test
++ # 'mkdir -p'.
++ if (umask $mkdir_umask &&
++ $mkdirprog $mkdir_mode "$tmpdir" &&
++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
++ then
++ if test -z "$dir_arg" || {
++ # Check for POSIX incompatibilities with -m.
++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++ # other-writable bit of parent directory when it shouldn't.
++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++ test_tmpdir="$tmpdir/a"
++ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
++ case $ls_ld_tmpdir in
++ d????-?r-*) different_mode=700;;
++ d????-?--*) different_mode=755;;
++ *) false;;
++ esac &&
++ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
++ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++ }
++ }
++ then posix_mkdir=:
++ fi
++ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
++ else
++ # Remove any dirs left behind by ancient mkdir implementations.
++ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
++ fi
++ trap '' 0;;
+ esac
+
+ if
+@@ -382,7 +387,7 @@
+ then :
+ else
+
+- # The umask is ridiculous, or mkdir does not conform to POSIX,
++ # mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
+
+@@ -411,7 +416,7 @@
+ prefixes=
+ else
+ if $posix_mkdir; then
+- (umask=$mkdir_umask &&
++ (umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+@@ -488,6 +493,13 @@
+ then
+ rm -f "$dsttmp"
+ else
++ # If $backupsuffix is set, and the file being installed
++ # already exists, attempt a backup. Don't worry if it fails,
++ # e.g., if mv doesn't support -f.
++ if test -n "$backupsuffix" && test -f "$dst"; then
++ $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
++ fi
++
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+@@ -502,9 +514,9 @@
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+- $doit $rmcmd -f "$dst" 2>/dev/null ||
++ $doit $rmcmd "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
++ { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/libtextstyle/build-aux/test-driver gettext-0.21/libtextstyle/build-aux/test-driver
+--- gettext-0.21.orig/libtextstyle/build-aux/test-driver 2020-07-26 21:04:43.000000000 +0000
++++ gettext-0.21/libtextstyle/build-aux/test-driver 2021-03-25 21:41:20.000000000 +0000
+@@ -42,11 +42,13 @@
+ {
+ cat <<END
+ Usage:
+- test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+- [--expect-failure={yes|no}] [--color-tests={yes|no}]
+- [--enable-hard-errors={yes|no}] [--]
++ test-driver --test-name NAME --log-file PATH --trs-file PATH
++ [--expect-failure {yes|no}] [--color-tests {yes|no}]
++ [--enable-hard-errors {yes|no}] [--]
+ TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
++
+ The '--test-name', '--log-file' and '--trs-file' options are mandatory.
++See the GNU Automake documentation for information.
+ END
+ }
+
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/libtextstyle/configure gettext-0.21/libtextstyle/configure
+--- gettext-0.21.orig/libtextstyle/configure 2020-07-26 21:04:41.000000000 +0000
++++ gettext-0.21/libtextstyle/configure 2021-03-25 21:41:17.000000000 +0000
+@@ -3928,12 +3928,7 @@
+ am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/libtextstyle/doc/Makefile.in gettext-0.21/libtextstyle/doc/Makefile.in
+--- gettext-0.21.orig/libtextstyle/doc/Makefile.in 2020-07-26 21:04:42.000000000 +0000
++++ gettext-0.21/libtextstyle/doc/Makefile.in 2021-03-25 21:41:20.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/libtextstyle/lib/Makefile.in gettext-0.21/libtextstyle/lib/Makefile.in
+--- gettext-0.21.orig/libtextstyle/lib/Makefile.in 2020-07-26 21:04:43.000000000 +0000
++++ gettext-0.21/libtextstyle/lib/Makefile.in 2021-03-25 21:41:20.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -2832,7 +2832,8 @@
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+-install-exec: install-exec-am
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
+
+@@ -2942,7 +2943,7 @@
+ uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS \
+ uninstall-nobase_nodist_includeHEADERS
+
+-.MAKE: all check install install-am install-strip
++.MAKE: all check install install-am install-exec install-strip
+
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libLTLIBRARIES clean-libtool clean-local \
+diff -u --recursive --exclude-from=.ignore --exclude-from=./gettext-0.21/.gitignore gettext-0.21.orig/libtextstyle/tests/Makefile.in gettext-0.21/libtextstyle/tests/Makefile.in
+--- gettext-0.21.orig/libtextstyle/tests/Makefile.in 2020-07-26 21:04:43.000000000 +0000
++++ gettext-0.21/libtextstyle/tests/Makefile.in 2021-03-25 21:41:20.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -556,6 +556,7 @@
+ bases='$(TEST_LOGS)'; \
+ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+ bases=`echo $$bases`
++AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
+ RECHECK_LOGS = $(TEST_LOGS)
+ TEST_SUITE_LOG = test-suite.log
+ TEST_EXTENSIONS = @EXEEXT@ .test
+@@ -2201,7 +2202,7 @@
+ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
+ fi; \
+ echo "$${col}$$br$${std}"; \
+- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
++ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \
+ echo "$${col}$$br$${std}"; \
+ create_testsuite_report --maybe-color; \
+ echo "$$col$$br$$std"; \
+@@ -2332,7 +2333,8 @@
+ installdirs-am:
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
+-install-exec: install-exec-recursive
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive
+ install-data: install-data-recursive
+ uninstall: uninstall-recursive
+
+@@ -2446,7 +2448,7 @@
+ uninstall-am:
+
+ .MAKE: $(am__recursive_targets) all check check-am install install-am \
+- install-strip
++ install-exec install-strip
+
+ .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--depfiles check check-TESTS check-am clean \
diff --git a/3rdparty/ext_gettext/0005-Fix-libgettextpo-linking-on-macOS.patch b/3rdparty/ext_gettext/0005-Fix-libgettextpo-linking-on-macOS.patch
deleted file mode 100644
index f8fb853d02..0000000000
--- a/3rdparty/ext_gettext/0005-Fix-libgettextpo-linking-on-macOS.patch
+++ /dev/null
@@ -1,1940 +0,0 @@
-From bda3c9a4859be07fcf1366f9a1aeb7925c31daa6 Mon Sep 17 00:00:00 2001
-From: "L. E. Segovia" <amy at amyspark.me>
-Date: Sun, 21 Feb 2021 23:17:32 +0000
-Subject: [PATCH 5/5] Fix libgettextpo linking on macOS
-
----
- Makefile.in | 11 ++--
- aclocal.m4 | 13 ++--
- configure | 7 +--
- gettext-runtime/Makefile.in | 16 +++--
- gettext-runtime/aclocal.m4 | 13 ++--
- gettext-runtime/configure | 81 +++++++++++-------------
- gettext-runtime/doc/Makefile.in | 2 +-
- gettext-runtime/gnulib-lib/Makefile.in | 7 ++-
- gettext-runtime/intl-csharp/Makefile.in | 2 +-
- gettext-runtime/intl-java/Makefile.in | 2 +-
- gettext-runtime/intl/Makefile.in | 9 +--
- gettext-runtime/libasprintf/Makefile.in | 20 +++---
- gettext-runtime/libasprintf/aclocal.m4 | 13 ++--
- gettext-runtime/libasprintf/configure | 7 +--
- gettext-runtime/m4/Makefile.in | 2 +-
- gettext-runtime/man/Makefile.in | 2 +-
- gettext-runtime/src/Makefile.in | 2 +-
- gettext-runtime/tests/Makefile.in | 5 +-
- gettext-tools/Makefile.in | 11 ++--
- gettext-tools/aclocal.m4 | 13 ++--
- gettext-tools/configure | 83 ++++++++++++-------------
- gettext-tools/doc/Makefile.in | 2 +-
- gettext-tools/emacs/Makefile.in | 2 +-
- gettext-tools/examples/Makefile.in | 11 ++--
- gettext-tools/examples/aclocal.m4 | 13 ++--
- gettext-tools/examples/configure | 7 +--
- gettext-tools/examples/po/Makefile.in | 2 +-
- gettext-tools/gnulib-lib/Makefile.in | 8 ++-
- gettext-tools/gnulib-tests/Makefile.in | 10 +--
- gettext-tools/intl/Makefile.in | 9 +--
- gettext-tools/its/Makefile.in | 2 +-
- gettext-tools/libgettextpo/Makefile.am | 20 +++++-
- gettext-tools/libgettextpo/Makefile.in | 30 +++++++--
- gettext-tools/libgrep/Makefile.in | 7 ++-
- gettext-tools/m4/Makefile.in | 2 +-
- gettext-tools/man/Makefile.in | 2 +-
- gettext-tools/misc/Makefile.in | 2 +-
- gettext-tools/projects/Makefile.in | 2 +-
- gettext-tools/src/Makefile.in | 8 ++-
- gettext-tools/styles/Makefile.in | 2 +-
- gettext-tools/system-tests/Makefile.in | 5 +-
- gettext-tools/tests/Makefile.in | 5 +-
- gnulib-local/Makefile.in | 2 +-
- libtextstyle/Makefile.in | 12 ++--
- libtextstyle/aclocal.m4 | 13 ++--
- libtextstyle/adhoc-tests/Makefile.in | 2 +-
- libtextstyle/configure | 7 +--
- libtextstyle/doc/Makefile.in | 2 +-
- libtextstyle/lib/Makefile.in | 7 ++-
- libtextstyle/tests/Makefile.in | 10 +--
- 50 files changed, 270 insertions(+), 257 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 88c4f943..7e3e266f 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -207,6 +207,8 @@ am__relativize = \
- DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
- DIST_TARGETS = dist-gzip
-+# Exists only to be overridden by the user if desired.
-+AM_DISTCHECK_DVI_TARGET = dvi
- distuninstallcheck_listfiles = find . -type f -print
- am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-@@ -650,7 +652,7 @@ distcheck: dist
- $(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=../.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
-- && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-@@ -709,7 +711,8 @@ installdirs: installdirs-recursive
- installdirs-am:
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-recursive
--install-exec: install-exec-recursive
-+install-exec: $(BUILT_SOURCES)
-+ $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
-
-@@ -813,7 +816,7 @@ ps-am:
- uninstall-am:
-
- .MAKE: $(am__recursive_targets) all check install install-am \
-- install-strip
-+ install-exec install-strip
-
- .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--refresh check check-am clean clean-cscope clean-generic \
-diff --git a/aclocal.m4 b/aclocal.m4
-index 91123466..d98a2011 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
-
- # Copyright (C) 1996-2020 Free Software Foundation, Inc.
-
-@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.16'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.16.2], [],
-+m4_if([$1], [1.16.3], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.16.2])dnl
-+[AM_AUTOMAKE_VERSION([1.16.3])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -387,12 +387,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- AC_REQUIRE_AUX_FILE([missing])dnl
- if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
-+ MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-diff --git a/configure b/configure
-index ee81dbfc..a6dc9b1c 100755
---- a/configure
-+++ b/configure
-@@ -2100,12 +2100,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
- am_aux_dir=`cd "$ac_aux_dir" && pwd`
-
- if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
-+ MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-diff --git a/gettext-runtime/Makefile.in b/gettext-runtime/Makefile.in
-index de09d355..3dddbbc8 100644
---- a/gettext-runtime/Makefile.in
-+++ b/gettext-runtime/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -331,10 +331,12 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/../build-aux/missing \
- $(top_srcdir)/../build-aux/mkinstalldirs \
- ../build-aux/config.guess ../build-aux/config.rpath \
-- ../build-aux/config.sub ../build-aux/install-sh \
-- ../build-aux/ltmain.sh ../build-aux/missing \
-- ../build-aux/mkinstalldirs ../build-aux/texinfo.tex ABOUT-NLS \
-- AUTHORS COPYING ChangeLog INSTALL NEWS README
-+ ../build-aux/config.sub ../build-aux/depcomp \
-+ ../build-aux/install-sh ../build-aux/ltmain.sh \
-+ ../build-aux/mdate-sh ../build-aux/missing \
-+ ../build-aux/mkinstalldirs ../build-aux/texinfo.tex \
-+ ../build-aux/ylwrap ABOUT-NLS AUTHORS COPYING ChangeLog \
-+ INSTALL NEWS README
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -373,6 +375,8 @@ am__relativize = \
- DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
- DIST_TARGETS = dist-gzip
-+# Exists only to be overridden by the user if desired.
-+AM_DISTCHECK_DVI_TARGET = dvi
- distuninstallcheck_listfiles = find . -type f -print
- am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-@@ -1710,7 +1714,7 @@ distcheck: dist
- $(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=../.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
-- && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-diff --git a/gettext-runtime/aclocal.m4 b/gettext-runtime/aclocal.m4
-index 3140f2ab..cd35a62f 100644
---- a/gettext-runtime/aclocal.m4
-+++ b/gettext-runtime/aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
-
- # Copyright (C) 1996-2020 Free Software Foundation, Inc.
-
-@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.16'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.16.2], [],
-+m4_if([$1], [1.16.3], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.16.2])dnl
-+[AM_AUTOMAKE_VERSION([1.16.3])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -703,12 +703,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- AC_REQUIRE_AUX_FILE([missing])dnl
- if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
-+ MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-diff --git a/gettext-runtime/configure b/gettext-runtime/configure
-index a41d886f..298234d2 100755
---- a/gettext-runtime/configure
-+++ b/gettext-runtime/configure
-@@ -3797,12 +3797,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
- am_aux_dir=`cd "$ac_aux_dir" && pwd`
-
- if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
-+ MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-@@ -6152,23 +6147,23 @@ EOF
- if $JAVAC --version 2>/dev/null | sed -e 1q | grep gcj > /dev/null; then
- if $JAVAC --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
- rm -f conftest.class
-- if { echo "$as_me:6155: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:6150: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6162: $JAVAC -fsource=$source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6157: $JAVAC -fsource=$source_version -d . conftest.java" >&5
- $JAVAC -fsource="$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:6167: $JAVAC -d . conftestfail.java" >&5
-+ && { echo "$as_me:6162: $JAVAC -d . conftestfail.java" >&5
- $JAVAC -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6171: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6166: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
- $JAVAC -fsource="$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="$JAVAC -fsource=$source_version"
-@@ -6182,7 +6177,7 @@ EOF
- else
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6185: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
-+ if { echo "$as_me:6180: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
- $JAVAC -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -6195,7 +6190,7 @@ EOF
- else
- if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
- rm -f conftest.class
-- if { echo "$as_me:6198: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:6193: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -6207,7 +6202,7 @@ EOF
- if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
- javac_works=
- rm -f conftest.class
-- if { echo "$as_me:6210: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:6205: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -6215,7 +6210,7 @@ EOF
- fi
- javac_noassert_works=
- rm -f conftest.class
-- if { echo "$as_me:6218: $JAVAC -fno-assert -d . conftest.java" >&5
-+ if { echo "$as_me:6213: $JAVAC -fno-assert -d . conftest.java" >&5
- $JAVAC -fno-assert -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -6223,11 +6218,11 @@ EOF
- fi
- if test -n "$javac_works" && test -n "$javac_noassert_works"; then
- rm -f conftestfail.class
-- if { echo "$as_me:6226: $JAVAC -d . conftestfail.java" >&5
-+ if { echo "$as_me:6221: $JAVAC -d . conftestfail.java" >&5
- $JAVAC -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6230: $JAVAC -fno-assert -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6225: $JAVAC -fno-assert -d . conftestfail.java" >&5
- $JAVAC -fno-assert -d . conftestfail.java >&5 2>&1
- }; then
- javac_works=
-@@ -6255,23 +6250,23 @@ EOF
- esac
- fi
- rm -f conftest.class
-- if { echo "$as_me:6258: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:6253: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6265: $JAVAC -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6260: $JAVAC -source $source_version -d . conftest.java" >&5
- $JAVAC -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:6270: $JAVAC -d . conftestfail.java" >&5
-+ && { echo "$as_me:6265: $JAVAC -d . conftestfail.java" >&5
- $JAVAC -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6274: $JAVAC -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6269: $JAVAC -source $source_version -d . conftestfail.java" >&5
- $JAVAC -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="$JAVAC -source $source_version"
-@@ -6284,23 +6279,23 @@ EOF
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:6287: $JAVAC -target $target_version -d . conftest.java" >&5
-+ if { echo "$as_me:6282: $JAVAC -target $target_version -d . conftest.java" >&5
- $JAVAC -target "$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6294: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6289: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
- $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:6299: $JAVAC -target $target_version -d . conftestfail.java" >&5
-+ && { echo "$as_me:6294: $JAVAC -target $target_version -d . conftestfail.java" >&5
- $JAVAC -target "$target_version" -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6303: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6298: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
- $JAVAC -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="$JAVAC -target $target_version -source $source_version"
-@@ -6313,7 +6308,7 @@ EOF
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:6316: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6311: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
- $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -6431,28 +6426,28 @@ fi
-
- if test -z "$HAVE_JAVACOMP" && test -n "$HAVE_GCJ_IN_PATH"; then
- if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[01]/d' | grep '^[3-9]' >/dev/null; then
-- if { echo "$as_me:6434: gcj -C -d . conftestlib.java" >&5
-+ if { echo "$as_me:6429: gcj -C -d . conftestlib.java" >&5
- gcj -C -d . conftestlib.java >&5 2>&1
- }; then
- if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
- rm -f conftest.class
-- if { echo "$as_me:6439: gcj -C -d . conftest.java" >&5
-+ if { echo "$as_me:6434: gcj -C -d . conftest.java" >&5
- gcj -C -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6446: gcj -C -fsource=$source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6441: gcj -C -fsource=$source_version -d . conftest.java" >&5
- gcj -C -fsource="$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:6451: gcj -C -d . conftestfail.java" >&5
-+ && { echo "$as_me:6446: gcj -C -d . conftestfail.java" >&5
- gcj -C -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6455: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6450: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
- gcj -C -fsource="$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="gcj -C -fsource=$source_version"
-@@ -6466,7 +6461,7 @@ fi
- else
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6469: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
-+ if { echo "$as_me:6464: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
- gcj -C -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -6479,7 +6474,7 @@ fi
- else
- if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
- rm -f conftest.class
-- if { echo "$as_me:6482: gcj -C -d . conftest.java" >&5
-+ if { echo "$as_me:6477: gcj -C -d . conftest.java" >&5
- gcj -C -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -6490,7 +6485,7 @@ fi
- else
- if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
- rm -f conftest.class
-- if { echo "$as_me:6493: gcj -C -fno-assert -d . conftest.java" >&5
-+ if { echo "$as_me:6488: gcj -C -fno-assert -d . conftest.java" >&5
- gcj -C -fno-assert -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -6499,7 +6494,7 @@ fi
- HAVE_JAVACOMP=1
- else
- rm -f conftest.class
-- if { echo "$as_me:6502: gcj -C -d . conftest.java" >&5
-+ if { echo "$as_me:6497: gcj -C -d . conftest.java" >&5
- gcj -C -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -6524,23 +6519,23 @@ fi
- esac
- fi
- rm -f conftest.class
-- if { echo "$as_me:6527: javac -d . conftest.java" >&5
-+ if { echo "$as_me:6522: javac -d . conftest.java" >&5
- javac -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6534: javac -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6529: javac -source $source_version -d . conftest.java" >&5
- javac -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:6539: javac -d . conftestfail.java" >&5
-+ && { echo "$as_me:6534: javac -d . conftestfail.java" >&5
- javac -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6543: javac -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6538: javac -source $source_version -d . conftestfail.java" >&5
- javac -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="javac -source $source_version"
-@@ -6553,23 +6548,23 @@ fi
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:6556: javac -target $target_version -d . conftest.java" >&5
-+ if { echo "$as_me:6551: javac -target $target_version -d . conftest.java" >&5
- javac -target "$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6563: javac -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6558: javac -target $target_version -source $source_version -d . conftest.java" >&5
- javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:6568: javac -target $target_version -d . conftestfail.java" >&5
-+ && { echo "$as_me:6563: javac -target $target_version -d . conftestfail.java" >&5
- javac -target "$target_version" -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6572: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6567: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
- javac -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="javac -target $target_version -source $source_version"
-@@ -6582,7 +6577,7 @@ fi
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:6585: javac -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6580: javac -target $target_version -source $source_version -d . conftest.java" >&5
- javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-diff --git a/gettext-runtime/doc/Makefile.in b/gettext-runtime/doc/Makefile.in
-index c12c75a7..340751d4 100644
---- a/gettext-runtime/doc/Makefile.in
-+++ b/gettext-runtime/doc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-runtime/gnulib-lib/Makefile.in b/gettext-runtime/gnulib-lib/Makefile.in
-index 5c5fa1df..e3d11378 100644
---- a/gettext-runtime/gnulib-lib/Makefile.in
-+++ b/gettext-runtime/gnulib-lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -1834,7 +1834,8 @@ installdirs: installdirs-recursive
- installdirs-am:
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-recursive
--install-exec: install-exec-recursive
-+install-exec: $(BUILT_SOURCES)
-+ $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
-
-@@ -1943,7 +1944,7 @@ uninstall-am:
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
- .MAKE: $(am__recursive_targets) all check install install-am \
-- install-strip uninstall-am
-+ install-exec install-strip uninstall-am
-
- .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
- check-am clean clean-generic clean-libtool \
-diff --git a/gettext-runtime/intl-csharp/Makefile.in b/gettext-runtime/intl-csharp/Makefile.in
-index a1005891..37ea6323 100644
---- a/gettext-runtime/intl-csharp/Makefile.in
-+++ b/gettext-runtime/intl-csharp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-runtime/intl-java/Makefile.in b/gettext-runtime/intl-java/Makefile.in
-index 6182a942..4f0ca720 100644
---- a/gettext-runtime/intl-java/Makefile.in
-+++ b/gettext-runtime/intl-java/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
-index 7999d345..5f3f9a8a 100644
---- a/gettext-runtime/intl/Makefile.in
-+++ b/gettext-runtime/intl/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -1787,7 +1787,8 @@ installdirs: installdirs-local
- done
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
--install-exec: install-exec-am
-+install-exec: $(BUILT_SOURCES)
-+ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
-
-@@ -1822,9 +1823,9 @@ maintainer-clean-generic:
- -rm -f plural.c
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-- at PRELOADABLE_LIBINTL_FALSE@@USE_INCLUDED_LIBINTL_FALSE at install-exec-local:
- @PACKAGE_IS_GETTEXT_TOOLS_FALSE@@USE_INCLUDED_LIBINTL_FALSE at install-data-local:
- @PACKAGE_IS_GETTEXT_TOOLS_FALSE@@PRELOADABLE_LIBINTL_FALSE@@USE_INCLUDED_LIBINTL_FALSE at uninstall-local:
-+ at PRELOADABLE_LIBINTL_FALSE@@USE_INCLUDED_LIBINTL_FALSE at install-exec-local:
- clean: clean-am
-
- clean-am: clean-generic clean-libtool clean-local \
-@@ -1894,7 +1895,7 @@ ps-am:
-
- uninstall-am: uninstall-local uninstall-nodist_includeHEADERS
-
--.MAKE: all check install install-am install-strip
-+.MAKE: all check install install-am install-exec install-strip
-
- .PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
- clean-generic clean-libtool clean-local \
-diff --git a/gettext-runtime/libasprintf/Makefile.in b/gettext-runtime/libasprintf/Makefile.in
-index 44f19859..0aa11cb3 100644
---- a/gettext-runtime/libasprintf/Makefile.in
-+++ b/gettext-runtime/libasprintf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -350,11 +350,12 @@ am__DIST_COMMON = $(autosprintf_TEXINFOS) $(srcdir)/Makefile.gnulib \
- $(top_srcdir)/../../build-aux/mkinstalldirs \
- $(top_srcdir)/../../build-aux/texinfo.tex \
- ../../build-aux/config.guess ../../build-aux/config.rpath \
-- ../../build-aux/config.sub ../../build-aux/install-sh \
-- ../../build-aux/ltmain.sh ../../build-aux/missing \
-+ ../../build-aux/config.sub ../../build-aux/depcomp \
-+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
-+ ../../build-aux/mdate-sh ../../build-aux/missing \
- ../../build-aux/mkinstalldirs ../../build-aux/texinfo.tex \
-- AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README \
-- alloca.c
-+ ../../build-aux/ylwrap AUTHORS COPYING COPYING.LIB ChangeLog \
-+ INSTALL NEWS README alloca.c
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -368,6 +369,8 @@ am__post_remove_distdir = $(am__remove_distdir)
- DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
- DIST_TARGETS = dist-gzip
-+# Exists only to be overridden by the user if desired.
-+AM_DISTCHECK_DVI_TARGET = dvi
- distuninstallcheck_listfiles = find . -type f -print
- am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-@@ -1086,7 +1089,7 @@ distcheck: dist
- $(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=../.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
-- && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-@@ -1148,7 +1151,8 @@ installdirs: installdirs-local
- done
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
--install-exec: install-exec-am
-+install-exec: $(BUILT_SOURCES)
-+ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
-
-@@ -1348,7 +1352,7 @@ uninstall-am: uninstall-dvi-am uninstall-html-am \
- uninstall-libLTLIBRARIES uninstall-local uninstall-pdf-am \
- uninstall-ps-am
-
--.MAKE: all check install install-am install-strip
-+.MAKE: all check install install-am install-exec install-strip
-
- .PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \
- check-am clean clean-aminfo clean-cscope clean-generic \
-diff --git a/gettext-runtime/libasprintf/aclocal.m4 b/gettext-runtime/libasprintf/aclocal.m4
-index e4fd3b44..484ebecd 100644
---- a/gettext-runtime/libasprintf/aclocal.m4
-+++ b/gettext-runtime/libasprintf/aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
-
- # Copyright (C) 1996-2020 Free Software Foundation, Inc.
-
-@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.16'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.16.2], [],
-+m4_if([$1], [1.16.3], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.16.2])dnl
-+[AM_AUTOMAKE_VERSION([1.16.3])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -703,12 +703,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- AC_REQUIRE_AUX_FILE([missing])dnl
- if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
-+ MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-diff --git a/gettext-runtime/libasprintf/configure b/gettext-runtime/libasprintf/configure
-index 59e6c288..c127654f 100755
---- a/gettext-runtime/libasprintf/configure
-+++ b/gettext-runtime/libasprintf/configure
-@@ -2873,12 +2873,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
- am_aux_dir=`cd "$ac_aux_dir" && pwd`
-
- if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
-+ MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-diff --git a/gettext-runtime/m4/Makefile.in b/gettext-runtime/m4/Makefile.in
-index 7c04653c..dbd57d9d 100644
---- a/gettext-runtime/m4/Makefile.in
-+++ b/gettext-runtime/m4/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-runtime/man/Makefile.in b/gettext-runtime/man/Makefile.in
-index e2272967..e1a1c62c 100644
---- a/gettext-runtime/man/Makefile.in
-+++ b/gettext-runtime/man/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-runtime/src/Makefile.in b/gettext-runtime/src/Makefile.in
-index 6fab17df..4f543e76 100644
---- a/gettext-runtime/src/Makefile.in
-+++ b/gettext-runtime/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-runtime/tests/Makefile.in b/gettext-runtime/tests/Makefile.in
-index 1afff7cb..094fcb32 100644
---- a/gettext-runtime/tests/Makefile.in
-+++ b/gettext-runtime/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -433,6 +433,7 @@ am__set_TESTS_bases = \
- bases='$(TEST_LOGS)'; \
- bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
- bases=`echo $$bases`
-+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
- RECHECK_LOGS = $(TEST_LOGS)
- AM_RECURSIVE_TARGETS = check recheck
- TEST_SUITE_LOG = test-suite.log
-@@ -1601,7 +1602,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
- test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
- fi; \
- echo "$${col}$$br$${std}"; \
-- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
-+ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \
- echo "$${col}$$br$${std}"; \
- create_testsuite_report --maybe-color; \
- echo "$$col$$br$$std"; \
-diff --git a/gettext-tools/Makefile.in b/gettext-tools/Makefile.in
-index 433bf948..68984046 100644
---- a/gettext-tools/Makefile.in
-+++ b/gettext-tools/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -521,8 +521,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/../build-aux/missing \
- $(top_srcdir)/../build-aux/mkinstalldirs \
- ../build-aux/config.guess ../build-aux/config.rpath \
-- ../build-aux/config.sub ../build-aux/install-sh \
-- ../build-aux/ltmain.sh ../build-aux/missing \
-+ ../build-aux/config.sub ../build-aux/depcomp \
-+ ../build-aux/install-sh ../build-aux/ltmain.sh \
-+ ../build-aux/mdate-sh ../build-aux/missing \
- ../build-aux/mkinstalldirs ../build-aux/texinfo.tex \
- ../build-aux/ylwrap ABOUT-NLS AUTHORS COPYING ChangeLog \
- INSTALL NEWS README
-@@ -564,6 +565,8 @@ am__relativize = \
- DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
- DIST_TARGETS = dist-gzip
-+# Exists only to be overridden by the user if desired.
-+AM_DISTCHECK_DVI_TARGET = dvi
- distuninstallcheck_listfiles = find . -type f -print
- am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-@@ -2598,7 +2601,7 @@ distcheck: dist
- $(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=../.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
-- && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-diff --git a/gettext-tools/aclocal.m4 b/gettext-tools/aclocal.m4
-index eaea7920..3ec3cd48 100644
---- a/gettext-tools/aclocal.m4
-+++ b/gettext-tools/aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
-
- # Copyright (C) 1996-2020 Free Software Foundation, Inc.
-
-@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.16'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.16.2], [],
-+m4_if([$1], [1.16.3], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.16.2])dnl
-+[AM_AUTOMAKE_VERSION([1.16.3])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -750,12 +750,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- AC_REQUIRE_AUX_FILE([missing])dnl
- if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
-+ MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-diff --git a/gettext-tools/configure b/gettext-tools/configure
-index 9737c50d..b8970aea 100755
---- a/gettext-tools/configure
-+++ b/gettext-tools/configure
-@@ -4723,12 +4723,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
- am_aux_dir=`cd "$ac_aux_dir" && pwd`
-
- if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
-+ MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-@@ -7238,7 +7233,7 @@ EOF
- > conftestver.class
- target_version=`{
- unset JAVA_HOME
-- echo "$as_me:7241: CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver" >&5
-+ echo "$as_me:7236: CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver" >&5
- CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver 2>&5
- }`
- case "$target_version" in
-@@ -7323,23 +7318,23 @@ EOF
- if $JAVAC --version 2>/dev/null | sed -e 1q | grep gcj > /dev/null; then
- if $JAVAC --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
- rm -f conftest.class
-- if { echo "$as_me:7326: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:7321: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:7333: $JAVAC -fsource=$source_version -d . conftest.java" >&5
-+ if { echo "$as_me:7328: $JAVAC -fsource=$source_version -d . conftest.java" >&5
- $JAVAC -fsource="$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:7338: $JAVAC -d . conftestfail.java" >&5
-+ && { echo "$as_me:7333: $JAVAC -d . conftestfail.java" >&5
- $JAVAC -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:7342: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:7337: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
- $JAVAC -fsource="$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="$JAVAC -fsource=$source_version"
-@@ -7353,7 +7348,7 @@ EOF
- else
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:7356: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
-+ if { echo "$as_me:7351: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
- $JAVAC -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -7366,7 +7361,7 @@ EOF
- else
- if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
- rm -f conftest.class
-- if { echo "$as_me:7369: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:7364: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -7378,7 +7373,7 @@ EOF
- if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
- javac_works=
- rm -f conftest.class
-- if { echo "$as_me:7381: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:7376: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -7386,7 +7381,7 @@ EOF
- fi
- javac_noassert_works=
- rm -f conftest.class
-- if { echo "$as_me:7389: $JAVAC -fno-assert -d . conftest.java" >&5
-+ if { echo "$as_me:7384: $JAVAC -fno-assert -d . conftest.java" >&5
- $JAVAC -fno-assert -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -7394,11 +7389,11 @@ EOF
- fi
- if test -n "$javac_works" && test -n "$javac_noassert_works"; then
- rm -f conftestfail.class
-- if { echo "$as_me:7397: $JAVAC -d . conftestfail.java" >&5
-+ if { echo "$as_me:7392: $JAVAC -d . conftestfail.java" >&5
- $JAVAC -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:7401: $JAVAC -fno-assert -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:7396: $JAVAC -fno-assert -d . conftestfail.java" >&5
- $JAVAC -fno-assert -d . conftestfail.java >&5 2>&1
- }; then
- javac_works=
-@@ -7426,23 +7421,23 @@ EOF
- esac
- fi
- rm -f conftest.class
-- if { echo "$as_me:7429: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:7424: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:7436: $JAVAC -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:7431: $JAVAC -source $source_version -d . conftest.java" >&5
- $JAVAC -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:7441: $JAVAC -d . conftestfail.java" >&5
-+ && { echo "$as_me:7436: $JAVAC -d . conftestfail.java" >&5
- $JAVAC -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:7445: $JAVAC -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:7440: $JAVAC -source $source_version -d . conftestfail.java" >&5
- $JAVAC -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="$JAVAC -source $source_version"
-@@ -7455,23 +7450,23 @@ EOF
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:7458: $JAVAC -target $target_version -d . conftest.java" >&5
-+ if { echo "$as_me:7453: $JAVAC -target $target_version -d . conftest.java" >&5
- $JAVAC -target "$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:7465: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:7460: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
- $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:7470: $JAVAC -target $target_version -d . conftestfail.java" >&5
-+ && { echo "$as_me:7465: $JAVAC -target $target_version -d . conftestfail.java" >&5
- $JAVAC -target "$target_version" -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:7474: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:7469: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
- $JAVAC -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="$JAVAC -target $target_version -source $source_version"
-@@ -7484,7 +7479,7 @@ EOF
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:7487: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:7482: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
- $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -7602,28 +7597,28 @@ fi
-
- if test -z "$HAVE_JAVACOMP" && test -n "$HAVE_GCJ_IN_PATH"; then
- if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[01]/d' | grep '^[3-9]' >/dev/null; then
-- if { echo "$as_me:7605: gcj -C -d . conftestlib.java" >&5
-+ if { echo "$as_me:7600: gcj -C -d . conftestlib.java" >&5
- gcj -C -d . conftestlib.java >&5 2>&1
- }; then
- if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
- rm -f conftest.class
-- if { echo "$as_me:7610: gcj -C -d . conftest.java" >&5
-+ if { echo "$as_me:7605: gcj -C -d . conftest.java" >&5
- gcj -C -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:7617: gcj -C -fsource=$source_version -d . conftest.java" >&5
-+ if { echo "$as_me:7612: gcj -C -fsource=$source_version -d . conftest.java" >&5
- gcj -C -fsource="$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:7622: gcj -C -d . conftestfail.java" >&5
-+ && { echo "$as_me:7617: gcj -C -d . conftestfail.java" >&5
- gcj -C -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:7626: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:7621: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
- gcj -C -fsource="$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="gcj -C -fsource=$source_version"
-@@ -7637,7 +7632,7 @@ fi
- else
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:7640: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
-+ if { echo "$as_me:7635: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
- gcj -C -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -7650,7 +7645,7 @@ fi
- else
- if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
- rm -f conftest.class
-- if { echo "$as_me:7653: gcj -C -d . conftest.java" >&5
-+ if { echo "$as_me:7648: gcj -C -d . conftest.java" >&5
- gcj -C -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -7661,7 +7656,7 @@ fi
- else
- if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
- rm -f conftest.class
-- if { echo "$as_me:7664: gcj -C -fno-assert -d . conftest.java" >&5
-+ if { echo "$as_me:7659: gcj -C -fno-assert -d . conftest.java" >&5
- gcj -C -fno-assert -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -7670,7 +7665,7 @@ fi
- HAVE_JAVACOMP=1
- else
- rm -f conftest.class
-- if { echo "$as_me:7673: gcj -C -d . conftest.java" >&5
-+ if { echo "$as_me:7668: gcj -C -d . conftest.java" >&5
- gcj -C -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -7695,23 +7690,23 @@ fi
- esac
- fi
- rm -f conftest.class
-- if { echo "$as_me:7698: javac -d . conftest.java" >&5
-+ if { echo "$as_me:7693: javac -d . conftest.java" >&5
- javac -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:7705: javac -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:7700: javac -source $source_version -d . conftest.java" >&5
- javac -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:7710: javac -d . conftestfail.java" >&5
-+ && { echo "$as_me:7705: javac -d . conftestfail.java" >&5
- javac -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:7714: javac -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:7709: javac -source $source_version -d . conftestfail.java" >&5
- javac -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="javac -source $source_version"
-@@ -7724,23 +7719,23 @@ fi
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:7727: javac -target $target_version -d . conftest.java" >&5
-+ if { echo "$as_me:7722: javac -target $target_version -d . conftest.java" >&5
- javac -target "$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:7734: javac -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:7729: javac -target $target_version -source $source_version -d . conftest.java" >&5
- javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:7739: javac -target $target_version -d . conftestfail.java" >&5
-+ && { echo "$as_me:7734: javac -target $target_version -d . conftestfail.java" >&5
- javac -target "$target_version" -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:7743: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:7738: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
- javac -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="javac -target $target_version -source $source_version"
-@@ -7753,7 +7748,7 @@ fi
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:7756: javac -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:7751: javac -target $target_version -source $source_version -d . conftest.java" >&5
- javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-diff --git a/gettext-tools/doc/Makefile.in b/gettext-tools/doc/Makefile.in
-index b707f00a..92bac66f 100644
---- a/gettext-tools/doc/Makefile.in
-+++ b/gettext-tools/doc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-tools/emacs/Makefile.in b/gettext-tools/emacs/Makefile.in
-index ac936955..a4f1eb9f 100644
---- a/gettext-tools/emacs/Makefile.in
-+++ b/gettext-tools/emacs/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-tools/examples/Makefile.in b/gettext-tools/examples/Makefile.in
-index 5da2c68c..cf2952e1 100644
---- a/gettext-tools/examples/Makefile.in
-+++ b/gettext-tools/examples/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -192,8 +192,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/installpaths.in \
- $(top_srcdir)/../../build-aux/missing \
- $(top_srcdir)/../../build-aux/mkinstalldirs \
- ../../build-aux/config.guess ../../build-aux/config.rpath \
-- ../../build-aux/config.sub ../../build-aux/install-sh \
-- ../../build-aux/ltmain.sh ../../build-aux/missing \
-+ ../../build-aux/config.sub ../../build-aux/depcomp \
-+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
-+ ../../build-aux/mdate-sh ../../build-aux/missing \
- ../../build-aux/mkinstalldirs ../../build-aux/texinfo.tex \
- ../../build-aux/ylwrap ChangeLog README
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -234,6 +235,8 @@ am__relativize = \
- DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
- DIST_TARGETS = dist-gzip
-+# Exists only to be overridden by the user if desired.
-+AM_DISTCHECK_DVI_TARGET = dvi
- distuninstallcheck_listfiles = find . -type f -print
- am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-@@ -1071,7 +1074,7 @@ distcheck: dist
- $(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=../.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
-- && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-diff --git a/gettext-tools/examples/aclocal.m4 b/gettext-tools/examples/aclocal.m4
-index 6e8549d1..56f1ff94 100644
---- a/gettext-tools/examples/aclocal.m4
-+++ b/gettext-tools/examples/aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
-
- # Copyright (C) 1996-2020 Free Software Foundation, Inc.
-
-@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.16'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.16.2], [],
-+m4_if([$1], [1.16.3], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.16.2])dnl
-+[AM_AUTOMAKE_VERSION([1.16.3])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -370,12 +370,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- AC_REQUIRE_AUX_FILE([missing])dnl
- if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
-+ MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-diff --git a/gettext-tools/examples/configure b/gettext-tools/examples/configure
-index 713d9eb7..1e6db493 100755
---- a/gettext-tools/examples/configure
-+++ b/gettext-tools/examples/configure
-@@ -1927,12 +1927,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
- am_aux_dir=`cd "$ac_aux_dir" && pwd`
-
- if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
-+ MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-diff --git a/gettext-tools/examples/po/Makefile.in b/gettext-tools/examples/po/Makefile.in
-index 1a4c56f0..f8960ba8 100644
---- a/gettext-tools/examples/po/Makefile.in
-+++ b/gettext-tools/examples/po/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-tools/gnulib-lib/Makefile.in b/gettext-tools/gnulib-lib/Makefile.in
-index 2768a0ff..936ffb7d 100644
---- a/gettext-tools/gnulib-lib/Makefile.in
-+++ b/gettext-tools/gnulib-lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -3465,7 +3465,8 @@ installdirs:
- done
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
--install-exec: install-exec-am
-+install-exec: $(BUILT_SOURCES)
-+ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
-
-@@ -3579,7 +3580,8 @@ ps-am:
- uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgdataDATA
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
--.MAKE: all check install install-am install-strip uninstall-am
-+.MAKE: all check install install-am install-exec install-strip \
-+ uninstall-am
-
- .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
-diff --git a/gettext-tools/gnulib-tests/Makefile.in b/gettext-tools/gnulib-tests/Makefile.in
-index 5d995720..bca4de1f 100644
---- a/gettext-tools/gnulib-tests/Makefile.in
-+++ b/gettext-tools/gnulib-tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -2531,6 +2531,7 @@ am__set_TESTS_bases = \
- bases='$(TEST_LOGS)'; \
- bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
- bases=`echo $$bases`
-+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
- RECHECK_LOGS = $(TEST_LOGS)
- TEST_SUITE_LOG = test-suite.log
- TEST_EXTENSIONS = @EXEEXT@ .test
-@@ -6251,7 +6252,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
- test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
- fi; \
- echo "$${col}$$br$${std}"; \
-- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
-+ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \
- echo "$${col}$$br$${std}"; \
- create_testsuite_report --maybe-color; \
- echo "$$col$$br$$std"; \
-@@ -8230,7 +8231,8 @@ installdirs: installdirs-recursive
- installdirs-am:
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-recursive
--install-exec: install-exec-recursive
-+install-exec: $(BUILT_SOURCES)
-+ $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
-
-@@ -8940,7 +8942,7 @@ ps-am:
- uninstall-am:
-
- .MAKE: $(am__recursive_targets) all check check-am install install-am \
-- install-strip
-+ install-exec install-strip
-
- .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--depfiles check check-TESTS check-am clean \
-diff --git a/gettext-tools/intl/Makefile.in b/gettext-tools/intl/Makefile.in
-index 97989ec6..84f8c4a9 100644
---- a/gettext-tools/intl/Makefile.in
-+++ b/gettext-tools/intl/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -2622,7 +2622,8 @@ installdirs: installdirs-local
- done
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
--install-exec: install-exec-am
-+install-exec: $(BUILT_SOURCES)
-+ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
-
-@@ -2657,9 +2658,9 @@ maintainer-clean-generic:
- -rm -f plural.c
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+ at PACKAGE_IS_GETTEXT_TOOLS_FALSE@@USE_INCLUDED_LIBINTL_FALSE at install-data-local:
- @PRELOADABLE_LIBINTL_FALSE@@USE_INCLUDED_LIBINTL_FALSE at install-exec-local:
- @PACKAGE_IS_GETTEXT_TOOLS_FALSE@@PRELOADABLE_LIBINTL_FALSE@@USE_INCLUDED_LIBINTL_FALSE at uninstall-local:
-- at PACKAGE_IS_GETTEXT_TOOLS_FALSE@@USE_INCLUDED_LIBINTL_FALSE at install-data-local:
- clean: clean-am
-
- clean-am: clean-generic clean-libtool clean-local \
-@@ -2729,7 +2730,7 @@ ps-am:
-
- uninstall-am: uninstall-local uninstall-nodist_includeHEADERS
-
--.MAKE: all check install install-am install-strip
-+.MAKE: all check install install-am install-exec install-strip
-
- .PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
- clean-generic clean-libtool clean-local \
-diff --git a/gettext-tools/its/Makefile.in b/gettext-tools/its/Makefile.in
-index 7049e9ef..bcdd4030 100644
---- a/gettext-tools/its/Makefile.in
-+++ b/gettext-tools/its/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
-index 59b016ee..fe3b27e7 100644
---- a/gettext-tools/libgettextpo/Makefile.am
-+++ b/gettext-tools/libgettextpo/Makefile.am
-@@ -107,7 +107,25 @@ LTV_AGE=5
- # How to build libgettextpo.la.
- # Don't make it depend on libgettextsrc.la or libgettextlib.la, since they
- # define an uncontrolled amount of symbols.
--libgettextpo_la_LIBADD = libgnu.la $(WOE32_LIBADD) $(LTLIBUNISTRING)
-+# Amyspark: Need @LTLIBTEXTSTYLE@ because in macOS the linker will complain:
-+# Undefined symbols for architecture x86_64:
-+# "_file_ostream_create", referenced from:
-+# _msgdomain_list_print in write-catalog.o
-+# "_ostream_free", referenced from:
-+# _msgdomain_list_print in write-catalog.o
-+# "_ostream_write_mem", referenced from:
-+# _message_print_comment in write-po.o
-+# _wrap in write-po.o
-+# "_ostream_write_str", referenced from:
-+# _message_print_comment in write-po.o
-+# _message_print_comment_dot in write-po.o
-+# _message_print_comment_filepos in write-po.o
-+# _message_print_comment_flags in write-po.o
-+# _msgdomain_list_print_po in write-po.o
-+# _wrap in write-po.o
-+# ld: symbol(s) not found for architecture x86_64
-+# clang: error: linker command failed with exit code 1 (use -v to see invocation)
-+libgettextpo_la_LIBADD = libgnu.la ../../libtextstyle/lib/libtextstyle.la $(WOE32_LIBADD) $(LTLIBUNISTRING)
- libgettextpo_la_LDFLAGS = \
- -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
- -rpath $(libdir) \
-diff --git a/gettext-tools/libgettextpo/Makefile.in b/gettext-tools/libgettextpo/Makefile.in
-index f76efa54..43f6a300 100644
---- a/gettext-tools/libgettextpo/Makefile.in
-+++ b/gettext-tools/libgettextpo/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -557,7 +557,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
- LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
- @WOE32_TRUE at am__DEPENDENCIES_1 = libgettextpo.res.lo
- am__DEPENDENCIES_2 =
--libgettextpo_la_DEPENDENCIES = libgnu.la $(am__DEPENDENCIES_1) \
-+libgettextpo_la_DEPENDENCIES = libgnu.la \
-+ ../../libtextstyle/lib/libtextstyle.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2)
- am__libgettextpo_la_SOURCES_DIST = gettext-po.c ../src/str-list.c \
- ../src/dir-list.c ../src/message.c ../src/msgl-ascii.c \
-@@ -2545,7 +2546,25 @@ LTV_AGE = 5
- # How to build libgettextpo.la.
- # Don't make it depend on libgettextsrc.la or libgettextlib.la, since they
- # define an uncontrolled amount of symbols.
--libgettextpo_la_LIBADD = libgnu.la $(WOE32_LIBADD) $(LTLIBUNISTRING)
-+# Amyspark: Need @LTLIBTEXTSTYLE@ because in macOS the linker will complain:
-+# Undefined symbols for architecture x86_64:
-+# "_file_ostream_create", referenced from:
-+# _msgdomain_list_print in write-catalog.o
-+# "_ostream_free", referenced from:
-+# _msgdomain_list_print in write-catalog.o
-+# "_ostream_write_mem", referenced from:
-+# _message_print_comment in write-po.o
-+# _wrap in write-po.o
-+# "_ostream_write_str", referenced from:
-+# _message_print_comment in write-po.o
-+# _message_print_comment_dot in write-po.o
-+# _message_print_comment_filepos in write-po.o
-+# _message_print_comment_flags in write-po.o
-+# _msgdomain_list_print_po in write-po.o
-+# _wrap in write-po.o
-+# ld: symbol(s) not found for architecture x86_64
-+# clang: error: linker command failed with exit code 1 (use -v to see invocation)
-+libgettextpo_la_LIBADD = libgnu.la ../../libtextstyle/lib/libtextstyle.la $(WOE32_LIBADD) $(LTLIBUNISTRING)
- libgettextpo_la_LDFLAGS = -version-info \
- $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) -rpath $(libdir) \
- @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined $(am__append_2) \
-@@ -2976,7 +2995,8 @@ installdirs:
- done
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
--install-exec: install-exec-am
-+install-exec: $(BUILT_SOURCES)
-+ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
-
-@@ -3087,7 +3107,7 @@ ps-am:
-
- uninstall-am: uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS
-
--.MAKE: all check install install-am install-strip
-+.MAKE: all check install install-am install-exec install-strip
-
- .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
-diff --git a/gettext-tools/libgrep/Makefile.in b/gettext-tools/libgrep/Makefile.in
-index 43a7d9d0..0668d774 100644
---- a/gettext-tools/libgrep/Makefile.in
-+++ b/gettext-tools/libgrep/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -2385,7 +2385,8 @@ all-am: Makefile $(LIBRARIES)
- installdirs:
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
--install-exec: install-exec-am
-+install-exec: $(BUILT_SOURCES)
-+ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
-
-@@ -2489,7 +2490,7 @@ ps-am:
-
- uninstall-am:
-
--.MAKE: all check install install-am install-strip
-+.MAKE: all check install install-am install-exec install-strip
-
- .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
-diff --git a/gettext-tools/m4/Makefile.in b/gettext-tools/m4/Makefile.in
-index 6902a7f9..26af238b 100644
---- a/gettext-tools/m4/Makefile.in
-+++ b/gettext-tools/m4/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-tools/man/Makefile.in b/gettext-tools/man/Makefile.in
-index c40f4890..201412aa 100644
---- a/gettext-tools/man/Makefile.in
-+++ b/gettext-tools/man/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-tools/misc/Makefile.in b/gettext-tools/misc/Makefile.in
-index 66d30f82..aff94b38 100644
---- a/gettext-tools/misc/Makefile.in
-+++ b/gettext-tools/misc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-tools/projects/Makefile.in b/gettext-tools/projects/Makefile.in
-index 27339812..0a8fa883 100644
---- a/gettext-tools/projects/Makefile.in
-+++ b/gettext-tools/projects/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
-index a039e53e..303964d1 100644
---- a/gettext-tools/src/Makefile.in
-+++ b/gettext-tools/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -4061,7 +4061,8 @@ installdirs: installdirs-local
- done
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
--install-exec: install-exec-am
-+install-exec: $(BUILT_SOURCES)
-+ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
-
-@@ -4171,7 +4172,8 @@ ps-am:
- uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
- uninstall-local
-
--.MAKE: all check install install-am install-exec-am install-strip
-+.MAKE: all check install install-am install-exec install-exec-am \
-+ install-strip
-
- .PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
- clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-diff --git a/gettext-tools/styles/Makefile.in b/gettext-tools/styles/Makefile.in
-index bf8260d3..d5ba3495 100644
---- a/gettext-tools/styles/Makefile.in
-+++ b/gettext-tools/styles/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/gettext-tools/system-tests/Makefile.in b/gettext-tools/system-tests/Makefile.in
-index ae9b2fd7..94d395db 100644
---- a/gettext-tools/system-tests/Makefile.in
-+++ b/gettext-tools/system-tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -759,6 +759,7 @@ am__set_TESTS_bases = \
- bases='$(TEST_LOGS)'; \
- bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
- bases=`echo $$bases`
-+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
- RECHECK_LOGS = $(TEST_LOGS)
- AM_RECURSIVE_TARGETS = check recheck
- TEST_SUITE_LOG = test-suite.log
-@@ -2781,7 +2782,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
- test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
- fi; \
- echo "$${col}$$br$${std}"; \
-- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
-+ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \
- echo "$${col}$$br$${std}"; \
- create_testsuite_report --maybe-color; \
- echo "$$col$$br$$std"; \
-diff --git a/gettext-tools/tests/Makefile.in b/gettext-tools/tests/Makefile.in
-index 2a45cd63..25aa9b59 100644
---- a/gettext-tools/tests/Makefile.in
-+++ b/gettext-tools/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -788,6 +788,7 @@ am__set_TESTS_bases = \
- bases='$(TEST_LOGS)'; \
- bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
- bases=`echo $$bases`
-+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
- RECHECK_LOGS = $(TEST_LOGS)
- AM_RECURSIVE_TARGETS = check recheck
- TEST_SUITE_LOG = test-suite.log
-@@ -3082,7 +3083,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
- test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
- fi; \
- echo "$${col}$$br$${std}"; \
-- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
-+ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \
- echo "$${col}$$br$${std}"; \
- create_testsuite_report --maybe-color; \
- echo "$$col$$br$$std"; \
-diff --git a/gnulib-local/Makefile.in b/gnulib-local/Makefile.in
-index 356838f9..e4ecb5a0 100644
---- a/gnulib-local/Makefile.in
-+++ b/gnulib-local/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/libtextstyle/Makefile.in b/libtextstyle/Makefile.in
-index 2d0fe17b..6ee7bf97 100644
---- a/libtextstyle/Makefile.in
-+++ b/libtextstyle/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -309,9 +309,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/lib/textstyle/version.in.h \
- $(top_srcdir)/lib/textstyle/woe32dll.in.h AUTHORS COPYING \
- ChangeLog INSTALL NEWS README build-aux/config.guess \
-- build-aux/config.rpath build-aux/config.sub \
-- build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
-- build-aux/texinfo.tex
-+ build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
-+ build-aux/install-sh build-aux/ltmain.sh build-aux/mdate-sh \
-+ build-aux/missing build-aux/texinfo.tex
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -350,6 +350,8 @@ am__relativize = \
- DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
- DIST_TARGETS = dist-gzip
-+# Exists only to be overridden by the user if desired.
-+AM_DISTCHECK_DVI_TARGET = dvi
- distuninstallcheck_listfiles = find . -type f -print
- am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-@@ -2028,7 +2030,7 @@ distcheck: dist
- $(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=../.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
-- && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-diff --git a/libtextstyle/aclocal.m4 b/libtextstyle/aclocal.m4
-index fb01aec5..7ef395ae 100644
---- a/libtextstyle/aclocal.m4
-+++ b/libtextstyle/aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
-
- # Copyright (C) 1996-2020 Free Software Foundation, Inc.
-
-@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.16'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.16.2], [],
-+m4_if([$1], [1.16.3], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.16.2])dnl
-+[AM_AUTOMAKE_VERSION([1.16.3])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -703,12 +703,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- AC_REQUIRE_AUX_FILE([missing])dnl
- if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
-+ MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-diff --git a/libtextstyle/adhoc-tests/Makefile.in b/libtextstyle/adhoc-tests/Makefile.in
-index 1db11652..22ed7a4b 100644
---- a/libtextstyle/adhoc-tests/Makefile.in
-+++ b/libtextstyle/adhoc-tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/libtextstyle/configure b/libtextstyle/configure
-index e63e68c0..d4009e42 100755
---- a/libtextstyle/configure
-+++ b/libtextstyle/configure
-@@ -3928,12 +3928,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
- am_aux_dir=`cd "$ac_aux_dir" && pwd`
-
- if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
-+ MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-diff --git a/libtextstyle/doc/Makefile.in b/libtextstyle/doc/Makefile.in
-index 6a673e79..1734fcc1 100644
---- a/libtextstyle/doc/Makefile.in
-+++ b/libtextstyle/doc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-diff --git a/libtextstyle/lib/Makefile.in b/libtextstyle/lib/Makefile.in
-index 99d9598b..4a95dfc0 100644
---- a/libtextstyle/lib/Makefile.in
-+++ b/libtextstyle/lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -2832,7 +2832,8 @@ installdirs:
- done
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
--install-exec: install-exec-am
-+install-exec: $(BUILT_SOURCES)
-+ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
-
-@@ -2942,7 +2943,7 @@ ps-am:
- uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS \
- uninstall-nobase_nodist_includeHEADERS
-
--.MAKE: all check install install-am install-strip
-+.MAKE: all check install install-am install-exec install-strip
-
- .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool clean-local \
-diff --git a/libtextstyle/tests/Makefile.in b/libtextstyle/tests/Makefile.in
-index 75ae33d1..24545d19 100644
---- a/libtextstyle/tests/Makefile.in
-+++ b/libtextstyle/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -556,6 +556,7 @@ am__set_TESTS_bases = \
- bases='$(TEST_LOGS)'; \
- bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
- bases=`echo $$bases`
-+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
- RECHECK_LOGS = $(TEST_LOGS)
- TEST_SUITE_LOG = test-suite.log
- TEST_EXTENSIONS = @EXEEXT@ .test
-@@ -2201,7 +2202,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
- test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
- fi; \
- echo "$${col}$$br$${std}"; \
-- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
-+ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \
- echo "$${col}$$br$${std}"; \
- create_testsuite_report --maybe-color; \
- echo "$$col$$br$$std"; \
-@@ -2332,7 +2333,8 @@ installdirs: installdirs-recursive
- installdirs-am:
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-recursive
--install-exec: install-exec-recursive
-+install-exec: $(BUILT_SOURCES)
-+ $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
-
-@@ -2446,7 +2448,7 @@ ps-am:
- uninstall-am:
-
- .MAKE: $(am__recursive_targets) all check check-am install install-am \
-- install-strip
-+ install-exec install-strip
-
- .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--depfiles check check-TESTS check-am clean \
---
-2.30.0
-
diff --git a/3rdparty/ext_gettext/CMakeLists.txt b/3rdparty/ext_gettext/CMakeLists.txt
index 5bceb2f5cf..547fa260fa 100644
--- a/3rdparty/ext_gettext/CMakeLists.txt
+++ b/3rdparty/ext_gettext/CMakeLists.txt
@@ -49,10 +49,10 @@ ExternalProject_Add( ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://ftpmirror.gnu.org/gettext/gettext-0.21.tar.gz
URL_HASH SHA256=c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12
- PATCH_COMMAND ${PATCH_COMMAND} --binary -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/0005-Fix-libgettextpo-linking-on-macOS.patch
+ PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/0001-Fix-libgettextpo-linking-on-macOS.patch
INSTALL_DIR ${PREFIX_ext_gettext}
- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_gettext} --disable-java ${GLOBAL_AUTOMAKE_PROFILE} --disable-native-java --disable-maintainer-mode
+ CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_gettext} --disable-java ${GLOBAL_AUTOMAKE_PROFILE} --disable-native-java
BUILD_COMMAND make
INSTALL_COMMAND make install
More information about the kimageshop
mailing list