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 <stefano.lattarini@gmail.com>

diff --git a/syntax-checks.mk b/syntax-checks.mk
index 9d5626e9127afdf1be916532d30eaaaacc53cdda..b7fe6311b433c32a7daee04850582920d7f1915c 100644 (file)
--- 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 8fd325beb2bf44c3177b40f224933a6a682cd5ee..24c66fe18f80c038ce07d4962d9259b77945e974 100755 (executable)
--- 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 <http://www.gnu.org/licenses/>.
 
-# 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