From 27a9d54d909450a780e2c494ee9e493ad4346cec Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Thu, 30 Nov 2023 22:46:58 -0500
Subject: [PATCH] Migrate gnulib patches to new common helper macro.

Using the new DX_PATCH_GNULIB macro allows m4 to implement the patches
that were previously being done in bootstrap, as well as removing the
repeated runtime test to work around the solaris underquoting problem
in threadlib.m4.

This also changes MinGW builds to use native Windows threads by default.
---
 bootstrap    |  6 ------
 common       |  2 +-
 configure.ac | 12 ++----------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/bootstrap b/bootstrap
index ef46efa..328bbca 100755
--- a/bootstrap
+++ b/bootstrap
@@ -60,12 +60,6 @@ fi
 $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
 	|| die "Failed to fixup Gnulib makefile fragment."
 
-# Rewrite if ! ... construts produced by gnulib conditional dependencies
-# as these fail in heirloom-sh.
-sed 's/if ! *\(.*gnulib_enabled[^;]*\); then/if \1; then :; else/' \
-  m4/gnulib-comp.m4 >m4/gnulib-comp.m4.new || exit
-mv -f m4/gnulib-comp.m4.new m4/gnulib-comp.m4 || exit
-
 # Punt some automake-generated files so that Gentoo's wrapper script doesn't
 # try to detect the automake version in use.
 rm -f Makefile.in aclocal.m4
diff --git a/common b/common
index 6405aa8..1566158 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 6405aa895740d960d6f6e70976eeb44bd403f952
+Subproject commit 156615815cd9db9dfc55356939ec15d5d2ea5180
diff --git a/configure.ac b/configure.ac
index 724b1b0..0b23f6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,8 @@ dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 dnl This is free software: you are free to do what the fuck you want to.
 dnl There is NO WARRANTY, to the extent permitted by law.
 
+DX_PATCH_GNULIB
+
 AC_PREREQ([2.68])
 AC_INIT([cdecl99], [1.2a], [nbowler@draconx.ca])
 AC_CONFIG_HEADERS([config.h])
@@ -33,16 +35,6 @@ DX_C_FOR_DECLARATIONS
 LT_INIT
 gl_INIT
 
-# Work around quoting bug in Gnulib threadlib.m4 which prevents
-# correct detection on e.g., Solaris 8.  These platforms require
-# PTHREAD_IN_USE_DETECTION_HARD to be set otherwise cdecl99 will
-# crash when reporting an error as initialization is not done.
-#
-# If this gets fixed in Gnulib, we can remove this.
-AS_CASE([$host_os],
-  [[solaris2.[1-9] | solaris2.[1-9].*]],
-    [AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD])])
-
 # As the mbrtowc replacement module is not used by the library, there is
 # no need for multithreaded mbrtowc (all programs are single threaded).
 AC_DEFINE([GNULIB_MBRTOWC_SINGLE_THREAD], [1], [Define to 1.])
-- 
2.43.2