releasing 1.4.11

[Eric Blake]

I committed the following in order to make the 1.4.11 release.  I'm still 
trying to track down why the files haven't shown up on ftp.gnu.org, but my 
internet connectivity had some problems this morning when I was running the 
build-aux/gnupload script.  Hopefully, the actual release tarballs will show up 
within the next few hours.  (I guess should have verified that thet files were 
correctly uploaded by gnupload prior to sending the announcment, but oh well).


>From efe67347a34c86260c238a072f747c3323479d75 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 1 Apr 2008 19:47:12 -0600
Subject: [PATCH] Speed up index builtin.

* m4/gnulib-cache: Import strstr module.
* NEWS: Mention the speedup.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog          |    6 ++++++
 NEWS               |   10 ++++++++--
 m4/gnulib-cache.m4 |    4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2c9b114..3a27d68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-01  Eric Blake  <address@hidden>
+
+       Speed up index builtin.
+       * m4/gnulib-cache: Import strstr module.
+       * NEWS: Mention the speedup.
+
 2008-03-29  Eric Blake  <address@hidden>
 
        Fix testsuite on mingw, OpenBSD.
diff --git a/NEWS b/NEWS
index a9020c8..e4e8615 100644
--- a/NEWS
+++ b/NEWS
@@ -26,8 +26,14 @@ Foundation, Inc.
    lift this restriction to match other implementations.
 
 ** Enhance the `format' builtin to parse all C99 floating point numbers,
-   even on platforms where strtod is lacking.  This fixes testsuite
-   failures introduced in 1.4.9b.
+   even on platforms where strtod(3) is buggy, although the replacement
+   function does have the known issue of rounding errors when parsing
+   some decimal floating point values.  This fixes testsuite failures
+   introduced in 1.4.9b.
+
+** Enhance the `index' builtin to guarantee linear behavior, in spite of
+   the surprisingly large number of systems with a brain-dead quadratic
+   strstr(3).
 
 ** A number of portability improvements inherited from gnulib.
 
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 95b5e38..fc7e67a 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,11 +15,11 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 --source-
base=lib --m4-base=m4 --doc-base=doc --aux-dir=build-aux --with-tests --no-
libtool --macro-prefix=M4 announce-gen assert avltree-oset binary-io clean-temp 
cloexec close-stream closein config-h error fdl fflush fopen-safer fseeko 
gendocs getopt git-version-gen gnumakefile gnupload gpl-3.0 intprops mkstemp 
obstack regex stdbool stdint stdlib-safer strtod strtol unlocked-io verror 
version-etc version-etc-fsf xalloc xprintf xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 --source-
base=lib --m4-base=m4 --doc-base=doc --aux-dir=build-aux --with-tests --no-
libtool --macro-prefix=M4 announce-gen assert avltree-oset binary-io clean-temp 
cloexec close-stream closein config-h error fdl fflush fopen-safer fseeko 
gendocs getopt git-version-gen gnumakefile gnupload gpl-3.0 intprops mkstemp 
obstack regex stdbool stdint stdlib-safer strstr strtod strtol unlocked-io 
verror version-etc version-etc-fsf xalloc xprintf xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
-gl_MODULES([announce-gen assert avltree-oset binary-io clean-temp cloexec 
close-stream closein config-h error fdl fflush fopen-safer fseeko gendocs 
getopt git-version-gen gnumakefile gnupload gpl-3.0 intprops mkstemp obstack 
regex stdbool stdint stdlib-safer strtod strtol unlocked-io verror version-etc 
version-etc-fsf xalloc xprintf xvasprintf-posix])
+gl_MODULES([announce-gen assert avltree-oset binary-io clean-temp cloexec 
close-stream closein config-h error fdl fflush fopen-safer fseeko gendocs 
getopt git-version-gen gnumakefile gnupload gpl-3.0 intprops mkstemp obstack 
regex stdbool stdint stdlib-safer strstr strtod strtol unlocked-io verror 
version-etc version-etc-fsf xalloc xprintf xvasprintf-posix])
 gl_AVOID([])
 gl_SOURCE_BASE([lib])
 gl_M4_BASE([m4])
