* configure.ac, NEWS: Bump version to 1.7b.Release-1-7b

* Makefile.am (maintainer-check): Ignore comments while
scanning for rm without -f.

17 files changed, 36 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index 5f64c1389..7bbf646e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-11-11  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* configure.ac, NEWS: Bump version to 1.7b.
+	* Makefile.am (maintainer-check): Ignore comments while
+	scanning for rm without -f.
+
 	* Makefile.am (fetch): Get all files from savannah.  Do not
 	postprocess Struct.pm and XFiles.pm, since we now are the master
 	of these.
diff --git a/Makefile.am b/Makefile.am
index 93a15f6dd..3b92a9134 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -107,9 +107,8 @@ maintainer-check: automake aclocal
 	  exit 1;				\
 	else :; fi
 ## Make sure `rm' is called with `-f'.
-	@if grep -E '\<rm ([^-]|\-[^f ]*\>)' \
-	          $(srcdir)/lib/am/[a-z]*.am $(srcdir)/tests/*.test | \
-	      grep -v '##'; then \
+	@if grep -v '^#' $(srcdir)/lib/am/[a-z]*.am $(srcdir)/tests/*.test | \
+	    grep -E '\<rm ([^-]|\-[^f ]*\>)'; then \
 	  echo "Suspicious 'rm' invocation." 1>&2; \
 	  exit 1;				\
 	else :; fi
diff --git a/Makefile.in b/Makefile.in
index 8da0908b7..1a5f87823 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7a from Makefile.am.
+# Makefile.in generated by automake 1.7b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -625,9 +625,8 @@ maintainer-check: automake aclocal
 	  echo "Found too many uses of '\$${' in the lines above." 1>&2; \
 	  exit 1;				\
 	else :; fi
-	@if grep -E '\<rm ([^-]|\-[^f ]*\>)' \
-	          $(srcdir)/lib/am/[a-z]*.am $(srcdir)/tests/*.test | \
-	      grep -v '##'; then \
+	@if grep -v '^#' $(srcdir)/lib/am/[a-z]*.am $(srcdir)/tests/*.test | \
+	    grep -E '\<rm ([^-]|\-[^f ]*\>)'; then \
 	  echo "Suspicious 'rm' invocation." 1>&2; \
 	  exit 1;				\
 	else :; fi
diff --git a/NEWS b/NEWS
index a2c828f43..fca93d03e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.7a:
+New in 1.7b:
 
 * Meta-News
 
diff --git a/aclocal.m4 b/aclocal.m4
index d29f3437b..9d1e762c9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7a -*- Autoconf -*-
+# generated automatically by aclocal 1.7b -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
diff --git a/configure b/configure
index 3bd3df42c..1c8031114 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for GNU Automake 1.7a.
+# Generated by GNU Autoconf 2.59 for GNU Automake 1.7b.
 #
 # Report bugs to <bug-automake@gnu.org>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='GNU Automake'
 PACKAGE_TARNAME='automake'
-PACKAGE_VERSION='1.7a'
-PACKAGE_STRING='GNU Automake 1.7a'
+PACKAGE_VERSION='1.7b'
+PACKAGE_STRING='GNU Automake 1.7b'
 PACKAGE_BUGREPORT='bug-automake@gnu.org'
 
 ac_unique_file="automake.in"
@@ -723,7 +723,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Automake 1.7a to adapt to many kinds of systems.
+\`configure' configures GNU Automake 1.7b to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -788,7 +788,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Automake 1.7a:";;
+     short | recursive ) echo "Configuration of GNU Automake 1.7b:";;
    esac
   cat <<\_ACEOF
 
@@ -888,7 +888,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Automake configure 1.7a
+GNU Automake configure 1.7b
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -902,7 +902,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Automake $as_me 1.7a, which was
+It was created by GNU Automake $as_me 1.7b, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1304,7 +1304,7 @@ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 # bothered by `missing'.
 am_AUTOCONF=${AUTOCONF-autoconf}
 
-am__api_version="1.7a"
+am__api_version="1.7b"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1572,7 +1572,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='automake'
- VERSION='1.7a'
+ VERSION='1.7b'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2360,7 +2360,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GNU Automake $as_me 1.7a, which was
+This file was extended by GNU Automake $as_me 1.7b, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2415,7 +2415,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GNU Automake config.status 1.7a
+GNU Automake config.status 1.7b
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index e5122a157..5b95d5fbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl (abs_top_builddir is used in tests/automake.in).  Note that
 dnl this is a requirement for the Automake package itself.
 dnl Automake users can still use Autoconf 2.58.
 AC_PREREQ(2.58a)
-AC_INIT([GNU Automake], [1.7a], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.7b], [bug-automake@gnu.org])
 
 AC_CONFIG_SRCDIR(automake.in)
 AC_CONFIG_AUX_DIR(lib)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ed04c5724..e73effe83 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7a from Makefile.am.
+# Makefile.in generated by automake 1.7b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/doc/stamp-vti b/doc/stamp-vti
index eef25dad6..137f696d7 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
 @set UPDATED 11 November 2003
 @set UPDATED-MONTH November 2003
-@set EDITION 1.7a
-@set VERSION 1.7a
+@set EDITION 1.7b
+@set VERSION 1.7b
diff --git a/doc/version.texi b/doc/version.texi
index eef25dad6..137f696d7 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 11 November 2003
 @set UPDATED-MONTH November 2003
-@set EDITION 1.7a
-@set VERSION 1.7a
+@set EDITION 1.7b
+@set VERSION 1.7b
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 7dd291691..eaf3eecdd 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7a from Makefile.am.
+# Makefile.in generated by automake 1.7b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 2c58be17c..2889602cb 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7a from Makefile.am.
+# Makefile.in generated by automake 1.7b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 7a078167f..3d29d20b3 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7a from Makefile.am.
+# Makefile.in generated by automake 1.7b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 610472154..0971f3440 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7a from Makefile.am.
+# Makefile.in generated by automake 1.7b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/m4/Makefile.in b/m4/Makefile.in
index e3c4ec362..8671ac193 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7a from Makefile.am.
+# Makefile.in generated by automake 1.7b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index ef328b466..bd3bb6810 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -19,11 +19,11 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7a"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7b"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.7a])])
+	 [AM_AUTOMAKE_VERSION([1.7b])])
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 139579095..11555706d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7a from Makefile.am.
+# Makefile.in generated by automake 1.7b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003