From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8D2FF139694 for ; Sat, 10 Jun 2017 11:28:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3C8021C0A5; Sat, 10 Jun 2017 11:28:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 948E9E0D09 for ; Sat, 10 Jun 2017 11:28:25 +0000 (UTC) Received: from wim.jer (jer.xs4all.nl [212.238.182.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jer) by smtp.gentoo.org (Postfix) with ESMTPSA id 3075F341901 for ; Sat, 10 Jun 2017 11:28:24 +0000 (UTC) Date: Sat, 10 Jun 2017 13:28:19 +0200 From: Jeroen Roovers To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] autotools.eclass: automatically move configure.in to configure.ac Message-ID: <20170610132819.736131ca@wim.jer> Organization: Gentoo Foundation X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/Dyi0N4XZ/wMBQWN4CV_juGl" X-Archives-Salt: 478bd2a6-afc9-4ebd-9754-27d84e4f494f X-Archives-Hash: 3b1cb841f129e0f00d309317444624b3 --MP_/Dyi0N4XZ/wMBQWN4CV_juGl Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline https://bugs.gentoo.org/show_bug.cgi?id=426262 --MP_/Dyi0N4XZ/wMBQWN4CV_juGl Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=426262-autotools.eclass-deprecated-configure.in.patch diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 2710bf827b..76a5c2eade 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -341,10 +341,11 @@ eautoconf() { echo die "No configure.{ac,in} present!" fi - if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then - eqawarn "This package has a configure.in file which has long been deprecated. Please" - eqawarn "update it to use configure.ac instead as newer versions of autotools will die" - eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details." + if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in && ! -e configure.ac ]] ; then + eqawarn "This package has a configure.in file which has long been deprecated. Since no" + eqawarn "configure.ac is present either, we rename configure.in to configure.ac. If" + eqawarn "this causes problems, please file a bug report and make it block bug #426262." + mv configure.{in,ac} || die fi autotools_run_tool --at-m4flags autoconf "$@" --MP_/Dyi0N4XZ/wMBQWN4CV_juGl--