From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1351569-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id CC01B158086
for <garchives@archives.gentoo.org>; Tue, 21 Dec 2021 11:30:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F073C2BC026;
Tue, 21 Dec 2021 11:30:42 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id CABF82BC026
for <gentoo-commits@lists.gentoo.org>; Tue, 21 Dec 2021 11:30:42 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D1130342F70
for <gentoo-commits@lists.gentoo.org>; Tue, 21 Dec 2021 11:30:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6CB0423F
for <gentoo-commits@lists.gentoo.org>; Tue, 21 Dec 2021 11:30:40 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <1640080770.331d3dbb1fa1fdcade0d1debb1fc722ef3b9d1f2.grobian@gentoo>
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
X-VCS-Repository: proj/portage-utils
X-VCS-Files: autogen.sh
X-VCS-Directories: /
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: 331d3dbb1fa1fdcade0d1debb1fc722ef3b9d1f2
X-VCS-Branch: master
Date: Tue, 21 Dec 2021 11:30:40 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 07c49d7e-f434-4e5e-b129-67fabacc94a7
X-Archives-Hash: cfbf260442a880596043ffc3753a1a5d
commit: 331d3dbb1fa1fdcade0d1debb1fc722ef3b9d1f2
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 21 09:59:30 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 21 09:59:30 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=331d3dbb
autogen: keep our own m4 files around
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
autogen.sh | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/autogen.sh b/autogen.sh
index 1cfb68b..ea564e0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,16 @@ if ! qlist -qI sys-devel/autoconf-archive > /dev/null ; then
exit 1
fi
-v rm -rf autotools
+# keep this list updated with non-generated M4 files
+keepm4=( ac_check_sendfile.m4 )
+for keepf in "${keepm4[@]}" ; do
+ v mv "${m4dir}/${keepf}" "autotools/"
+done
+v rm -rf autotools/{gnulib,m4}
+v mkdir "${m4dir}"
+for keepf in "${keepm4[@]}" ; do
+ v mv "autotools/${keepf}" "${m4dir}/"
+done
# reload the gnulib code
PATH=/usr/local/src/gnu/gnulib:${PATH}