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.
+2011-12-27 Stefano Lattarini <stefano.lattarini@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/list-of-tests.mk: 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-27 Stefano Lattarini <stefano.lattarini@gmail.com>
cosmetics: be more consistent in copyright notices in tests
- 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:
@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
@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
options.m4 \
protos.m4 \
python.m4 \
-regex.m4 \
runlog.m4 \
sanity.m4 \
silent.m4 \
+++ /dev/null
-## --------------------------------- ## -*- 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])
+++ /dev/null
-#! /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($| )'
-
-:
help-lispdir.test \
help-multilib.test \
help-python.test \
-help-regex.test \
help-silent.test \
help-upc.test \
hfs.test \
remake-am-pr10111.test \
remake-m4-pr10111.test \
pr8365-remake-timing.test \
-regex.test \
-regex-obsolete.test \
req.test \
reqd.test \
reqd2.test \
+++ /dev/null
-#! /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
-
-:
+++ /dev/null
-#! /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
projects / thirdparty / automake.git / commitdiff
