Use gnulib maintainer-makefile module.

* m4/gnulib-cache.m4: Import maintainer-makefile module.
* cfg.mk (local-checks-to-skip): Drop changelog-check; add
sc_cast_of_x_alloc_return_value.
(gnulib_dir): Delete; provided by maint.mk.
(config_h_header, old_NEWS_hash): New macros.
* .prev-version: New file.
* gnulib: Import latest gnulib.
* maint.mk: Remove from version control; use gnulib instead.
* .gitignore: Update.

Signed-off-by: Eric Blake <ebb9@byu.net>

7 files changed, 26 insertions, 209 deletions

diff --git a/.gitignore b/.gitignore
index 1074fdac..2ab1a8bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@
 /m4-*
 /m4/.gitignore
 /m4/gnulib-comp.m4
+/maint.mk
 Makefile.in
 Makefile
 /missing
diff --git a/.prev-version b/.prev-version
new file mode 100644
index 00000000..acd81d7f
--- /dev/null
+++ b/.prev-version
@@ -0,0 +1 @@
+1.4.13
diff --git a/ChangeLog b/ChangeLog
index 3362dc80..f643747b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-05-18  Eric Blake  <ebb9@byu.net>
+
+	Use gnulib maintainer-makefile module.
+	* m4/gnulib-cache.m4: Import maintainer-makefile module.
+	* cfg.mk (local-checks-to-skip): Drop changelog-check; add
+	sc_cast_of_x_alloc_return_value.
+	(gnulib_dir): Delete; provided by maint.mk.
+	(config_h_header, old_NEWS_hash): New macros.
+	* .prev-version: New file.
+	* gnulib: Import latest gnulib.
+	* maint.mk: Remove from version control; use gnulib instead.
+	* .gitignore: Update.
+
 2009-05-14  Eric Blake  <ebb9@byu.net>
 
 	Drop .cvsignore and redundant .gitignore files.
diff --git a/cfg.mk b/cfg.mk
index 2aac5ac6..ccdfa39d 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -29,12 +29,12 @@ url_dir_list = ftp://$(gnu_rel_host)/gnu/m4
 # The GnuPG ID of the key used to sign the tarballs.
 gpg_key_ID = F4850180
 
