From: Akim Demaille <akim@epita.fr>
Date: Sun, 25 Feb 2001 10:42:49 +0000 (+0000)
Subject: * autoupdate.in: Less Bournisms, more Wallisms.
X-Git-Tag: autoconf-2.50~126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=216c0fe12ea962d86c152d6504ef86a4aa78d52e;p=thirdparty%2Fautoconf.git

* autoupdate.in: Less Bournisms, more Wallisms.
---

diff --git a/ChangeLog b/ChangeLog
index 352018002..2eb749a44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-25  Akim Demaille  <akim@epita.fr>
+
+	* autoupdate.in: Less Bournisms, more Wallisms.
+
 2001-02-23  Jim Meyering  <meyering@lucent.com>
 
 	* acgeneral.m4 (_AC_INIT_PREPARE_FS_SEPARATORS): Fix typo: s/;/:/
diff --git a/Makefile.in b/Makefile.in
index fd7694bde..bf9bc153b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4d from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -10,7 +11,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -32,8 +32,6 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -46,9 +44,11 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -57,6 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+
+@SET_MAKE@
 AWK = @AWK@
 EXPR = @EXPR@
 HELP2MAN = @HELP2MAN@
@@ -65,6 +67,7 @@ PERL = @PERL@
 PERLSCRIPTS = @PERLSCRIPTS@
 standards_texi = @standards_texi@
 
+
 AUTOMAKE_OPTIONS = check-news 1.4 readme-alpha
 
 SUBDIRS = . m4 man doc tests
@@ -85,33 +88,59 @@ PACKAGE_NAME = @PACKAGE_NAME@
 # s/nodistpackageDATA/nodist_pkgdata_DATA/
 # and adapt dependencies once we use a more recent Automake
 
-m4sources = m4sugar.m4 m4sh.m4               autoconf.m4              acgeneral.m4 acoldnames.m4 acspecific.m4 aclang.m4 acversion.m4              acfunctions.m4 acheaders.m4 actypes.m4
+m4sources = m4sugar.m4 m4sh.m4  \
+             autoconf.m4 \
+             acgeneral.m4 acoldnames.m4 acspecific.m4 aclang.m4 acversion.m4 \
+             acfunctions.m4 acheaders.m4 actypes.m4
 
 
-distpkgdataDATA = acfunctions acheaders acidentifiers acmakevars acprograms                   $(m4sources)
+distpkgdataDATA = acfunctions acheaders acidentifiers acmakevars acprograms \
+                  $(m4sources)
 
 
 nodistpkgdataDATA = autoconf.m4f
 
 pkgdata_DATA = $(distpkgdataDATA) $(nodistpkgdataDATA)
 
-EXTRA_DIST = ChangeLog.0 ChangeLog.1              BUGS INSTALL.txt              acversion.m4.in              autoconf.sh autoheader.sh autoreconf.sh autoupdate.in ifnames.sh              autoscan.pl              $(distpkgdataDATA)
+EXTRA_DIST = ChangeLog.0 ChangeLog.1 \
+             BUGS INSTALL.txt \
+             acversion.m4.in \
+             autoconf.sh autoheader.sh autoreconf.sh autoupdate.in ifnames.sh \
+             autoscan.pl \
+             $(distpkgdataDATA)
 
 
 # Files that should be removed, but which Automake does not know:
 # the frozen files and the scripts.
-CLEANFILES = autoconf.m4f              $(bin_SCRIPTS)
+CLEANFILES = autoconf.m4f \
+             $(bin_SCRIPTS)
 
 
 MAINTAINERCLEANFILES = acversion.m4 INSTALL.txt
 
-edit = sed 	-e 's,@SHELL\@,$(SHELL),g' 	-e 's,@PERL\@,$(PERL),g' 	-e 's,@datadir\@,$(pkgdatadir),g' 	-e 's,@bindir\@,$(bindir),g' 	-e 's,@autoconf-name\@,'`echo autoconf | sed '$(transform)'`',g' 	-e 's,@autoheader-name\@,'`echo autoheader | sed '$(transform)'`',g' 	-e 's,@M4\@,$(M4),g' 	-e 's,@AWK\@,$(AWK),g' 	-e 's,@VERSION\@,$(VERSION),g' 	-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g'
-
+edit = sed \
+	-e 's,@SHELL\@,$(SHELL),g' \
+	-e 's,@PERL\@,$(PERL),g' \
+	-e 's,@datadir\@,$(pkgdatadir),g' \
+	-e 's,@bindir\@,$(bindir),g' \
+	-e 's,@autoconf-name\@,'`echo autoconf | sed '$(transform)'`',g' \
+	-e 's,@autoheader-name\@,'`echo autoheader | sed '$(transform)'`',g' \
+	-e 's,@M4\@,$(M4),g' \
+	-e 's,@AWK\@,$(AWK),g' \
+	-e 's,@VERSION\@,$(VERSION),g' \
+	-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g'
+
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 SCRIPTS =  $(bin_SCRIPTS)
 
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = 
 DATA =  $(pkgdata_DATA)
 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
