[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-435-g8f35763

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=8f357634a0d98258f9419cdecdf208d906cd69b0

The branch, master has been updated
       via  8f357634a0d98258f9419cdecdf208d906cd69b0 (commit)
       via  8b0f11b32ad032af887d3e783f6e01407b96de1f (commit)
       via  37b0aeedba10f06a079228a576a813536d188108 (commit)
      from  77105a60057c789a6c4cdae8c2c44c9960837756 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8f357634a0d98258f9419cdecdf208d906cd69b0
Merge: 37b0aee 8b0f11b
Author: Stefano Lattarini <address@hidden>
Date:   Sun Nov 14 02:07:05 2010 +0100

    Merge branch 'backcompat-tests'

commit 8b0f11b32ad032af887d3e783f6e01407b96de1f
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 12 20:35:35 2010 +0100

    Fix bug in test `backcompat6.test' (MSYS portability).
    
    * tests/backcompat6.test (Makefile.am): Grep the output from the
    test program, rather than diffing it, to avoid spurious failures
    on MinGW/MSYS due to LF vs. CRLF line endings.
    
    Reported by Ralf Wildenhues.

commit 37b0aeedba10f06a079228a576a813536d188108
Author: Stefano Lattarini <address@hidden>
Date:   Sat Nov 13 12:21:28 2010 +0100

    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.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                    |   22 ++++++++++++++++++++
 doc/automake.texi                            |   28 +++++++++++++------------
 m4/regex.m4                                  |   12 ++++++----
 tests/Makefile.am                            |    1 +
 tests/Makefile.in                            |    1 +
 tests/backcompat6.test                       |   22 ++++++++------------
 tests/{acloca23.test => regex-obsolete.test} |   15 ++++---------
 7 files changed, 60 insertions(+), 41 deletions(-)
 copy tests/{acloca23.test => regex-obsolete.test} (75%)

diff --git a/ChangeLog b/ChangeLog
index 24b20ae..4c327b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2010-11-12  Stefano Lattarini  <address@hidden>
+
+       Fix bug in test `backcompat6.test' (MSYS portability).
+       * tests/backcompat6.test (Makefile.am): Grep the output from the
+       test program, rather than diffing it, to avoid spurious failures
+       on MinGW/MSYS due to LF vs. CRLF line endings.
+       Reported by Ralf Wildenhues.
+
+2010-11-13  Stefano Lattarini  <address@hidden>
+
+       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  <address@hidden>
 
        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}.
 
address@hidden AM_WITH_REGEX
address@hidden AM_WITH_REGEX
address@hidden WITH_REGEX
address@hidden --with-regex
address@hidden regex package
address@hidden 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
address@hidden 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.  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.
 
address@hidden AM_WITH_REGEX
address@hidden AM_WITH_REGEX
address@hidden WITH_REGEX
address@hidden --with-regex
address@hidden regex package
address@hidden 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
address@hidden 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 will be removed in a future version of
+Automake.  Consider using gnulib if you need regex functionality.
+
 @end table
 
 
diff --git a/m4/regex.m4 b/m4/regex.m4
index c05bb38..a453930 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 preserved.
 
-# serial 7
+# serial 8
 
 # AM_WITH_REGEX
 # -------------
 #
+# THIS MACRO IS OBSOLETE now, since rx doesn't seem to be maintained,
+# while regex is.  This macro should be removed on 2013-01-01.
+#
 # 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
@@ -23,10 +26,9 @@
 # package will use the system's rx which, on Linux at least, will
 # result in a smaller executable file.
 #
-# FIXME: This macro seems quite obsolete now since rx doesn't seem to
-# be maintained, while regex is.
 AC_DEFUN([AM_WITH_REGEX],
 [AC_PREREQ(2.50)dnl
+m4_warn([obsolete], [$0 is obsolete, since `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],
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a604da5..a221ffb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -701,6 +701,7 @@ remake5.test \
 remake6.test \
 remake7.test \
 regex.test \
+regex-obsolete.test \
 req.test \
 reqd.test \
 reqd2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 142ba54..d6a6877 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -963,6 +963,7 @@ remake5.test \
 remake6.test \
 remake7.test \
 regex.test \
+regex-obsolete.test \
 req.test \
 reqd.test \
 reqd2.test \
diff --git a/tests/backcompat6.test b/tests/backcompat6.test
index 534ecb1..0d63bcc 100755
--- a/tests/backcompat6.test
+++ b/tests/backcompat6.test
@@ -53,19 +53,15 @@ END
 cat >> Makefile.am <<'END'
 bin_PROGRAMS = foo
 foo_SOURCES = quux.c
-DISTCLEANFILES = *.tmp
 check-local:
-       rm -f exp got
-       echo 'PACKAGE = nonesuch-zardoz' > exp.tmp
-       echo 'VERSION = nonesuch-0.1' >> exp.tmp
-       echo 'PACKAGE = $(PACKAGE)' > got1.tmp
-       echo 'VERSION = $(VERSION)' >> got1.tmp
-       ./foo > got2.tmp
-       cat exp.tmp
-       cat got1.tmp
-       cat got2.tmp
-       diff exp.tmp got1.tmp
-       diff exp.tmp got2.tmp
+       test x'$(PACKAGE)' = x'nonesuch-zardoz'
+       test x'$(VERSION)' = x'nonesuch-0.1'
+       ./foo # for debugging
+       ## Do not anchor the regexps w.r.t. the end of line, because on
+       ## MinGW/MSYS, grep may assume LF line endings only, while our
+       ## `foo' program may generate CRLF line endings.
+       ./foo | grep '^PACKAGE = nonesuch-zardoz!'
+       ./foo | echo '^VERSION = nonesuch-0\.1!'
 END
 
 cat > quux.c <<'END'
@@ -73,7 +69,7 @@ cat > quux.c <<'END'
 #include <stdio.h>
 int main (void)
 {
-  printf("PACKAGE = %s\nVERSION = %s\n", PACKAGE, VERSION);
+  printf("PACKAGE = %s!\nVERSION = %s!\n", PACKAGE, VERSION);
   return 0;
 }
 END
diff --git a/tests/acloca23.test b/tests/regex-obsolete.test
similarity index 75%
copy from tests/acloca23.test
copy to tests/regex-obsolete.test
index 1741e70..c283025 100755
--- a/tests/acloca23.test
+++ b/tests/regex-obsolete.test
@@ -14,24 +14,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Ensure we diagnose underquoted AC_DEFUN's.
+# Check tha the AM_WITH_REGEX macro is reported as obsolete.
 
 . ./defs || Exit 1
 
 set -e
 
 cat >> configure.in << 'END'
-FOO
+AM_WITH_REGEX
 END
 
-mkdir m4
-cat >m4/foo.m4 <<EOF
-AC_DEFUN(FOO, [echo foo])
-EOF
-
-$ACLOCAL -I m4 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL
+$AUTOCONF -Werror -Wobsolete 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
-grep 'underquoted definition.*FOO' stderr
-grep 'warning.*warning' stderr && Exit 1
+grep '^configure\.in:.*AM_WITH_REGEX.*obsolete' stderr
 
 :


hooks/post-receive
-- 
GNU Automake