commit: fe3f65790fabb6e98d0b851d3013714c7706eccc Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Apr 1 00:00:39 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Apr 11 20:59:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3f6579
autotools.eclass: rename configure.in to configure.ac on new EAPIs automake is eventually going to fail when it detects configure.in. Don't do this immediately - instead only on new EAPIs to avoid breaking existing ebuilds. Bug: https://bugs.gentoo.org/426262 Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/autotools.eclass | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index ab62584a5b7..04d94d88260 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -383,9 +383,19 @@ eautoconf() { 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." + case ${EAPI:-0} in + 5|6|7) + 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." + ;; + *) + # Move configure file to the new location only on newer EAPIs to ensure + # checks are done rather than retroactively breaking ebuilds. + einfo "Moving configure.in to configure.ac (bug #426262)" + mv configure.{in,ac} || die + ;; + esac fi # Install config.guess and config.sub which are required by many macros