@@ -122,19 +151,19 @@ config.sub configure configure.in install-sh missing mkinstalldirs
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
 GZIP_ENV = --best
-all: all-redirect
+DIST_SUBDIRS =  $(SUBDIRS)
+all: all-recursive
 .SUFFIXES:
 .SUFFIXES: .m4 .m4f
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -146,38 +175,40 @@ install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  f="`echo $$p|sed '$(transform)'`"; \
 	  if test -f $$p; then \
-	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-	  else if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-	  else :; fi; fi; \
+	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \
+	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \
+	  elif test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \
+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \
+	  else :; fi; \
 	done
 
 uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  f="`echo $$p|sed '$(transform)'`"; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	@list='$(pkgdata_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
-	  fi; fi; \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
 	done
 
 uninstall-pkgdataDATA:
 	@$(NORMAL_UNINSTALL)
-	list='$(pkgdata_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
+	@list='$(pkgdata_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
+	  rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
 	done
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -186,9 +217,6 @@ uninstall-pkgdataDATA:
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
 all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
@@ -214,11 +242,16 @@ mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
 	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
@@ -237,15 +270,17 @@ tags-recursive:
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -253,77 +288,91 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
    fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
+	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
 
-clean-tags:
+GTAGS:
+	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $$here
 
 distclean-tags:
 	-rm -f TAGS ID
 
-maintainer-clean-tags:
-
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 
+
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
+	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
 	mkdir $(distdir)/=build
 	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
+	chmod a-w $(distdir)
+	dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
+	  && cd $(distdir)/=build \
 	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && $(MAKE) $(AM_MAKEFLAGS) distclean \
+	  && rm -f $(distdir).tar.gz \
+	  && test `find . -type f -print | wc -l` -eq 0
+	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
 	@banner="$(distdir).tar.gz is ready for distribution"; \
 	dashes=`echo "$$banner" | sed s/./=/g`; \
 	echo "$$dashes"; \
 	echo "$$banner"; \
 	echo "$$dashes"
 dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz
+	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
 dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz
+	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
+
 distdir: $(DISTFILES)
 	@if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
 	  echo "NEWS not updated; not releasing" 1>&2; \
 	  exit 1; \
 	fi
-	-rm -rf $(distdir)
+	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
 	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
+	$(mkinstalldirs) $(distdir)/tests tests
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
 	for subdir in $(SUBDIRS); do \
@@ -331,8 +380,8 @@ distdir: $(DISTFILES)
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
 	      || exit 1; \
 	  fi; \
 	done
@@ -358,9 +407,8 @@ install: install-recursive
 uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataDATA
 uninstall: uninstall-recursive
 all-am: Makefile $(SCRIPTS) $(DATA)
-all-redirect: all-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs: installdirs-recursive
 installdirs-am:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir)
@@ -376,41 +424,41 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f Makefile.in
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
 clean: clean-recursive
 
-distclean-am:  distclean-tags distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic distclean-tags
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
-.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-pkgdataDATA \
-install-pkgdataDATA install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all-recursive check check-am check-recursive clean clean-generic \
+	clean-recursive distclean distclean-generic distclean-recursive \
+	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+	info-recursive install install-am install-binSCRIPTS \
+	install-data install-data-am install-data-recursive \
+	install-exec install-exec-am install-exec-recursive \
+	install-pkgdataDATA install-recursive install-strip \
+	installcheck installcheck-am installcheck-recursive installdirs \
+	installdirs-am installdirs-recursive maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+	mostlyclean-generic mostlyclean-recursive tags tags-recursive \
+	uninstall uninstall-am uninstall-binSCRIPTS \
+	uninstall-pkgdataDATA uninstall-recursive
 
 
 # - acversion.m4 needs to be updated only once, since it depends on
diff --git a/autoupdate.in b/autoupdate.in
index 7bc9fdb30..ac8876c0d 100644
--- a/autoupdate.in
+++ b/autoupdate.in
@@ -20,6 +20,7 @@
 # Originally written by David MacKenzie <djm@gnu.ai.mit.edu>.
 # Rewritten by Akim Demaille <akim@freefriends.org>.
 
+require 5.005;
 use Getopt::Long;
 use strict;
 
