I will push this patch in 72 hours if there is no objection. -*-*-*-
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. --- ChangeLog | 19 +++++++++++++++ NEWS | 4 +-- doc/automake.texi | 17 +------------- m4/Makefile.am | 1 - m4/regex.m4 | 56 --------------------------------------------- tests/Makefile.am | 3 -- tests/help-regex.test | 31 ------------------------- tests/regex-obsolete.test | 30 ------------------------ tests/regex.test | 28 ---------------------- 9 files changed, 21 insertions(+), 168 deletions(-) delete mode 100644 m4/regex.m4 delete mode 100755 tests/help-regex.test delete mode 100755 tests/regex-obsolete.test delete mode 100755 tests/regex.test diff --git a/ChangeLog b/ChangeLog index 819ea4d..468f95a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,24 @@ 2011-12-24 Stefano Lattarini <stefano.lattar...@gmail.com> + 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. + * 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. + See also commits `v1.11-587-g5f335be' and `v1.11-433-g37b0aee', + where that macro had been deprecated. + +2011-12-24 Stefano Lattarini <stefano.lattar...@gmail.com> + gitignore: use only one .gitignore file, in the top-level directory * doc/.gitignore, doc/amhello/.gitignore, lib/Automake/.gitignore, lib/Automake/tests/.gitignore, tests/.gitignore: Deleted, their diff --git a/NEWS b/NEWS index 4ec0e1d..f135cbe 100644 --- a/NEWS +++ b/NEWS @@ -7,9 +7,7 @@ New in 1.11a: - The deprecated options `--output-dir', `--Werror' and `--Wno-error' have been removed. - - The obsolescent AM_WITH_REGEX macro has been deprecated (since the - GNU rx library has been decommissioned), and will be removed in the - next major Automake release (1.12). + - The obsolete AM_WITH_REGEX macro has been removed. * Changes to aclocal: diff --git a/doc/automake.texi b/doc/automake.texi index e4a3426..bc52db7 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -4119,21 +4119,6 @@ system. If so, set the shell variable @code{am_cv_sys_posix_termios} to @samp{yes}. If not, set the variable to @samp{no}. This macro is obsolete, you should use Autoconf's @code{AC_SYS_POSIX_TERMIOS} instead. -@item AM_WITH_REGEX -@acindex AM_WITH_REGEX -@vindex WITH_REGEX -@opindex --with-regex -@cindex regex package -@cindex rx package -Adds @option{--with-regex} to the @command{configure} command line. If -specified (the default), then the @samp{regex} regular expression -library is used, @file{regex.o} is put into @code{LIBOBJS}, and -@code{WITH_REGEX} is defined. If @option{--without-regex} is given, then -the @samp{rx} regular expression library is used, and @file{rx.o} is put -into @code{LIBOBJS}. This macro is obsolete now (since @samp{rx} doesn't -seem to be maintained), and @emph{will be removed the next major version -of Automake}. Consider using gnulib if you need regex functionality. - @end table @@ -13490,7 +13475,7 @@ parentheses is the number of generated test cases. @c LocalWords: dirlist noindent usr MULTILIB multilib Multilibs TIOCGWINSZ sc @c LocalWords: GWINSZ termios SRCDIR tarball bzip LISPDIR lispdir XEmacs CCAS @c LocalWords: emacsen MicroEmacs CCASFLAGS UX GCJ gcj GCJFLAGS posix DMALLOC -@c LocalWords: dmalloc ldmalloc REGEX regex rx DEPDIR DEP DEFUN aclocaldir fi +@c LocalWords: dmalloc ldmalloc REGEX regex DEPDIR DEP DEFUN aclocaldir fi @c LocalWords: mymacro myothermacro AMFLAGS autopoint autogen libtoolize yum @c LocalWords: autoheader README MAKEFLAGS subdir Inetutils sync COND endif @c LocalWords: Miller's installable includedir inc pkgdata EXEEXT libexec bsd diff --git a/m4/Makefile.am b/m4/Makefile.am index eebf04e..f118a92 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -51,7 +51,6 @@ obsolete.m4 \ options.m4 \ protos.m4 \ python.m4 \ -regex.m4 \ runlog.m4 \ sanity.m4 \ silent.m4 \ diff --git a/m4/regex.m4 b/m4/regex.m4 deleted file mode 100644 index 8eeec68..0000000 --- a/m4/regex.m4 +++ /dev/null @@ -1,56 +0,0 @@ -## --------------------------------- ## -*- Autoconf -*- -## Check if --with-regex was given. ## -## --------------------------------- ## -# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -# 2010, 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 15 - -# AM_WITH_REGEX -# ------------- -# -# THIS MACRO IS OBSOLETE now, since rx doesn't seem to be maintained, -# while regex is. This macro should be removed in the next major -# automake version (1.12). -# -# The idea is to distribute rx.[hc] and regex.[hc] together, for a -# while. The WITH_REGEX symbol is used to decide which of regex.h or -# rx.h should be included in the application. If `./configure -# --with-regex' is given (the default), the package will use gawk's -# regex. If `./configure --without-regex', a check is made to see if -# rx is already installed, as with newer Linux'es. If not found, the -# package will use the rx from the distribution. If found, the -# package will use the system's rx which, on Linux at least, will -# result in a smaller executable file. -# -AC_DEFUN([AM_WITH_REGEX], -[AC_PREREQ(2.50)dnl -m4_warn([obsolete], [$0 is obsolete, since GNU rx is unmantained now])dnl -AC_LIBSOURCES([rx.h, rx.c, regex.c, regex.h])dnl -AC_MSG_CHECKING([which of GNU rx or gawk's regex is wanted]) -AC_ARG_WITH([regex], -[ --without-regex use GNU rx in lieu of gawk's regex for matching], - [test "$withval" = yes && am_with_regex=1], - [am_with_regex=1]) -if test -n "$am_with_regex"; then - AC_MSG_RESULT([regex]) - AC_DEFINE([WITH_REGEX], 1, [Define if using GNU regex]) - AC_CACHE_CHECK([for GNU regex in libc], [am_cv_gnu_regex], - [AC_TRY_LINK([], - [extern int re_max_failures; re_max_failures = 1], - [am_cv_gnu_regex=yes], - [am_cv_gnu_regex=no])]) - if test $am_cv_gnu_regex = no; then - AC_LIBOBJ([regex]) - fi -else - AC_MSG_RESULT([rx]) - AC_CHECK_FUNC([re_rx_search], , [AC_LIBOBJ([rx])]) -fi[]dnl -]) - -AU_DEFUN([fp_WITH_REGEX], [AM_WITH_REGEX]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 20ff3ac..9d6b0d9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -532,7 +532,6 @@ help-init.test \ help-lispdir.test \ help-multilib.test \ help-python.test \ -help-regex.test \ help-silent.test \ help-upc.test \ hfs.test \ @@ -908,8 +907,6 @@ remake-deleted-am-2.test \ remake-deleted-am-subdir.test \ remake-renamed-am.test \ pr8365-remake-timing.test \ -regex.test \ -regex-obsolete.test \ req.test \ reqd.test \ reqd2.test \ diff --git a/tests/help-regex.test b/tests/help-regex.test deleted file mode 100755 index 2ae7704..0000000 --- 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/regex-obsolete.test b/tests/regex-obsolete.test deleted file mode 100755 index b156309..0000000 --- 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 ff78691..0000000 --- a/tests/regex.test +++ /dev/null @@ -1,28 +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. - -. ./defs || Exit 1 - -cat >> configure.in << 'END' -AM_WITH_REGEX -END - -$ACLOCAL -$AUTOCONF -./configure -./configure --without-regex -- 1.7.7.3
