From 0106682ea6be456de3d850f037781d03603ff95e Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Mon, 26 Feb 2024 23:12:45 +0100
Subject: [PATCH] configure.ac: Protect against expat_config.h.in defining
 SIZEOF_VOID_P

---
 expat/configure.ac | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/expat/configure.ac b/expat/configure.ac
index 8a9eddef..87edcbd2 100644
--- a/expat/configure.ac
+++ b/expat/configure.ac
@@ -418,6 +418,14 @@ AC_SUBST([SO_MINOR])
 AC_SUBST([SO_PATCH])
 AC_SUBST([ac_cv_sizeof_void_p])
 
+dnl Protect against generating an expat_config.h that would break multilib
+AS_IF([grep -F -q SIZEOF_VOID_P "${srcdir}"/expat_config.h.in],
+  [AC_MSG_ERROR(
+    [Plain autoreconf/autoheader does not cut it,
+                  please use ./buildconf.sh or imitate its effect
+                  through other means, so that file expat_config.h.in
+                  no longer defines macro SIZEOF_VOID_P, as that would
+                  break multilib support.  Thank you.])])
 
 dnl write the Automake flags we set
 AC_SUBST([AM_CPPFLAGS])