@@ -188,58 +189,97 @@ parse_args;
 $autoconf .= " -l $localdir";
 $ENV{'autoconf_dir'} = $autoconf_dir;
 
-# m4.txt -- the builtins of m4.
-system ("echo dumpdef | "
-	. "$m4 2>&1 >/dev/null | "
-	. "sed -n 's/:.*//p' "
-	. ">$tmp/m4.txt");
+# @M4_BUILTINS -- M4 builtins and a useful comment.
+open M4_BUILTINS, "echo dumpdef | $m4 2>&1 >/dev/null |"
+  or die "$me: cannot open: $!\n";
+my @m4_builtins = <M4_BUILTINS>;
+close M4_BUILTINS
+  or die "$me: cannot close: $!\n";
+map { s/:.*//;s/\W// } @m4_builtins;
 
-# m4.m4 -- enable the m4 builtins.
-system ("sed 's/^.*\$/_au_define([&], _au_defn([_au_&]))/' $tmp/m4.txt "
-	. ">$tmp/m4.m4");
 
+# m4.m4 -- enable the m4 builtins.
 # unm4.m4 -- disable the m4 builtins.
-system ("sed 's/^.*\$/_au_undefine([&])/' $tmp/m4.txt >$tmp/unm4.m4");
-
 # savem4.m4 -- save the m4 builtins.
-system ("sed 's/^.*\$/define([_au_&], defn([&]))/' $tmp/m4.txt "
-	. ">$tmp/m4save.m4");
-
-# au.txt -- list of all the AU macros.
-system ("$autoconf --trace AU_DEFUN:'\$1' -i /dev/null | "
-	. "sort -u "
-	. ">$tmp/au.txt");
-
-# au-del.sed -- delete the AU macro names.
-system ("sed \"s,^.*\$,/&/d,\" $tmp/au.txt "
-	. " >$tmp/au-del.sed");
+open M4_M4, ">$tmp/m4.m4"
+  or die "$me: cannot open: $!\n";
+open UNM4_M4, ">$tmp/unm4.m4"
+  or die "$me: cannot open: $!\n";
+open M4SAVE_M4, ">$tmp/m4save.m4"
+  or die "$me: cannot open: $!\n";
+foreach (@m4_builtins)
+  {
+    print M4_M4     "_au_define([$_], _au_defn([_au_$_]))\n";
+    print UNM4_M4   "_au_undefine([$_])\n";
+    print M4SAVE_M4 "define([_au_$_], defn([$_]))\n";
+  }
+close M4SAVE_M4
+  or die "$me: cannot close: $!\n";
+close UNM4_M4
+  or die "$me: cannot close: $!\n";
+close M4_M4
+  or die "$me: cannot close: $!\n";
+
+
+# @AU_MACROS & AC_MACROS -- AU and AC macros and yet another useful comment.
+open MACROS, ("$autoconf "
+	      . "--trace AU_DEFUN:'AU:\$f:\$1' --trace define:'AC:\$f:\$1' "
+	      . "-i /dev/null |")
+  or die "$me: cannot open: $!\n";
+my (%ac_macros, %au_macros);
+while (<MACROS>)
+  {
+    chomp;
+    /^(AC|AU):(.*):([^:]*)$/ or next;
+    if ($1 eq "AC")
+      {
+	$ac_macros{$3} = $2;
+      }
+    else
+      {
+	$au_macros{$3} = $2;
+      }
+  }
+close MACROS
+  or die "$me: cannot close: $!\n";
+# Don't keep AU macros in @AC_MACROS.
+delete $ac_macros{$_}
+  foreach (keys %au_macros);
+print STDERR "AC: " . join (' ', sort keys %ac_macros) . "\n\n\n";
+print STDERR "AU: " . join (' ', sort keys %au_macros) . "\n";
+
+# $au_changequote -- enable the quote `[', `]' right before any AU macro.
+my $au_changequote =
+  's/\b(' . join ('|', keys %au_macros) . ')\b/_au_changequote([,])$1/g';
+print STDERR "$au_changequote\n";
 
 # au.m4 -- definitions the AU macros.
 system ("$autoconf --trace AU_DEFUN:'_au_defun(\@<:\@\$1\@:>\@,
 \@<:\@\$2\@:>\@)' -i /dev/null "
 	. ">$tmp/au.m4");
 
