From 3ccc1cd5d0bf2dc1a2a725879c0ad23f1e77deda Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 7 Oct 2024 07:05:33 +0000
Subject: [PATCH] eclass/autotools: Sync with Gentoo

It's from Gentoo commit 5ff4a902b3706209c6fe148d9e3c621f6cc53ba4.
---
 .../third_party/portage-stable/eclass/autotools.eclass    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass
index 0571b18ba5..641612f371 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass
@@ -312,7 +312,13 @@ eautoreconf() {
 	else
 		eautoconf --force
 	fi
-	[[ ${AT_NOEAUTOHEADER} != "yes" ]] && eautoheader
+	if [[ ${AT_NOEAUTOHEADER} != "yes" ]] ; then
+		if [[ ${WANT_AUTOCONF} == "2.1" ]] ; then
+			eautoheader
+		else
+			eautoheader --force
+		fi
+	fi
 	[[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS}
 
 	if [[ ${AT_NOELIBTOOLIZE} != "yes" ]] ; then