-- 
1.5.4


>From c07173b0a58b56c07633a28323d56451b98b7de5 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 1 Apr 2008 20:08:08 -0600
Subject: [PATCH] Prepare for release.

* maint.mk (alpha): Check for PREV_VERSION setting sooner, and
remove tag operation.
(version-check): Enhance this check.
(prev-tarball): Depend on version-check.
(this-vc-tag): Delete, and mention need to run tag...
* HACKING: ...here, prior to make maintainer-distcheck.
Update the instructions to match this particular release process.
* Makefile.am (.version, announcement): Allow for VPATH build.
* cfg.mk (gnulib_dir): Likewise.
* doc/Makefile.am ($(srcdir)/m4.1): Include release number in man
page.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog       |   15 +++++++++++++++
 HACKING         |   41 ++++++++++++++++++++++-------------------
 Makefile.am     |    4 ++--
 cfg.mk          |    2 +-
 doc/Makefile.am |    8 ++++----
 maint.mk        |   21 ++++++---------------
 6 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a27d68..4e117bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-04-02  Eric Blake  <address@hidden>
+
+       Prepare for release.
+       * maint.mk (alpha): Check for PREV_VERSION setting sooner, and
+       remove tag operation.
+       (version-check): Enhance this check.
+       (prev-tarball): Depend on version-check.
+       (this-vc-tag): Delete, and mention need to run tag...
+       * HACKING: ...here, prior to make maintainer-distcheck.
+       Update the instructions to match this particular release process.
+       * Makefile.am (.version, announcement): Allow for VPATH build.
+       * cfg.mk (gnulib_dir): Likewise.
+       * doc/Makefile.am ($(srcdir)/m4.1): Include release number in man
+       page.
+
 2008-04-01  Eric Blake  <address@hidden>
 
        Speed up index builtin.
diff --git a/HACKING b/HACKING
index 8a049c2..2f7ecdb 100644
--- a/HACKING
+++ b/HACKING
@@ -81,7 +81,7 @@ and is not part of a release distribution.
   liberally, on as many platforms as you can.  Use as many compilers and
   linkers you can.
 
-* For branch-1_4, the testsuite is generated from the documentation.
+* For branch-1.4, the testsuite is generated from the documentation.
   All instances of @example in doc/m4.texinfo that are not preceeded by
   "@comment ignore" are turned into tests in the checks directory.
 
@@ -195,11 +195,12 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny 
change)
 
 * Make sure your locale is sane, e.g. by exporting LC_ALL=C.
 
-* Update the version number in configure.ac.
-  See http://www.gnu.org/software/libtool/contribute.html for details of
-  the numbering scheme (m4 uses the same scheme as libtool).
-
-* Update NEWS, configure.ac, README, ChangeLog.
+* Update the version number in NEWS and ChangeLog, and mention in README
+  whether the release is stable.  See
+  http://www.gnu.org/software/libtool/contribute.html for details of the
+  numbering scheme (M4 uses a similar scheme to libtool, although
+  intra-release versions carry more information thanks to
+  git-version-gen).
 
 * Run ./bootstrap.
 