-# quote.sed -- enable the quote `[', `]' right before any AU macro.
-# Unfortunately, I can't see a solution which does not use `\b', which
-# is a GNU extension :(.  Am I understanding we should use Perl?
-system ('sed \'s/^.*$/s!\\\\b&\\\\b!_au_changequote([,])\\&!/\'' . " $tmp/au.txt "
-	. ">$tmp/quote.sed");
+# ac.m4 -- autoquoting definitions of the AC macros (M4sugar excluded).
+# disable.m4 -- undefine the macros of AC and m4sugar.
+open AC_M4, ">$tmp/ac.m4"
+  or die "$me: cannot open: $!\n";
+open DISABLE_M4, ">$tmp/disable.m4"
+  or die "$me: cannot open: $!\n";
+foreach (sort keys %ac_macros)
+  {
+    print AC_M4      "_au_define([$_], [[\$0(\$\@)]])\n"
+      unless $ac_macros{$_} eq "m4sugar.m4";
+    print DISABLE_M4 "_au_undefine([$_])\n";
+  }
+close DISABLE_M4
+  or die "$me: cannot close: $!\n";
+close AC_M4
+  or die "$me: cannot close: $!\n";
 
-# ac.txt -- list of all the AC and m4sugar macros prefixed by the name
-# of the file which defines it.
-# Be carefull to remove the AU macros.
-system ("$autoconf --trace define:'\$f:\$1' -i /dev/null | "
-	. "sed -f $tmp/au-del.sed "
-	. ">$tmp/ac.txt");
 
-# ac.m4 -- autoquoting definitions of the AC macros.
-system ('sed -n \'/m4sugar.m4/!s/^[^:]*:\(.*\)$/_au_define([\1], [[$0($@)]])/p\''
-	. " $tmp/ac.txt"
-	. ">$tmp/ac.m4");
 
