[PATCH] {master} Deprecate obsoleted macro AM_WITH_REGEX.
OK for master?
* m4/regex.m4: Document the `AM_WITH_REGEX' macro as obsoleted,
and tell that it should be removed two years from now.
(AM_WITH_REGEX): Raise an m4-time warning of the obsolete
category when this macro is used.
* doc/automake.texi (Public Macros): Move description of
`AM_WITH_REGEX' from here ...
(Private Macros): ... to here, and declare it as obsoleted and
to be removed in a future version.
* tests/regex-obsolete.test: New test.
* tests/Makefile.am (TESTS): Update.
---
ChangeLog | 14 ++
doc/automake.texi | 27 ++-
m4/regex.m4 | 13 -
tests/Makefile.am |1 +
tests/Makefile.in |1 +
5 files changed, 38 insertions(+), 18 deletions(-)
From e667e058bbc45231bd64e761156449813ff5d4bc Mon Sep 17 00:00:00 2001
From: Stefano Lattarini stefano.lattar...@gmail.com
Date: Sat, 13 Nov 2010 12:21:28 +0100
Subject: [PATCH] Deprecate obsoleted macro AM_WITH_REGEX.
* m4/regex.m4: Document the `AM_WITH_REGEX' macro as obsoleted,
and tell that it should be removed two years from now.
(AM_WITH_REGEX): Raise an m4-time warning of the obsolete
category when this macro is used.
* doc/automake.texi (Public Macros): Move description of
`AM_WITH_REGEX' from here ...
(Private Macros): ... to here, and declare it as obsoleted and
to be removed in a future version.
* tests/regex-obsolete.test: New test.
* tests/Makefile.am (TESTS): Update.
---
ChangeLog | 14 ++
doc/automake.texi | 27 ++-
m4/regex.m4 | 13 -
tests/Makefile.am |1 +
tests/Makefile.in |1 +
5 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 24b20ae..93a6b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-13 Stefano Lattarini stefano.lattar...@gmail.com
+
+ Deprecate obsoleted macro AM_WITH_REGEX.
+ * m4/regex.m4: Document the `AM_WITH_REGEX' macro as obsoleted,
+ and tell that it should be removed two years from now.
+ (AM_WITH_REGEX): Raise an m4-time warning of the obsolete
+ category when this macro is used.
+ * doc/automake.texi (Public Macros): Move description of
+ `AM_WITH_REGEX' from here ...
+ (Private Macros): ... to here, and declare it as obsoleted and
+ to be removed in a future version.
+ * tests/regex-obsolete.test: New test.
+ * tests/Makefile.am (TESTS): Update.
+
2010-11-08 Stefano Lattarini stefano.lattar...@gmail.com
Improve and extend tests on man pages support.
diff --git a/doc/automake.texi b/doc/automake.texi
index 5ae565c..bee7d6c 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3921,19 +3921,6 @@ Add support for the @uref{http://dmalloc.com/, Dmalloc package}. If
the user runs @command{configure} with @option{--with-dmalloc}, then
define @code{WITH_DMALLOC} and add @option{-ldmalloc} to @code{LIBS}.
-...@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 @code{rx} regular expression library is used, and @file{rx.o} is put
-into @code{LIBOBJS}.
-
@end table
@@ -4009,6 +3996,20 @@ 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 @code{rx} regular expression library is used, and @file{rx.o} is put
+into @code{LIBOBJS}. This macro is obsolete now (since rx doesn't seem
+to be maintained), and will be removed in a future version of Automake.
+
@end table
diff --git a/m4/regex.m4 b/m4/regex.m4
index c05bb38..d8c4d6d 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,18 +1,21 @@
## - ## -*- Autoconf -*-
## Check if --with-regex was given. ##
## - ##
-# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2010 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
Re: [PATCH] {master} Deprecate obsoleted macro AM_WITH_REGEX.
* Stefano Lattarini wrote on Sat, Nov 13, 2010 at 12:32:49PM CET:
* m4/regex.m4: Document the `AM_WITH_REGEX' macro as obsoleted,
I think technically obsolete is right here, without trailing d.
and tell that it should be removed two years from now.
s/tell/state/
(AM_WITH_REGEX): Raise an m4-time warning of the obsolete
category when this macro is used.
* doc/automake.texi (Public Macros): Move description of
`AM_WITH_REGEX' from here ...
(Private Macros): ... to here, and declare it as obsoleted and
Did you mean (Obsolete Macros) here?
to be removed in a future version.
* tests/regex-obsolete.test: New test.
That file is missing from the patch. Please resend and I'll finish the
review.
* tests/Makefile.am (TESTS): Update.
+...@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 @code{rx} regular expression library is used, and @file{rx.o} is put
+into @code{LIBOBJS}. This macro is obsolete now (since rx doesn't seem
+to be maintained), and will be removed in a future version of Automake.
Is rx a package? Where did you find traces to it?
How about adding Consider using gnulib if you need regex
functionality.?
@end table
Thanks,
Ralf
Re: [PATCH 1/3] aclocal: handle ACLOCAL_PATH environment variable
* Paolo Bonzini wrote on Tue, Nov 09, 2010 at 08:14:38PM CET:
This updated patch passes the tests suggested by Stefano. Considering
that Automake will rarely if ever be invoked from outside, MSYS, I stuck
with the colon as the sole separator for ACLOCAL_PATH.
The test suites leaves the user's ACLOCAL_PATH in place, for consistency
with the treatment of ${prefix}/share/aclocal/dirlist in tests/defs.in,
but overrides it in the two dedicated tests.
I needed to tweak the tests/aclocal.in script to avoid passing the
srcdir to -I (which happens if building in srcdir). Otherwise, the
assumptions of the precedence tests in acloca25.test are not respected.
* NEWS: Document new behavior.
* aclocal.in (parse_arguments): Parse ACLOCAL_PATH as a colon-separated
list of directories to be included in the search path.
* doc/automake.texi (Macro Search Path): Document new behavior and
the precedence rules for various elements of the search path.
* tests/Makefile.am (TESTS): Add new testcases.
* tests/acloca24.test: New testcase.
* tests/acloca25.test: New testcase.
* tests/aclocal.in: Special-case in-srcdir build, so that -I is not used
if it brings in unwanted m4 files.
This patch is OK. I've committed it locally to a new branch based off
maint (but the change is intended for master only of course), and can
push it for you when we've dealt with the other ones. (Ping me if you'd
like write access to automake.git, AFAICS you don't have that ATM.)
Thanks,
Ralf
Re: [PATCH] {master} Deprecate obsoleted macro AM_WITH_REGEX.
On Saturday 13 November 2010, Ralf Wildenhues wrote:
* Stefano Lattarini wrote on Sat, Nov 13, 2010 at 12:32:49PM CET:
* m4/regex.m4: Document the `AM_WITH_REGEX' macro as obsoleted,
I think technically obsolete is right here, without trailing d.
OK. All instances fixed.
and tell that it should be removed two years from now.
s/tell/state/
Fixed.
(AM_WITH_REGEX): Raise an m4-time warning of the obsolete
category when this macro is used.
* doc/automake.texi (Public Macros): Move description of
`AM_WITH_REGEX' from here ...
(Private Macros): ... to here, and declare it as obsoleted and
Did you mean (Obsolete Macros) here?
Yes, sorry.
to be removed in a future version.
* tests/regex-obsolete.test: New test.
That file is missing from the patch.
Hmpf, forgotten `git add'. Sorry for the slopppiness.
Please resend and I'll finish the review.
* tests/Makefile.am (TESTS): Update.
+...@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 @code{rx} regular expression library is used, and @file{rx.o} is put
+into @code{LIBOBJS}. This macro is obsolete now (since rx doesn't seem
+to be maintained), and will be removed in a future version of Automake.
Is rx a package? Where did you find traces to it?
There was this in automake.texi:
@cindex rx package
Also, older comments in m4/regex.m4 read:
# FIXME: This macro seems quite obsolete now since rx doesn't seem to
# be maintained, while regex is.
But I agree that the warning in AM_WITH_REGEX could be simplified to:
$0 is obsolete, since `rx' is unmantained now
That's what I've done in the attached amended patch.
How about adding Consider using gnulib if you need regex
functionality.?
OK, done.
Thanks,
Stefano
From 37b0aeedba10f06a079228a576a813536d188108 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini stefano.lattar...@gmail.com
Date: Sat, 13 Nov 2010 12:21:28 +0100
Subject: [PATCH] Deprecate obsolete macro AM_WITH_REGEX.
* m4/regex.m4: Document the `AM_WITH_REGEX' macro as obsolete,
and state that it should be removed two years from now.
(AM_WITH_REGEX): Raise an m4-time warning of the obsolete
category when this macro is used.
* doc/automake.texi (Public Macros): Move description of
`AM_WITH_REGEX' from here ...
(Obsolete Macros): ... to here, and declare it as obsolete
and to be removed in a future version.
* tests/regex-obsolete.test: New test.
* tests/Makefile.am (TESTS): Update.
---
ChangeLog | 14 ++
doc/automake.texi | 28 +++-
m4/regex.m4 | 12 +++-
tests/Makefile.am |1 +
tests/Makefile.in |1 +
tests/regex-obsolete.test | 32
6 files changed, 70 insertions(+), 18 deletions(-)
create mode 100755 tests/regex-obsolete.test
diff --git a/ChangeLog b/ChangeLog
index 24b20ae..2091761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-13 Stefano Lattarini stefano.lattar...@gmail.com
+
+ Deprecate obsolete macro AM_WITH_REGEX.
+ * m4/regex.m4: Document the `AM_WITH_REGEX' macro as obsolete,
+ and state that it should be removed two years from now.
+ (AM_WITH_REGEX): Raise an m4-time warning of the obsolete
+ category when this macro is used.
+ * doc/automake.texi (Public Macros): Move description of
+ `AM_WITH_REGEX' from here ...
+ (Obsolete Macros): ... to here, and declare it as obsolete
+ and to be removed in a future version.
+ * tests/regex-obsolete.test: New test.
+ * tests/Makefile.am (TESTS): Update.
+
2010-11-08 Stefano Lattarini stefano.lattar...@gmail.com
Improve and extend tests on man pages support.
diff --git a/doc/automake.texi b/doc/automake.texi
index 5ae565c..c4a1902 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3921,19 +3921,6 @@ Add support for the @uref{http://dmalloc.com/, Dmalloc package}. If
the user runs @command{configure} with @option{--with-dmalloc}, then
define @code{WITH_DMALLOC} and add @option{-ldmalloc} to @code{LIBS}.
-...@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 @code{rx} regular expression library is used, and @file{rx.o} is put
-into @code{LIBOBJS}.
-
@end table
@@ -4009,6 +3996,21 @@ system.
Re: [PATCH] {master} Deprecate obsoleted macro AM_WITH_REGEX.
* Stefano Lattarini wrote on Sat, Nov 13, 2010 at 01:39:04PM CET: On Saturday 13 November 2010, Ralf Wildenhues wrote: * Stefano Lattarini wrote on Sat, Nov 13, 2010 at 12:32:49PM CET: Is rx a package? Where did you find traces to it? There was this in automake.texi: @cindex rx package Also, older comments in m4/regex.m4 read: # FIXME: This macro seems quite obsolete now since rx doesn't seem to # be maintained, while regex is. But I agree that the warning in AM_WITH_REGEX could be simplified to: $0 is obsolete, since `rx' is unmantained now That's what I've done in the attached amended patch. Cool. Thanks for digging. Patch is OK for master. Thanks! Ralf
Re: User extensions
On Mon, Nov 01, 2010 at 08:18:44PM +0100, Ralf Wildenhues wrote: Ideally, I would like to see testsuite coverage for each code path (branch coverage) for new code. I understand that only Stefano is able to produce this in reasonable amount of time, so whatever you guys can manage is better than nothing. Hi, not having followed the code discussion very closely (just hoping it will be in git, soon, so I can start using it, as I have been waiting for something like this for a long time), I just wonder what you mean by branch coverage. If this is execution graph node coverage, then I agree, but if you mean edge coverage, I don't know how you want to achieve this. Any O(x) where x1 algorithm anywhere in the code makes it impossible. If I'm wrong, I'd like to know how Stefano produces it. -- Pippijn van Steenhoven signature.asc Description: Digital signature
Re: [PATCH] {master} Deprecate obsoleted macro AM_WITH_REGEX.
On Saturday 13 November 2010, Ralf Wildenhues wrote: * Stefano Lattarini wrote on Sat, Nov 13, 2010 at 01:39:04PM CET: On Saturday 13 November 2010, Ralf Wildenhues wrote: * Stefano Lattarini wrote on Sat, Nov 13, 2010 at 12:32:49PM CET: Is rx a package? Where did you find traces to it? There was this in automake.texi: @cindex rx package Also, older comments in m4/regex.m4 read: # FIXME: This macro seems quite obsolete now since rx doesn't seem to # be maintained, while regex is. But I agree that the warning in AM_WITH_REGEX could be simplified to: $0 is obsolete, since `rx' is unmantained now That's what I've done in the attached amended patch. Cool. Thanks for digging. Patch is OK for master. Patch applied, and pushed. Thanks, Stefano
