diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-24 12:40:19 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-27 23:17:52 +0100 |
commit | 07cee987e8b87aa78d641cd30fcb3b1d1c8c54fb (patch) | |
tree | 544edd3c31a09163f115fe0367dbadb2cc35faa7 /tests | |
parent | 4c38a8cee729ac47aa751364978f8315e1dff1fc (diff) | |
download | automake-07cee987e8b87aa78d641cd30fcb3b1d1c8c54fb.tar.gz |
regex: remove obsolete macro AM_WITH_REGEX
Today, practically nobody uses the GNU rx library, which, according
to its own website <http://www.gnu.org/software/rx/rx.html>, has
been "decommissioned". Consequently, the automake-provided macro
AM_WITH_REGEX is not used nor required anymore.
See also commits `v1.11-587-g5f335be' and `v1.11-433-g37b0aee',
where that macro had been deprecated.
* m4/regex.m4: Delete.
* m4/Makefile.am (dist_automake_ac_DATA): Do not list it anymore.
* doc/automake.texi (Obsolete Macros): Remove description, and in
fact any mention, of `AM_WITH_REGEX'.
* tests/regex.test: Delete.
* tests/help-regex.test: Likewise.
* tests/regex-obsolete.test: Likewise.
* tests/Makefile.am (TESTS): Do not list them anymore.
* NEWS: Update.
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/help-regex.test | 31 | ||||
-rw-r--r-- | tests/list-of-tests.mk | 3 | ||||
-rwxr-xr-x | tests/regex-obsolete.test | 30 | ||||
-rwxr-xr-x | tests/regex.test | 29 |
4 files changed, 0 insertions, 93 deletions
diff --git a/tests/help-regex.test b/tests/help-regex.test deleted file mode 100755 index 2ae770461..000000000 --- a/tests/help-regex.test +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010, 2011 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Make sure that obsolescent macro `AM_WITH_REGEX' adds proper text to -# the configure help screen. - -. ./defs || Exit 1 - -cat > configure.in <<END -AC_INIT([$me], [1.0]) -AM_WITH_REGEX -END - -$ACLOCAL -$AUTOCONF -grep_configure_help --without-regex ' use GNU rx($| )' - -: diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk index 259b23277..841935504 100644 --- a/tests/list-of-tests.mk +++ b/tests/list-of-tests.mk @@ -441,7 +441,6 @@ help-init.test \ help-lispdir.test \ help-multilib.test \ help-python.test \ -help-regex.test \ help-silent.test \ help-upc.test \ hfs.test \ @@ -868,8 +867,6 @@ remake-deleted-am.test \ remake-am-pr10111.test \ remake-m4-pr10111.test \ pr8365-remake-timing.test \ -regex.test \ -regex-obsolete.test \ req.test \ reqd.test \ reqd2.test \ diff --git a/tests/regex-obsolete.test b/tests/regex-obsolete.test deleted file mode 100755 index b1563095b..000000000 --- a/tests/regex-obsolete.test +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010, 2011 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# 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 the AM_WITH_REGEX macro is reported as obsolete. - -. ./defs || Exit 1 - -cat >> configure.in << 'END' -AM_WITH_REGEX -END - -$ACLOCAL -$AUTOCONF -Werror -Wobsolete 2>stderr && { cat stderr >&2; Exit 1; } -cat stderr >&2 -grep '^configure\.in:.*AM_WITH_REGEX.*obsolete' stderr - -: diff --git a/tests/regex.test b/tests/regex.test deleted file mode 100755 index 586ab5a2e..000000000 --- a/tests/regex.test +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -# Copyright (C) 2004, 2011 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Make sure AM_WITH_REGEX compiles and runs. - -required=cc -. ./defs || Exit 1 - -cat >> configure.in << 'END' -AM_WITH_REGEX -END - -$ACLOCAL -$AUTOCONF -./configure -./configure --without-regex |