From c1ffbe9e605e3ef5166606c1d28518f33132b644 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 29 Dec 2012 00:10:14 +0100 Subject: [PATCH] maint: remove last vestiges of 'configure.in' support from the testsuite * syntax-checks.mk: Don't whitelist any file in the maintainer check looking against use of 'configure.in' in the testsuite. * t/autodist-configure-no-subdir.sh: Remove last references to 'configure.in'. Signed-off-by: Stefano Lattarini --- syntax-checks.mk | 7 +------ t/autodist-configure-no-subdir.sh | 10 ++-------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/syntax-checks.mk b/syntax-checks.mk index 9d5626e91..b7fe6311b 100644 --- a/syntax-checks.mk +++ b/syntax-checks.mk @@ -443,12 +443,7 @@ sc_m4_am_plain_egrep_fgrep: ## deprecated for several years (at least since autoconf 2.50) and ## support for it will be removed in Automake 1.14. sc_tests_no_configure_in: - @if grep -E '\bconfigure\\*\.in\b' $(xtests) $(xdefs) \ - | grep -Ev '/backcompat.*\.(sh|tap):' \ - | grep -Ev '/autodist-configure-no-subdir\.sh:' \ - | grep -Ev '/(configure|help)\.sh:' \ - | grep .; \ - then \ + @if grep -E '\bconfigure\\*\.in\b' $(xtests) $(xdefs); then \ echo "Use 'configure.ac', not 'configure.in', as the name" >&2; \ echo "for configure input files in the test cases above." >&2; \ exit 1; \ diff --git a/t/autodist-configure-no-subdir.sh b/t/autodist-configure-no-subdir.sh index 8fd325beb..24c66fe18 100755 --- a/t/autodist-configure-no-subdir.sh +++ b/t/autodist-configure-no-subdir.sh @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Check that 'configure', 'configure.ac' and 'configure.in' are *not* -# automatically distributed when placed in a subdirectory. +# Check that 'configure' and 'configure.ac' are *not* automatically +# distributed when placed in a subdirectory. # Related to automake bug#7819. . test-init.sh @@ -32,12 +32,9 @@ sub/configure: $(dontbuild) sub/configure.ac: $(dontbuild) -sub/configure.in: - $(dontbuild) check-local: distdir ls -l $(distdir)/sub test ! -f $(distdir)/sub/configure - test ! -f $(distdir)/sub/configure.in test ! -f $(distdir)/sub/configure.ac END @@ -49,15 +46,12 @@ configure: $(dontbuild) configure.ac: $(dontbuild) -configure.in: - $(dontbuild) check-local: echo $(DISTFILES) | grep 'configure' && exit 1; : echo $(DIST_COMMON) | grep 'configure' && exit 1; : END : > sub/configure.ac -: > sub/configure.in : > sub/configure $ACLOCAL -- 2.47.2