@@ -209,16 +210,19 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny 
change)
   be up-to-date with m4 --help output, but `make dist' intentionally
   does not depend on running a built binary.
 
-* Run `make maintainer-distcheck'.  If there are any problems, fix them
-  and start again.
-
 * Run `git commit' from the source tree if there are any changes from
   the previous steps.
 
+* Run `git tag -s -m <version> -u <gpg_key> v<version>' with the desired
+  version number.  Do not push anything upstream at this point.
+
+* Run `make maintainer-distcheck'.  If there are any problems, fix them,
+  run `git tag -d v<version>' and start again from the `git commit' step.
+
 * Run `make <target> PREV_VERSION=maj.min[.mic[alpha]]', with target set
   to `major', `alpha', or `beta' as appropriate.  This will run various
-  additional checks, tag the tree with release-$(VERSION), and create
-  diff and xdelta files from the previous version.
+  additional checks and create diff and xdelta files from the previous
+  version.
 
 * Run './build-aux/gnupload --to [dest].gnu.org:m4 [files]' to create
   detached gpg signature and clear signed directive files, and upload
@@ -230,19 +234,18 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny 
change)
 * Send announcement to address@hidden, address@hidden, and
   address@hidden  If not an alpha send to address@hidden
   as well.  Use /tmp/announce-m4-<version>, created during the above
-  make run, as a starting point.  Contact a list administrator for
-  m4-announce in advance to ensure your post will make it through (the
-  list is normally set to silently discard all posts, even from
-  subscribers).
+  `make <target>' run, as a starting point.  Contact a list
+  administrator for m4-announce in advance to ensure your post will make
+  it through (the list is normally set to silently discard all posts,
+  even from subscribers).
 
 * Update version number in configure.ac to next alpha number.
   See http://www.gnu.org/software/libtool/contribute.html for details of
   the numbering scheme.
 