-# disable.m4 -- undefine the macros of AC and m4sugar.
-system ('sed \'s/^[^:]*:\\(.*\\)$/_au_undefine([\1])/\'' . " $tmp/ac.txt "
-	. ">$tmp/disable.m4");
+## ------------------- ##
+## Process the files.  ##
+## ------------------- ##
 
 foreach my $file (@ARGV)
   {
@@ -353,9 +393,18 @@ EOF
 
     # prepared input -- input, but reenables the quote before each AU macro.
     open INPUT_M4, ">$tmp/input.m4";
-    print INPUT_M4 "$input_m4\n";
-    close INPUT_M4;
-    system ("sed -f $tmp/quote.sed $file >>$tmp/input.m4");
+    print INPUT_M4 "$input_m4";
+    open FILE, "<$file"
+       or die "$me: cannot open: $!\n";
+    while (<FILE>)
+       {
+	 eval $au_changequote;
+	 print INPUT_M4;
+       }
+    close FILE
+       or die "$me: cannot close: $!\n";
+    close INPUT_M4
+       or die "$me: cannot close: $!\n";
 
     # Now ask m4 to perform the update.
     print STDERR "$me: running $m4 $tmp/input.m4"
diff --git a/autoupdate.sh b/autoupdate.sh
index 7bc9fdb30..ac8876c0d 100644
--- a/autoupdate.sh
+++ b/autoupdate.sh
@@ -20,6 +20,7 @@
 # Originally written by David MacKenzie <djm@gnu.ai.mit.edu>.
 # Rewritten by Akim Demaille <akim@freefriends.org>.
 
+require 5.005;
 use Getopt::Long;
 use strict;
 
@@ -188,58 +189,97 @@ parse_args;
 $autoconf .= " -l $localdir";
 $ENV{'autoconf_dir'} = $autoconf_dir;
 
-# m4.txt -- the builtins of m4.
-system ("echo dumpdef | "
-	. "$m4 2>&1 >/dev/null | "
-	. "sed -n 's/:.*//p' "
-	. ">$tmp/m4.txt");
+# @M4_BUILTINS -- M4 builtins and a useful comment.
+open M4_BUILTINS, "echo dumpdef | $m4 2>&1 >/dev/null |"
+  or die "$me: cannot open: $!\n";
+my @m4_builtins = <M4_BUILTINS>;
+close M4_BUILTINS
+  or die "$me: cannot close: $!\n";
+map { s/:.*//;s/\W// } @m4_builtins;
 
-# m4.m4 -- enable the m4 builtins.
-system ("sed 's/^.*\$/_au_define([&], _au_defn([_au_&]))/' $tmp/m4.txt "
-	. ">$tmp/m4.m4");
 
+# m4.m4 -- enable the m4 builtins.
 # unm4.m4 -- disable the m4 builtins.
-system ("sed 's/^.*\$/_au_undefine([&])/' $tmp/m4.txt >$tmp/unm4.m4");
-
 # savem4.m4 -- save the m4 builtins.
-system ("sed 's/^.*\$/define([_au_&], defn([&]))/' $tmp/m4.txt "
-	. ">$tmp/m4save.m4");
-
-# au.txt -- list of all the AU macros.
-system ("$autoconf --trace AU_DEFUN:'\$1' -i /dev/null | "
-	. "sort -u "
-	. ">$tmp/au.txt");
-
-# au-del.sed -- delete the AU macro names.
-system ("sed \"s,^.*\$,/&/d,\" $tmp/au.txt "
-	. " >$tmp/au-del.sed");
+open M4_M4, ">$tmp/m4.m4"
+  or die "$me: cannot open: $!\n";
+open UNM4_M4, ">$tmp/unm4.m4"
+  or die "$me: cannot open: $!\n";
+open M4SAVE_M4, ">$tmp/m4save.m4"
+  or die "$me: cannot open: $!\n";
+foreach (@m4_builtins)
+  {
+    print M4_M4     "_au_define([$_], _au_defn([_au_$_]))\n";
+    print UNM4_M4   "_au_undefine([$_])\n";
+    print M4SAVE_M4 "define([_au_$_], defn([$_]))\n";
+  }
+close M4SAVE_M4
+  or die "$me: cannot close: $!\n";
+close UNM4_M4
+  or die "$me: cannot close: $!\n";
+close M4_M4
+  or die "$me: cannot close: $!\n";
+
+
+# @AU_MACROS & AC_MACROS -- AU and AC macros and yet another useful comment.
+open MACROS, ("$autoconf "
+	      . "--trace AU_DEFUN:'AU:\$f:\$1' --trace define:'AC:\$f:\$1' "
+	      . "-i /dev/null |")
+  or die "$me: cannot open: $!\n";
+my (%ac_macros, %au_macros);
+while (<MACROS>)
+  {
+    chomp;
+    /^(AC|AU):(.*):([^:]*)$/ or next;
+    if ($1 eq "AC")
+      {
+	$ac_macros{$3} = $2;
+      }
+    else
+      {
+	$au_macros{$3} = $2;
+      }
+  }
+close MACROS
+  or die "$me: cannot close: $!\n";
+# Don't keep AU macros in @AC_MACROS.
+delete $ac_macros{$_}
+  foreach (keys %au_macros);
+print STDERR "AC: " . join (' ', sort keys %ac_macros) . "\n\n\n";
+print STDERR "AU: " . join (' ', sort keys %au_macros) . "\n";
+
+# $au_changequote -- enable the quote `[', `]' right before any AU macro.
+my $au_changequote =
+  's/\b(' . join ('|', keys %au_macros) . ')\b/_au_changequote([,])$1/g';
+print STDERR "$au_changequote\n";
 
 # au.m4 -- definitions the AU macros.
 system ("$autoconf --trace AU_DEFUN:'_au_defun(\@<:\@\$1\@:>\@,
 \@<:\@\$2\@:>\@)' -i /dev/null "
 	. ">$tmp/au.m4");
 
-# quote.sed -- enable the quote `[', `]' right before any AU macro.
-# Unfortunately, I can't see a solution which does not use `\b', which
-# is a GNU extension :(.  Am I understanding we should use Perl?
-system ('sed \'s/^.*$/s!\\\\b&\\\\b!_au_changequote([,])\\&!/\'' . " $tmp/au.txt "
-	. ">$tmp/quote.sed");
+# ac.m4 -- autoquoting definitions of the AC macros (M4sugar excluded).
+# disable.m4 -- undefine the macros of AC and m4sugar.
+open AC_M4, ">$tmp/ac.m4"
+  or die "$me: cannot open: $!\n";
+open DISABLE_M4, ">$tmp/disable.m4"
+  or die "$me: cannot open: $!\n";
+foreach (sort keys %ac_macros)
+  {
+    print AC_M4      "_au_define([$_], [[\$0(\$\@)]])\n"
+      unless $ac_macros{$_} eq "m4sugar.m4";
+    print DISABLE_M4 "_au_undefine([$_])\n";
+  }
+close DISABLE_M4
+  or die "$me: cannot close: $!\n";
+close AC_M4
+  or die "$me: cannot close: $!\n";
 
-# ac.txt -- list of all the AC and m4sugar macros prefixed by the name
-# of the file which defines it.
-# Be carefull to remove the AU macros.
-system ("$autoconf --trace define:'\$f:\$1' -i /dev/null | "
-	. "sed -f $tmp/au-del.sed "
-	. ">$tmp/ac.txt");
 
-# ac.m4 -- autoquoting definitions of the AC macros.
-system ('sed -n \'/m4sugar.m4/!s/^[^:]*:\(.*\)$/_au_define([\1], [[$0($@)]])/p\''
-	. " $tmp/ac.txt"
-	. ">$tmp/ac.m4");
 
-# disable.m4 -- undefine the macros of AC and m4sugar.
-system ('sed \'s/^[^:]*:\\(.*\\)$/_au_undefine([\1])/\'' . " $tmp/ac.txt "
-	. ">$tmp/disable.m4");
+## ------------------- ##
+## Process the files.  ##
+## ------------------- ##
 
 foreach my $file (@ARGV)
   {
@@ -353,9 +393,18 @@ EOF
 
     # prepared input -- input, but reenables the quote before each AU macro.
     open INPUT_M4, ">$tmp/input.m4";
-    print INPUT_M4 "$input_m4\n";
-    close INPUT_M4;
-    system ("sed -f $tmp/quote.sed $file >>$tmp/input.m4");
+    print INPUT_M4 "$input_m4";
+    open FILE, "<$file"
+       or die "$me: cannot open: $!\n";
+    while (<FILE>)
+       {
+	 eval $au_changequote;
+	 print INPUT_M4;
+       }
+    close FILE
+       or die "$me: cannot close: $!\n";
+    close INPUT_M4
+       or die "$me: cannot close: $!\n";
 
     # Now ask m4 to perform the update.
     print STDERR "$me: running $m4 $tmp/input.m4"
diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index 7bc9fdb30..ac8876c0d 100644
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -20,6 +20,7 @@
 # Originally written by David MacKenzie <djm@gnu.ai.mit.edu>.
 # Rewritten by Akim Demaille <akim@freefriends.org>.
 
+require 5.005;
 use Getopt::Long;
 use strict;
 
@@ -188,58 +189,97 @@ parse_args;
 $autoconf .= " -l $localdir";
 $ENV{'autoconf_dir'} = $autoconf_dir;
 
-# m4.txt -- the builtins of m4.
-system ("echo dumpdef | "
-	. "$m4 2>&1 >/dev/null | "
-	. "sed -n 's/:.*//p' "
-	. ">$tmp/m4.txt");
+# @M4_BUILTINS -- M4 builtins and a useful comment.
+open M4_BUILTINS, "echo dumpdef | $m4 2>&1 >/dev/null |"
+  or die "$me: cannot open: $!\n";
+my @m4_builtins = <M4_BUILTINS>;
+close M4_BUILTINS
+  or die "$me: cannot close: $!\n";
+map { s/:.*//;s/\W// } @m4_builtins;
 
-# m4.m4 -- enable the m4 builtins.
-system ("sed 's/^.*\$/_au_define([&], _au_defn([_au_&]))/' $tmp/m4.txt "
-	. ">$tmp/m4.m4");
 
+# m4.m4 -- enable the m4 builtins.
 # unm4.m4 -- disable the m4 builtins.
-system ("sed 's/^.*\$/_au_undefine([&])/' $tmp/m4.txt >$tmp/unm4.m4");
-
 # savem4.m4 -- save the m4 builtins.
-system ("sed 's/^.*\$/define([_au_&], defn([&]))/' $tmp/m4.txt "
-	. ">$tmp/m4save.m4");
-
-# au.txt -- list of all the AU macros.
-system ("$autoconf --trace AU_DEFUN:'\$1' -i /dev/null | "
-	. "sort -u "
-	. ">$tmp/au.txt");
-
-# au-del.sed -- delete the AU macro names.
-system ("sed \"s,^.*\$,/&/d,\" $tmp/au.txt "
-	. " >$tmp/au-del.sed");
+open M4_M4, ">$tmp/m4.m4"
+  or die "$me: cannot open: $!\n";
+open UNM4_M4, ">$tmp/unm4.m4"
+  or die "$me: cannot open: $!\n";
+open M4SAVE_M4, ">$tmp/m4save.m4"
+  or die "$me: cannot open: $!\n";
+foreach (@m4_builtins)
+  {
+    print M4_M4     "_au_define([$_], _au_defn([_au_$_]))\n";
+    print UNM4_M4   "_au_undefine([$_])\n";
+    print M4SAVE_M4 "define([_au_$_], defn([$_]))\n";
+  }
+close M4SAVE_M4
+  or die "$me: cannot close: $!\n";
+close UNM4_M4
+  or die "$me: cannot close: $!\n";
+close M4_M4
+  or die "$me: cannot close: $!\n";
+
+
+# @AU_MACROS & AC_MACROS -- AU and AC macros and yet another useful comment.
+open MACROS, ("$autoconf "
+	      . "--trace AU_DEFUN:'AU:\$f:\$1' --trace define:'AC:\$f:\$1' "
+	      . "-i /dev/null |")
+  or die "$me: cannot open: $!\n";
+my (%ac_macros, %au_macros);
+while (<MACROS>)
+  {
+    chomp;
+    /^(AC|AU):(.*):([^:]*)$/ or next;
+    if ($1 eq "AC")
+      {
+	$ac_macros{$3} = $2;
+      }
+    else
+      {
+	$au_macros{$3} = $2;
+      }
+  }
+close MACROS
+  or die "$me: cannot close: $!\n";
+# Don't keep AU macros in @AC_MACROS.
+delete $ac_macros{$_}
+  foreach (keys %au_macros);
+print STDERR "AC: " . join (' ', sort keys %ac_macros) . "\n\n\n";
+print STDERR "AU: " . join (' ', sort keys %au_macros) . "\n";
+
+# $au_changequote -- enable the quote `[', `]' right before any AU macro.
+my $au_changequote =
+  's/\b(' . join ('|', keys %au_macros) . ')\b/_au_changequote([,])$1/g';
+print STDERR "$au_changequote\n";
 
 # au.m4 -- definitions the AU macros.
 system ("$autoconf --trace AU_DEFUN:'_au_defun(\@<:\@\$1\@:>\@,
 \@<:\@\$2\@:>\@)' -i /dev/null "
 	. ">$tmp/au.m4");
 
-# quote.sed -- enable the quote `[', `]' right before any AU macro.
-# Unfortunately, I can't see a solution which does not use `\b', which
-# is a GNU extension :(.  Am I understanding we should use Perl?
-system ('sed \'s/^.*$/s!\\\\b&\\\\b!_au_changequote([,])\\&!/\'' . " $tmp/au.txt "
-	. ">$tmp/quote.sed");
+# ac.m4 -- autoquoting definitions of the AC macros (M4sugar excluded).
+# disable.m4 -- undefine the macros of AC and m4sugar.
+open AC_M4, ">$tmp/ac.m4"
+  or die "$me: cannot open: $!\n";
+open DISABLE_M4, ">$tmp/disable.m4"
+  or die "$me: cannot open: $!\n";
+foreach (sort keys %ac_macros)
+  {
+    print AC_M4      "_au_define([$_], [[\$0(\$\@)]])\n"
+      unless $ac_macros{$_} eq "m4sugar.m4";
+    print DISABLE_M4 "_au_undefine([$_])\n";
+  }
+close DISABLE_M4
+  or die "$me: cannot close: $!\n";
+close AC_M4
+  or die "$me: cannot close: $!\n";
 
-# ac.txt -- list of all the AC and m4sugar macros prefixed by the name
-# of the file which defines it.
-# Be carefull to remove the AU macros.
-system ("$autoconf --trace define:'\$f:\$1' -i /dev/null | "
-	. "sed -f $tmp/au-del.sed "
-	. ">$tmp/ac.txt");
 
-# ac.m4 -- autoquoting definitions of the AC macros.
-system ('sed -n \'/m4sugar.m4/!s/^[^:]*:\(.*\)$/_au_define([\1], [[$0($@)]])/p\''
-	. " $tmp/ac.txt"
-	. ">$tmp/ac.m4");
 
-# disable.m4 -- undefine the macros of AC and m4sugar.
-system ('sed \'s/^[^:]*:\\(.*\\)$/_au_undefine([\1])/\'' . " $tmp/ac.txt "
-	. ">$tmp/disable.m4");
+## ------------------- ##
+## Process the files.  ##
+## ------------------- ##
 
 foreach my $file (@ARGV)
   {
@@ -353,9 +393,18 @@ EOF
 
     # prepared input -- input, but reenables the quote before each AU macro.
     open INPUT_M4, ">$tmp/input.m4";
-    print INPUT_M4 "$input_m4\n";
-    close INPUT_M4;
-    system ("sed -f $tmp/quote.sed $file >>$tmp/input.m4");
+    print INPUT_M4 "$input_m4";
+    open FILE, "<$file"
+       or die "$me: cannot open: $!\n";
+    while (<FILE>)
+       {
+	 eval $au_changequote;
+	 print INPUT_M4;
+       }
+    close FILE
+       or die "$me: cannot close: $!\n";
+    close INPUT_M4
+       or die "$me: cannot close: $!\n";
 
     # Now ask m4 to perform the update.
     print STDERR "$me: running $m4 $tmp/input.m4"
diff --git a/configure b/configure
index f9f628dda..e7deae364 100755
--- a/configure
+++ b/configure
@@ -2086,7 +2086,7 @@ EOF
 
 cat >>$CONFIG_STATUS <<\EOF
 
-{ (exit 0); exit 0; }
+exit 0
 EOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
@@ -2097,6 +2097,7 @@ test "$no_create" = yes || $SHELL $CONFIG_STATUS || { (exit 1); exit 1; }
 case 2.49d in
   *[a-z]*)
     cat <<EOF
+
 You are about to use an experimental version of Autoconf.  Be sure to
 read the relevant mailing lists, most importantly <autoconf@gnu.org>.
 
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 1f33c5ebf..55179c96c 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4d from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -10,7 +11,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -32,8 +32,6 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -46,9 +44,11 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -57,6 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+
+@SET_MAKE@
 AWK = @AWK@
 EXPR = @EXPR@
 HELP2MAN = @HELP2MAN@
@@ -65,28 +67,35 @@ PERL = @PERL@
 PERLSCRIPTS = @PERLSCRIPTS@
 standards_texi = @standards_texi@
 
-EXTRA_DIST =  atconfig.m4 init.m4 m4.m4 missing.m4 sanity.m4
 
+EXTRA_DIST = \
+atconfig.m4 \
+init.m4 \
+m4.m4 \
+missing.m4 \
+sanity.m4
+
+subdir = m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
+DIST_SOURCES = 
 DIST_COMMON =  Makefile.am Makefile.in
 
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
 GZIP_ENV = --best
-all: all-redirect
+all: all-am
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 
 tags: TAGS
 TAGS:
@@ -94,22 +103,17 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = m4
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu m4/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
 info-am:
@@ -132,9 +136,8 @@ install: install-am
 uninstall-am:
 uninstall: uninstall-am
 all-am: Makefile
-all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 
 
@@ -147,30 +150,31 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f Makefile.in
 clean: clean-am
 
-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: check check-am clean clean-generic distclean distclean-generic \
+	distdir dvi dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/man/Makefile.in b/man/Makefile.in
index 1e0bdd11b..b431225bc 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4d from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -10,7 +11,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -32,8 +32,6 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -46,9 +44,11 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -57,6 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+
+@SET_MAKE@
 AWK = @AWK@
 EXPR = @EXPR@
 HELP2MAN = @HELP2MAN@
@@ -65,10 +67,13 @@ PERL = @PERL@
 PERLSCRIPTS = @PERLSCRIPTS@
 standards_texi = @standards_texi@
 
-man_MANS = autoconf.1 autoreconf.1 autoheader.1 autoupdate.1 ifnames.1 autoscan.1 config.guess.1 config.sub.1
+
+man_MANS = autoconf.1 autoreconf.1 autoheader.1 autoupdate.1 ifnames.1 \
+autoscan.1 config.guess.1 config.sub.1
 
 
-man_aux = autoconf.x autoreconf.x autoheader.x autoupdate.x ifnames.x autoscan.x config.guess.x config.sub.x
+man_aux = autoconf.x autoreconf.x autoheader.x autoupdate.x ifnames.x \
+autoscan.x config.guess.x config.sub.x
 
 
 EXTRA_DIST = $(man_MANS) $(man_aux) common.x
@@ -78,8 +83,14 @@ MAINTAINERCLEANFILES = $(man_MANS)
 common_dep = $(top_srcdir)/configure.in $(srcdir)/common.x
 
 SUFFIXES = .x .1
+subdir = man
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = 
 man1dir = $(mandir)/man1
 MANS = $(man_MANS)
 
@@ -90,19 +101,18 @@ DIST_COMMON =  Makefile.am Makefile.in
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
 GZIP_ENV = --best
-all: all-redirect
+all: all-am
 .SUFFIXES:
-.SUFFIXES: .1 .x
+.SUFFIXES: .x .1
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 
 
 install-man1:
@@ -118,6 +128,7 @@ install-man1:
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
@@ -133,6 +144,7 @@ uninstall-man1:
 	for i in $$list; do \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
 	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
 	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
@@ -149,22 +161,17 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = man
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
 info-am:
@@ -187,9 +194,8 @@ install: install-am
 uninstall-am: uninstall-man
 uninstall: uninstall-am
 all-am: Makefile $(MANS)
-all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1
 
@@ -203,31 +209,33 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f Makefile.in
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am
 
-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: install-man1 uninstall-man1 install-man uninstall-man tags \
-distdir info-am info dvi-am dvi check check-am installcheck-am \
-installcheck install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: check check-am clean clean-generic distclean distclean-generic \
+	distdir dvi dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-man \
+	install-man1 install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-man uninstall-man1
 
 autoconf.1:   $(common_dep) $(srcdir)/autoconf.x   $(top_srcdir)/autoconf.sh
 autoreconf.1: $(common_dep) $(srcdir)/autoreconf.x $(top_srcdir)/autoreconf.sh