[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [PATCH 4/4] [ng] maintcheck: obsolete check 'sc_tests_no_c
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [PATCH 4/4] [ng] maintcheck: obsolete check 'sc_tests_no_configure_in' removed |
Date: |
Fri, 25 May 2012 17:51:02 +0200 |
There's no need to verify our tests doesn't use the obsoleted
name 'configure.in' for the Autoconf file anymore: we don't support
it anyway in Automake-NG, so any test trying to use it would fail.
* syntax-checks.mk (sc_tests_no_configure_in): Remove.
* tests/autodist-configure-no-subdir.sh: Remove unneeded occurrences
of 'configure.in'.
Signed-off-by: Stefano Lattarini <address@hidden>
---
syntax-checks.mk | 16 ----------------
t/autodist-configure-no-subdir.sh | 10 ++--------
2 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 957051a..e567c96 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -80,7 +80,6 @@ sc_tests_automake_fails \
sc_tests_required_after_defs \
sc_tests_plain_sleep \
sc_m4_am_plain_egrep_fgrep \
-sc_tests_no_configure_in \
sc_tests_PATH_SEPARATOR \
sc_tests_logs_duplicate_prefixes \
sc_tests_makefile_variable_order \
@@ -505,21 +504,6 @@ sc_m4_am_plain_egrep_fgrep:
exit 1; \
fi
-## Prefer 'configure.ac' over the obsolescent 'configure.in' as the name
-## for configure input files in our testsuite. The latter has been
-## deprecated for several years (at least since autoconf 2.50).
-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 \
- echo "Use 'configure.ac', not 'configure.in', as the name" >&2; \
- echo "for configure input files in the test cases above." >&2; \
- exit 1; \
- fi
-
## Rule to ensure that the testsuite has been run before. We don't depend
## on 'check' here, because that would be very wasteful in the common case.
## We could run "make check AM_LAZY_CHECK=yes" and avoid toplevel races with
diff --git a/t/autodist-configure-no-subdir.sh
b/t/autodist-configure-no-subdir.sh
index b974748..93e7f5f 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 <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.
. ./defs || Exit 1
@@ -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 $(am__dist_files) $(am__dist_common) \
| grep 'configure' && exit 1; :
END
: > sub/configure.ac
-: > sub/configure.in
: > sub/configure
$ACLOCAL
--
1.7.9.5
- [Automake-NG] [PATCH 0/4] Assume configure.ac is Autoconf input; drop support for configure.in, Stefano Lattarini, 2012/05/25
- [Automake-NG] [PATCH 2/4] [ng] cleanup: just assume configure input is configure.ac, Stefano Lattarini, 2012/05/25
- [Automake-NG] [PATCH 1/4] [ng] cleanup: don't support configure.in anymore, Stefano Lattarini, 2012/05/25
- [Automake-NG] [PATCH 3/4] [ng] cleanup: get rid of 'Automake::Configure_ac' module, Stefano Lattarini, 2012/05/25
- [Automake-NG] [PATCH 4/4] [ng] maintcheck: obsolete check 'sc_tests_no_configure_in' removed,
Stefano Lattarini <=
- Re: [Automake-NG] [PATCH 0/4] Assume configure.ac is Autoconf input; drop support for configure.in, Stefano Lattarini, 2012/05/26
- Re: [Automake-NG] [PATCH 0/4] Assume configure.ac is Autoconf input; drop support for configure.in, Akim Demaille, 2012/05/29