-* Update NEWS, configure.ac, ChangeLog.
-
-* Run `git commit' and `git push origin refs/tags/<version>' to push the
-  release tag.
+* Update NEWS, README, and ChangeLog to start the intra-release changes,
+  and run `git commit'.  Then run `git push origin refs/tags/v<version>'
+  to push the release tag and complete the release.
 
 * For non-alpha releases, update the webpages.  Replace manual.html with
   the new one (generate with `make web-manual').
diff --git a/Makefile.am b/Makefile.am
index 81ea47e..a67b415 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,8 +34,8 @@ MAINTAINERCLEANFILES = COPYING INSTALL Makefile.in aclocal.m4 
\
 ACLOCAL_AMFLAGS = -I m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-changeword
 
-BUILT_SOURCES = .version
-.version:
+BUILT_SOURCES = $(top_srcdir)/.version
+$(top_srcdir)/.version:
        echo $(VERSION) > address@hidden && mv address@hidden $@
 
 # Arrange so that .tarball-version appears only in the distribution
diff --git a/cfg.mk b/cfg.mk
index e753730..8de2510 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -35,4 +35,4 @@ local-checks-to-skip = changelog-check
 
 # The local directory containing the checked-out copy of gnulib used in this
 # release.  Used solely to get gnulib's SHA1 for the "announcement" target.
-gnulib_dir = ../gnulib
+gnulib_dir = $(srcdir)/../gnulib
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b5cd360..b1b7eac 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+## Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
@@ -27,15 +27,15 @@ MAINTAINERCLEANFILES = $(man_MANS) gendocs_template
 SUFFIXES = .1
 HELP2MAN = $(SHELL) $(top_srcdir)/build-aux/missing --run help2man
 
-# Depend on configure.ac for version, m4.c for usage text.  Do not depend on
+# Depend on ../.version for version, m4.c for usage text.  Do not depend on
 # built m4 executable, since not everyone has help2man or perl.
 # Build the man page once in the srcdir, rather than in every VPATH build
 # dir, to match how automake builds info pages.  This is safe for 'make
 # distcheck' since it is distributed pre-built.
-$(srcdir)/m4.1: $(top_srcdir)/configure.ac $(top_srcdir)/src/m4.c
+$(srcdir)/m4.1: $(top_srcdir)/.version $(top_srcdir)/src/m4.c
        @if test -x ../src/m4$(EXEEXT) ; then \
          echo "Updating man page m4.1" ; \
-         $(HELP2MAN) --name="macro processor" --source=FSF \
+         $(HELP2MAN) --name="macro processor" --source='$(PACKAGE_STRING)' \
            --info-page=m4 --output=$@ ../src/m4$(EXEEXT) ; \
        else \
          echo "WARNING: The \`man' page \`$@' cannot be updated yet."; \
diff --git a/maint.mk b/maint.mk
index 9558fd7..fa55ac3 100644
--- a/maint.mk
+++ b/maint.mk
@@ -27,19 +27,11 @@ gzip_rsyncable := \
   $(shell gzip --help 2>/dev/null|grep rsyncable >/dev/null && echo --
rsyncable)
 GZIP_ENV = '--no-name --best $(gzip_rsyncable)'
 
-CVS = cvs
 GIT = git
 VC = $(GIT)
 VC-tag = git tag -s -m '$(VERSION)' -u $(gpg_key_ID)
 
 VERSION_REGEXP = $(subst .,\.,$(VERSION))
-ifeq ($(VC),$(GIT))
-this-vc-tag = v$(VERSION)
-else
-tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]')
-tag-this-version = $(subst .,_,$(VERSION))
-this-vc-tag = $(tag-package)-$(tag-this-version)
-endif
 my_distdir = $(PACKAGE)-$(VERSION)
 
 # Ensure that we use only the standard $(VAR) notation,
@@ -130,19 +122,19 @@ my-distcheck: $(local-check) check
 gnulib-version = $$(cd $(gnulib_dir) && git describe)
 
 announcement: NEWS ChangeLog $(rel-files)
-       @./build-aux/announce-gen                                       \
+       @$(srcdir)/build-aux/announce-gen                               \
            --release-type=$(RELEASE_TYPE)                              \
            --package=$(PACKAGE)                                        \
            --prev=$(PREV_VERSION)                                      \
            --curr=$(VERSION)                                           \
            --gpg-key-id=$(gpg_key_ID)                                  \
-           --news=NEWS                                                 \
+           --news=$(srcdir)/NEWS                                       \
            --bootstrap-tools=autoconf,automake,gnulib                  \
            --gnulib-version=$(gnulib-version)                          \
            $(addprefix --url-dir=, $(url_dir_list))
 
 .PHONY: alpha beta major
-alpha beta major: $(local-check)
+alpha beta major: $(local-check) version-check
        test $@ = major                                         \
          && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \
               || { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\
@@ -151,7 +143,6 @@ alpha beta major: $(local-check)
        $(MAKE) news-date-check changelog-check
        $(MAKE) deltas
        $(MAKE) -s announcement RELEASE_TYPE=$@ > /tmp/announce-$(my_distdir)
-       $(VC-tag) $(this-vc-tag)
 
 .PHONY: version-check
 version-check:
@@ -162,12 +153,12 @@ version-check:
          exit 1; \
          ;; \
        esac
+       @if test -z "$(PREV_VERSION)"; \
+               then echo "PREV_VERSION is not set"; exit 1; fi
 
 .PHONY: prev-tarball
-prev-tarball:
+prev-tarball: version-check
 ## Make sure we have the previous release tarball in the tree.
-       @if test -z "$(PREV_VERSION)"; \
-               then echo "PREV_VERSION is not set"; exit 1; fi
        @ofile="$(PACKAGE)-$(PREV_VERSION).tar.gz"; \
        if test -f $$ofile; then :; \
        else echo "Cannot make deltas without $$ofile"; exit 1; fi
-- 
1.5.4


>From a62ec6b647bb3e7105cfa625d9cb48c7297ee9d8 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Wed, 2 Apr 2008 06:12:01 -0600
Subject: [PATCH] Release Version 1.4.11.

* NEWS: Mention the release.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog |    3 +++
 NEWS      |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4e117bb..04dc8fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-02  Eric Blake  <address@hidden>
 
+       Release Version 1.4.11.
+       * NEWS: Mention the release.
+
        Prepare for release.
        * maint.mk (alpha): Check for PREV_VERSION setting sooner, and
        remove tag operation.
diff --git a/NEWS b/NEWS
index e4e8615..b609525 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ GNU M4 NEWS - User visible changes.
 Copyright (C) 1992, 1993, 1994, 2004, 2005, 2006, 2007, 2008 Free Software
 Foundation, Inc.
 
-* Noteworthy changes in Version 1.4.11 (2008-??-??) [stable]
+* Noteworthy changes in Version 1.4.11 (2008-04-02) [stable]
   Released by Eric Blake, based on git version 1.4.10a
 
 ** Security fixes for the -F option, for bugs present since -F was
-- 
1.5.4