-# Tests not to run as part of "make distcheck".
-# Exclude changelog-check here so that there's less churn in ChangeLog
-# files -- otherwise, you'd need to have the upcoming version number
-# at the top of the file for each `make distcheck' run.
-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 = $(srcdir)/gnulib
+# Tests not to run as part of "make syntax-check".
+# M4 intentionally uses a coding style that compiles under C++.
+local-checks-to-skip = sc_cast_of_x_alloc_return_value
+
+# Our files include "m4.h", which in turn includes <config.h> first.
+config_h_header = "m4\.h"
+
+# Hash of NEWS contents, to ensure we don't add entries to wrong section.
+old_NEWS_hash = 0330971054cd4fb4e94b85fe367980f2
diff --git a/gnulib b/gnulib
-Subproject 8fdb8486e14c433b2b277eb11c97e859b282e7d
+Subproject 2c9ffa2717e5fa3d4951b589d7a6d871326fa09
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 1ad5a8db..b3dc67ee 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # 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 --tests-base=tests --aux-dir=build-aux --with-tests --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein config-h dirname error execute fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs getopt git-version-gen gnumakefile gnupload gpl-3.0 hash intprops memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix pipe progname quote regex rename stdbool stdint stdlib-safer strtod strtol unlocked-io vasnprintf-posix verror version-etc version-etc-fsf wait-process xalloc xmemdup0 xprintf xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein config-h dirname error execute fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs getopt git-version-gen gnumakefile gnupload gpl-3.0 hash intprops maintainer-makefile memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix pipe progname quote regex rename stdbool stdint stdlib-safer strtod strtol unlocked-io vasnprintf-posix verror version-etc version-etc-fsf wait-process xalloc xmemdup0 xprintf xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
@@ -50,6 +50,7 @@ gl_MODULES([
   gpl-3.0
   hash
   intprops
+  maintainer-makefile
   memchr2
   memcmp2
   memmem
diff --git a/maint.mk b/maint.mk
deleted file mode 100644
index 5fa32a59..00000000
--- a/maint.mk
+++ /dev/null
@@ -1,199 +0,0 @@
-## maint.mk -- Makefile rules for m4 maintainers -*-Makefile-*-
-##
-## Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
-##
-## This file is part of GNU M4.
-##
-## GNU M4 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 3 of the License, or
-## (at your option) any later version.
-##
-## GNU M4 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/>.
-
-# This is reported not to work with make-3.79.1
-# ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
-ME := maint.mk
-
-# Do not save the original name or timestamp in the .tar.gz file.
-# Use --rsyncable if available.
-gzip_rsyncable := \
-  $(shell gzip --help 2>/dev/null|grep rsyncable >/dev/null && echo --rsyncable)
-GZIP_ENV = '--no-name --best $(gzip_rsyncable)'
-
-GIT = git
-VC = $(GIT)
-VC-tag = git tag -s -m '$(VERSION)' -u $(gpg_key_ID)
-
-VERSION_REGEXP = $(subst .,\.,$(VERSION))
-my_distdir = $(PACKAGE)-$(VERSION)
-
-# Ensure that we use only the standard $(VAR) notation,
-# not @...@ in Makefile.am, now that we can rely on automake
-# to emit a definition for each substituted variable.
-makefile-check:
-	grep -nE '@[A-Z_0-9]+@' `find $(srcdir) -name Makefile.am` \
-	  && { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || :
-
-news-date-check: NEWS version-check
-	today=`date +%Y-%m-%d`;						\
-	if head $(srcdir)/NEWS | grep '^\*.* $(VERSION_REGEXP) ('$$today')'	\
-	    >/dev/null; then						\
-	  :;								\
-	else								\
-	  echo "version or today's date is not in NEWS" 1>&2;		\
-	  exit 1;							\
-	fi
-
-changelog-check:
-	if head $(srcdir)/ChangeLog | grep 'Version $(VERSION_REGEXP)\.$$'	\
-	    >/dev/null; then						\
-	  :;								\
-	else								\
-	  echo "$(VERSION) not in ChangeLog" 1>&2;			\
-	  exit 1;							\
-	fi
-
-m4-check:
-	@grep -n 'AC_DEFUN([^[]' $(srcdir)/m4/*.m4 \
-	  && { echo '$(ME): quote the first arg to AC_DEFUN' 1>&2; \
-	       exit 1; } || :
-
-vc-diff-check:
-	(CDPATH=; cd $(srcdir) && $(VC) diff) > vc-diffs || :
-	if test -s vc-diffs; then				\
-	  cat vc-diffs;						\
-	  echo "Some files are locally modified:" 1>&2;		\
-	  exit 1;						\
-	else							\
-	  rm vc-diffs;						\
-	fi
-
-maintainer-distcheck:
-	$(MAKE) distcheck
-	$(MAKE) my-distcheck
-
-# Don't make a distribution if checks fail.
-# Also, make sure the NEWS file is up-to-date.
-vc-dist: $(local-check) vc-diff-check maintainer-distcheck
-	$(MAKE) dist
-
-# Use this to make sure we don't run these programs when building
-# from a virgin tgz file, below.
-null_AM_MAKEFLAGS = \
-  ACLOCAL=false \
-  AUTOCONF=false \
-  AUTOMAKE=false \
-  AUTOHEADER=false \
-  MAKEINFO=false
-
-# Use -Wformat -Werror to detect format-string/arg-list mismatches.
-# Also, check for shadowing problems with -Wshadow, and for pointer
-# arithmetic problems with -Wpointer-arith.
-# These CFLAGS are pretty strict.  If you build this target, you probably
-# have to have a recent version of gcc and glibc headers.
-TMPDIR ?= /tmp
-t=$(TMPDIR)/$(PACKAGE)/test
-my-distcheck: $(local-check) check
-	-rm -rf $(t)
-	mkdir -p $(t)
-	GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz
-	cd $(t)/$(distdir)				\
-	  && ./configure				\
-	  && $(MAKE) CFLAGS='$(warn_cflags)'		\
-	      AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)'	\
-	  && $(MAKE) dvi				\
-	  && $(MAKE) check				\
-	  && $(MAKE) distclean
-	(cd $(t) && mv $(distdir) $(distdir).old	\
-	  && $(AMTAR) -zxf - ) < $(distdir).tar.gz
-	diff -ur $(t)/$(distdir).old $(t)/$(distdir)
-	-rm -rf $(t)
-	@echo "========================"; \
-	echo "$(distdir).tar.gz is ready for distribution"; \
-	echo "========================"
-
-gnulib-version = $$(cd $(gnulib_dir) && git describe)
-
-announcement: NEWS ChangeLog $(rel-files)
-	@$(srcdir)/build-aux/announce-gen				\
-	    --release-type=$(RELEASE_TYPE)				\
-	    --package=$(PACKAGE)					\
-	    --prev=$(PREV_VERSION)					\
-	    --curr=$(VERSION)						\
-	    --gpg-key-id=$(gpg_key_ID)					\
-	    --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) version-check
-	test $@ = major						\
-	  && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$'	\
-	       || { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\
-	  || :
-	$(MAKE) vc-dist
-	$(MAKE) news-date-check changelog-check
-	$(MAKE) deltas
-	$(MAKE) -s announcement RELEASE_TYPE=$@ > /tmp/announce-$(my_distdir)
-
-.PHONY: version-check
-version-check:
-	@case $(VERSION) in \
-	*[acegikmoqsuwy]) \
-	  echo "Version \`$(VERSION)' is not a releasable version, please read:"; \
-	  echo "    http://www.gnu.org/software/libtool/contribute.html"; \
-	  exit 1; \
-	  ;; \
-	esac
-	@if test -z "$(PREV_VERSION)"; \
-		then echo "PREV_VERSION is not set"; exit 1; fi
-
-.PHONY: prev-tarball
-prev-tarball: version-check
-## Make sure we have the previous release tarball in the tree.
-	@ofile="$(PACKAGE)-$(PREV_VERSION).tar.gz"; \
-	if test -f $$ofile; then :; \
-	else echo "Cannot make deltas without $$ofile"; exit 1; fi
-
-.PHONY: new-tarball
-new-tarball:
-## Make sure we have the new release tarball in the tree.
-	@ofile="$(PACKAGE)-$(VERSION).tar.gz"; \
-	if test -f $$ofile; then :; \
-	else echo "Cannot make deltas without $$ofile"; exit 1; fi
-
-.PHONY: deltas
-deltas: delta-diff
-
-DIFF = diff
-DIFF_OPTIONS = -ruNp
-
-.PHONY: delta-diff
-delta-diff: prev-tarball new-tarball
-## Unpack the tarballs somewhere to diff them
-	rm -rf delta-diff
-	mkdir delta-diff
-	ofile="../$(PACKAGE)-$(PREV_VERSION)-$(VERSION).diff.gz"; \
-	cd delta-diff \
-	&& tar xzf "../$(PACKAGE)-$(PREV_VERSION).tar.gz" \
-	&& tar xzf "../$(PACKAGE)-$(VERSION).tar.gz" \
-	&& $(DIFF) $(DIFF_OPTIONS) \
-		$(PACKAGE)-$(PREV_VERSION) $(PACKAGE)-$(VERSION) \
-		| GZIP=$(GZIP_ENV) gzip -c > $$ofile
-	rm -rf delta-diff
-
-.PHONY: web-manual
-web-manual:
-	@cd '$(srcdir)/doc' ; \
-	  $(SHELL) ../build-aux/gendocs.sh -o '$(abs_builddir)/doc/manual' \
-	    --email $(PACKAGE_BUGREPORT) $(PACKAGE) \
-	    "$(PACKAGE_NAME) - $(manual_title)"
-	@echo " *** Upload the doc/manual directory to web-cvs."