From: Akim Demaille <akim@epita.fr>
Date: Tue, 6 May 2003 07:17:42 +0000 (+0000)
Subject: Regen.
X-Git-Tag: AUTOCONF-2.57a~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2da1c1ca5d30efdd8e4a0f82d4829c5f761cd22;p=thirdparty%2Fautoconf.git

Regen.
---

diff --git a/Makefile.in b/Makefile.in
index 0602a89cc..50b16e958 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +34,42 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = Makefile.in Makefile.am COPYING INSTALL NEWS README \
+	AUTHORS ChangeLog THANKS aclocal.m4 configure configure.ac \
+	$(am__configure_deps) README-alpha AUTHORS COPYING ChangeLog \
+	INSTALL NEWS README THANKS TODO configure configure.ac
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+	ps-recursive html-recursive install-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
+am__installdirs = $(DESTDIR)$(pkgdatadir)
+pkgdataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgdata_DATA)
+ETAGS = etags
+ETAGSFLAGS = 
+CTAGS = ctags
+CTAGSFLAGS = 
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -97,23 +132,17 @@ target_alias = @target_alias@
 # bin/ and tests/ must be run first, as they build the tests executables
 # (tests/autom4te etc.), that we happen to use here.
 SUBDIRS = bin tests . lib config man doc
-
 ACLOCAL_AMFLAGS = -I config
-
 EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
              BUGS \
              GNUmakefile Makefile.maint
 
-
 MAINTAINERCLEANFILES = INSTALL
-
 pkgdata_DATA = INSTALL
 AM_MAKEINFOFLAGS = --no-headers --no-validate --no-split
-
 prev_version_file = $(srcdir)/config/prev-version.txt
 move_if_change = $(srcdir)/config/move-if-change
 release_archive_dir = releases
-
 url_dir_list = \
   ftp://alpha.gnu.org/gnu/autoconf
 
@@ -130,41 +159,41 @@ cvs_files = $(srcdir)/config/elisp-comp \
             $(srcdir)/config/mkinstalldirs
 
 local_updates = wget-update cvs-update
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-	Makefile.in NEWS README-alpha THANKS TODO aclocal.m4 configure \
-	configure.ac
-DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
 .SUFFIXES:
 
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+am--refresh:
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnu ; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure:  $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) 
-	cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.ac config/m4.m4
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 uninstall-info-am:
 pkgdataDATA_INSTALL = $(INSTALL_DATA)
@@ -332,7 +361,7 @@ distdir: $(DISTFILES)
 	esac
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/tests
+	$(mkinstalldirs) $(distdir)/config $(distdir)/tests
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -429,7 +458,7 @@ distcheck: dist
 	@echo "$(distdir).tar.gz is ready for distribution" | \
 	  sed 'h;s/./=/g;p;x;p;x'
 distuninstallcheck:
-	cd $(distuninstallcheck_dir) \
+	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -438,11 +467,11 @@ distuninstallcheck:
 	        $(distuninstallcheck_listfiles) ; \
 	        exit 1; } >&2
 distcleancheck: distclean
-	if test '$(srcdir)' = . ; then \
+	@if test '$(srcdir)' = . ; then \
 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 	  exit 1 ; \
 	fi
-	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
 	  || { echo "ERROR: files left in build directory after distclean:" ; \
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
@@ -525,18 +554,19 @@ uninstall-am: uninstall-info-am uninstall-pkgdataDATA
 
 uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-recursive ctags ctags-recursive dist \
-	dist-all dist-bzip2 dist-gzip distcheck distclean \
-	distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+	check-am clean clean-generic clean-recursive ctags \
+	ctags-recursive dist dist-all dist-bzip2 dist-gzip distcheck \
+	distclean distclean-generic distclean-recursive distclean-tags \
 	distcleancheck distdir distuninstallcheck dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-pkgdataDATA install-recursive install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	installdirs-recursive maintainer-clean maintainer-clean-generic \
+	dvi-recursive html html-am html-recursive info info-am \
+	info-recursive install install-am install-data install-data-am \
+	install-data-recursive install-exec install-exec-am \
+	install-exec-recursive install-info install-info-am \
+	install-info-recursive install-man install-pkgdataDATA \
+	install-recursive install-strip installcheck installcheck-am \
+	installdirs installdirs-am installdirs-recursive \
+	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
 	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
 	ps-recursive tags tags-recursive uninstall uninstall-am \
diff --git a/aclocal.m4 b/aclocal.m4
index cc9c09c48..dd42c88f0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
 # generated automatically by aclocal 1.7a -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,7 @@
 # This macro actually does too much some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -34,16 +34,9 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 9
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
+# serial 10
 
-AC_PREREQ([2.54])
+AC_PREREQ([2.55])
 
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
@@ -824,36 +817,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.])
 fi])])
 
-# Copyright 2000 Free Software Foundation, Inc.
-#
-# This program 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 2, or (at your option)
-# any later version.
-#
-# This program 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# AC_PROG_GNU_M4
-# --------------
-# Check for GNU m4, at least 1.3 (supports frozen files).
-AC_DEFUN([AC_PROG_GNU_M4],
-[AC_PATH_PROGS(M4, gm4 gnum4 m4, m4)
-AC_CACHE_CHECK(whether m4 supports frozen files, ac_cv_prog_gnu_m4,
-[ac_cv_prog_gnu_m4=no
-if test x"$M4" != x; then
-  case `$M4 --help < /dev/null 2>&1` in
-    *reload-state*) ac_cv_prog_gnu_m4=yes ;;
-  esac
-fi])])
-
+m4_include([config/m4.m4])
 
 # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 #   Free Software Foundation, Inc.
diff --git a/bin/Makefile.in b/bin/Makefile.in
index 45e63a62b..dd14d60fb 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +34,22 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = $(srcdir)/../lib/freeze.mk Makefile.in Makefile.am
+subdir = bin
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+am__installdirs = $(DESTDIR)$(bindir)
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(bin_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+ETAGS = etags
+ETAGSFLAGS = 
+CTAGS = ctags
+CTAGSFLAGS = 
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -93,7 +108,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 SUFFIXES = .m4 .m4f
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
@@ -101,7 +115,6 @@ SUFFIXES = .m4 .m4f
 # others) to `false'.  But we _ship_ tests/autom4te, so it doesn't
 # apply to us.
 MY_AUTOM4TE = $(top_builddir)/tests/autom4te
-
 AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
 # Factor the dependencies between all the frozen files.
@@ -109,26 +122,21 @@ AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 # the dependencies...
 src_libdir = $(top_srcdir)/lib
 build_libdir = $(top_builddir)/lib
-
 m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
-
 m4sugar_m4f_dependencies = \
 	$(m4f_dependencies)			\
 	$(src_libdir)/m4sugar/m4sugar.m4	\
 	$(build_libdir)/m4sugar/version.m4
 
-
 m4sh_m4f_dependencies = \
 	$(m4sugar_m4f_dependencies)		\
 	$(src_libdir)/m4sugar/m4sh.m4
 
-
 autotest_m4f_dependencies = \
 	$(m4sh_m4f_dependencies)		\
 	$(src_libdir)/autotest/autotest.m4	\
 	$(src_libdir)/autotest/general.m4
 
-
 autoconf_m4f_dependencies = \
 	$(m4sh_m4f_dependencies)		\
 	$(src_libdir)/autoconf/autoscan.m4	\
@@ -149,27 +157,22 @@ autoconf_m4f_dependencies = \
 	$(src_libdir)/autoconf/programs.m4	\
 	$(src_libdir)/autoconf/autoconf.m4
 
-
 ETAGS_FOR_M4 = \
   --lang=none \
   --regex='/\(m4_define\|define\)(\[\([^]]*\)\]/\2/'
 
-
 ETAGS_FOR_M4SUGAR = \
   $(ETAGS_FOR_M4) \
   --regex='/m4_defun(\[\([^]]*\)\]/\1/'
 
-
 ETAGS_FOR_AUTOCONF = \
   $(ETAGS_FOR_M4SUGAR) \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
-
 bin_SCRIPTS = autom4te \
               autoconf autoheader autoreconf ifnames autoscan autoupdate
 
-
 EXTRA_DIST = autoconf.in autoheader.in autoreconf.in autoupdate.in ifnames.in \
              autoscan.in autom4te.in \
 	     autoconf.as
@@ -177,7 +180,6 @@ EXTRA_DIST = autoconf.in autoheader.in autoreconf.in autoupdate.in ifnames.in \
 
 # Files that should be removed, but which Automake does not know.
 CLEANFILES = $(bin_SCRIPTS)
-
 edit = sed \
 	-e 's,@SHELL\@,$(SHELL),g' \
 	-e 's,@PERL\@,$(PERL),g' \
@@ -195,9 +197,7 @@ edit = sed \
 
 # autoconf is written in M4sh.
 AUTOM4SH = $(top_builddir)/tests/autom4te --language M4sh --cache ''
-
 TAGS_DEPENDENCIES = $(EXTRA_DIST)
-
 letters = abcdefghijklmnopqrstuvwxyz
 LETTERS = ABCDEFGHIJKLMNOPQRSTUVWXYZ
 DIGITS = 0123456789
@@ -209,24 +209,38 @@ ETAGS_PERL = --lang=perl \
 ETAGS_SH = --lang=none --regex='/\($(WORD_REGEXP)\)=/\1/' \
   autoconf.in
 
-
 ETAGS_ARGS = $(ETAGS_PERL) $(ETAGS_SH)
-subdir = bin
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-SCRIPTS = $(bin_SCRIPTS)
-
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/../lib/freeze.mk Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .m4 .m4f
-$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../lib/freeze.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../lib/freeze.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  bin/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  bin/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
@@ -305,7 +319,7 @@ distclean-tags:
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/./../lib
+	$(mkinstalldirs) $(distdir)/../lib
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -376,6 +390,8 @@ dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -410,10 +426,10 @@ uninstall-am: uninstall-binSCRIPTS uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic ctags \
 	distclean distclean-generic distclean-tags distdir dvi dvi-am \
-	info info-am install install-am install-binSCRIPTS install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	html html-am info info-am install install-am install-binSCRIPTS \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-binSCRIPTS uninstall-info-am
diff --git a/config/Makefile.in b/config/Makefile.in
index 2f0dea597..3ddb75922 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -21,7 +20,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +33,17 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = Makefile.in Makefile.am config.guess config.sub elisp-comp \
+	install-sh mdate-sh missing mkinstalldirs texinfo.tex \
+	config.guess config.sub
+subdir = config
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -93,16 +102,13 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 EXTRA_DIST = $(SPECIFIC_MACROS) $(SPECIFIC_TOOLS) \
               prev-version.txt
 
 MAINTAINERCLEANFILES = $(GENERIC_TOOLS)
-
 SPECIFIC_MACROS = \
 m4.m4
 
-
 GENERIC_TOOLS = \
 config.guess					\
 config.sub					\
@@ -113,23 +119,37 @@ missing						\
 mkinstalldirs					\
 texinfo.tex
 
-
 SPECIFIC_TOOLS = move-if-change
-subdir = config
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in config.guess config.sub \
-	elisp-comp install-sh mdate-sh missing mkinstalldirs \
-	texinfo.tex
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  config/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  config/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 tags: TAGS
 TAGS:
@@ -209,6 +229,8 @@ dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -242,8 +264,8 @@ ps-am:
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am 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 \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
diff --git a/configure b/configure
index 47c11e7fe..de8674c7a 100755
--- a/configure
+++ b/configure
@@ -43,7 +43,7 @@ for as_var in \
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -1265,6 +1265,7 @@ am__api_version="1.7a"
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
@@ -1281,6 +1282,7 @@ do
 case $as_dir/ in
   ./ | .// | /cC/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1445,7 +1447,7 @@ done
 
 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2137,7 +2139,7 @@ for as_var in \
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -2807,14 +2809,14 @@ echo "$as_me: creating $ac_file" >&6;}
          test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-         echo $f;;
+         echo "$f";;
       *) # Relative
          if test -f "$f"; then
            # Build tree
-           echo $f
+           echo "$f"
          elif test -f "$srcdir/$f"; then
            # Source tree
-           echo $srcdir/$f
+           echo "$srcdir/$f"
          else
            # /dev/null tree
            { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
diff --git a/doc/Makefile.in b/doc/Makefile.in
index a515787af..6a4cb3cae 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -21,7 +20,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +33,27 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = Makefile.in Makefile.am $(autoconf_TEXINFOS) version.texi \
+	stamp-vti $(standards_TEXINFOS)
+subdir = doc
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
+am__TEXINFO_TEX_DIR = $(top_srcdir)/config
+INFO_DEPS = autoconf.info standards.info
+DVIS = autoconf.dvi standards.dvi
+PDFS = autoconf.pdf standards.pdf
+PSS = autoconf.ps standards.ps
+HTMLS = autoconf.html standards.html
+TEXINFOS = autoconf.texi standards.texi
+TEXI2PDF = $(TEXI2DVI) --pdf --batch
+DVIPS = dvips
+am__installdirs = $(DESTDIR)$(infodir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -93,12 +112,10 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 AM_MAKEINFOFLAGS = --no-split
 TEXI2DVI = texi2dvi --batch
 TEXI2HTML = texi2html
 TEXI2HTML_FLAGS = -split_chapter
-
 info_TEXINFOS = autoconf.texi standards.texi
 autoconf_TEXINFOS = fdl.texi install.texi
 standards_TEXINFOS = make-stds.texi
@@ -110,28 +127,37 @@ CLEANFILES = autoconf.ACs  autoconf.cvs  autoconf.MSs  autoconf.prs \
              autoconf.tmp \
 	     autoconf*.html standards*.html
 
-subdir = doc
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
-am__TEXINFO_TEX_DIR = $(top_srcdir)/config
-INFO_DEPS = autoconf.info standards.info
-DVIS = autoconf.dvi standards.dvi
-PDFS = autoconf.pdf standards.pdf
-PSS = autoconf.ps standards.ps
-TEXINFOS = autoconf.texi standards.texi
-DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
-	Makefile.in stamp-vti version.texi
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .dvi .info .pdf .ps .texi
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+.SUFFIXES: .dvi .html .info .pdf .ps .texi
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  doc/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 .texi.info:
 	restore=: && \
@@ -161,9 +187,14 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
 	$(TEXI2PDF) $<
+
+.texi.html:
+	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --html -I $(srcdir) \
+	 -o $@ $<
 autoconf.info: autoconf.texi version.texi $(autoconf_TEXINFOS)
 autoconf.dvi: autoconf.texi version.texi $(autoconf_TEXINFOS)
 autoconf.pdf: autoconf.texi version.texi $(autoconf_TEXINFOS)
+autoconf.html: autoconf.texi version.texi $(autoconf_TEXINFOS)
 version.texi:  stamp-vti
 stamp-vti: autoconf.texi $(top_srcdir)/configure
 	@(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \
@@ -186,6 +217,7 @@ maintainer-clean-vti:
 standards.info: standards.texi $(standards_TEXINFOS)
 standards.dvi: standards.texi $(standards_TEXINFOS)
 standards.pdf: standards.texi $(standards_TEXINFOS)
+standards.html: standards.texi $(standards_TEXINFOS)
 
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 DVIPS = dvips
@@ -226,18 +258,18 @@ dist-info: $(INFO_DEPS)
 	done
 
 mostlyclean-aminfo:
-	-rm -f autoconf.AC autoconf.ACs autoconf.AT autoconf.ATs autoconf.MS \
+	-rm -rf autoconf.AC autoconf.ACs autoconf.AT autoconf.ATs autoconf.MS \
 	  autoconf.MSs autoconf.aux autoconf.cp autoconf.cps \
 	  autoconf.cv autoconf.cvs autoconf.ev autoconf.evs autoconf.fn \
 	  autoconf.fns autoconf.ky autoconf.kys autoconf.log \
 	  autoconf.ov autoconf.ovs autoconf.pg autoconf.pgs autoconf.pr \
 	  autoconf.prs autoconf.tmp autoconf.toc autoconf.tp \
 	  autoconf.tps autoconf.vr autoconf.vrs autoconf.dvi \
-	  autoconf.pdf autoconf.ps standards.aux standards.cp \
-	  standards.cps standards.fn standards.ky standards.log \
-	  standards.pg standards.tmp standards.toc standards.tp \
-	  standards.tps standards.vr standards.dvi standards.pdf \
-	  standards.ps
+	  autoconf.pdf autoconf.ps autoconf.html standards.aux \
+	  standards.cp standards.cps standards.fn standards.ky \
+	  standards.log standards.pg standards.tmp standards.toc \
+	  standards.tp standards.tps standards.vr standards.dvi \
+	  standards.pdf standards.ps standards.html
 
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \
@@ -327,6 +359,8 @@ dvi: dvi-am
 
 dvi-am: $(DVIS)
 
+html-am: $(HTMLS)
+
 info: info-am
 
 info-am: $(INFO_DEPS)
@@ -387,11 +421,11 @@ ps-am: $(PSS)
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic dist-info \
-	distclean distclean-generic distdir dvi dvi-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-aminfo \
+	distclean distclean-generic distdir dvi dvi-am html html-am \
+	info info-am install install-am install-data install-data-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-aminfo \
 	maintainer-clean-generic maintainer-clean-vti mostlyclean \
 	mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \
 	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
diff --git a/lib/Autom4te/Makefile.in b/lib/Autom4te/Makefile.in
index df9fecc2c..1a6853465 100644
--- a/lib/Autom4te/Makefile.in
+++ b/lib/Autom4te/Makefile.in
@@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +34,22 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = Makefile.in Makefile.am $(dist_perllib_DATA)
+subdir = lib/Autom4te
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__installdirs = $(DESTDIR)$(perllibdir)
+dist_perllibDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_perllib_DATA)
+ETAGS = etags
+ETAGSFLAGS = 
+CTAGS = ctags
+CTAGSFLAGS = 
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -93,28 +108,40 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 perllibdir = $(pkgdatadir)/Autom4te
 dist_perllib_DATA = General.pm Struct.pm XFile.pm
-
 TAGS_FILES = $(dist_perllib_DATA)
-
 ETAGS_ARGS = --lang=perl
-subdir = lib/Autom4te
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(dist_perllib_DATA)
-
-DIST_COMMON = $(dist_perllib_DATA) Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/Autom4te/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/Autom4te/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 dist_perllibDATA_INSTALL = $(INSTALL_DATA)
 install-dist_perllibDATA: $(dist_perllib_DATA)
@@ -260,6 +287,8 @@ dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -294,13 +323,13 @@ uninstall-am: uninstall-dist_perllibDATA uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic ctags \
 	distclean distclean-generic distclean-tags distdir dvi dvi-am \
-	info info-am install install-am install-data install-data-am \
-	install-dist_perllibDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-dist_perllibDATA uninstall-info-am
+	html html-am info info-am install install-am install-data \
+	install-data-am install-dist_perllibDATA install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-dist_perllibDATA uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 386d8df3a..c94e1e3d7 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +34,28 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = Makefile.in Makefile.am
+subdir = lib
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+	ps-recursive html-recursive install-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
+am__installdirs = $(DESTDIR)$(pkgdatadir)
+nodist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(nodist_pkgdata_DATA)
+ETAGS = etags
+ETAGSFLAGS = 
+CTAGS = ctags
+CTAGSFLAGS = 
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -93,11 +114,9 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 SUBDIRS = Autom4te m4sugar autoconf autotest autoscan emacs
 nodist_pkgdata_DATA = autom4te.cfg
 EXTRA_DIST = autom4te.in freeze.mk
-
 edit = sed \
 	-e 's,@SHELL\@,$(SHELL),g' \
 	-e 's,@PERL\@,$(PERL),g' \
@@ -117,28 +136,36 @@ edit = sed \
 # when the Autoconf version changes. Unfortunately, suffix rules
 # cannot have additional dependencies, so we have to use explicit rules.
 CLEANFILES = autom4te.cfg
-subdir = lib
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(nodist_pkgdata_DATA)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 nodist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 install-nodist_pkgdataDATA: $(nodist_pkgdata_DATA)
@@ -368,6 +395,8 @@ dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
@@ -405,10 +434,11 @@ uninstall-info: uninstall-info-recursive
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
 	clean-generic clean-recursive ctags ctags-recursive distclean \
 	distclean-generic distclean-recursive distclean-tags distdir \
-	dvi dvi-am dvi-recursive info info-am info-recursive install \
-	install-am install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
+	dvi dvi-am dvi-recursive html html-am html-recursive info \
+	info-am info-recursive install install-am install-data \
+	install-data-am install-data-recursive install-exec \
+	install-exec-am install-exec-recursive install-info \
+	install-info-am install-info-recursive install-man \
 	install-nodist_pkgdataDATA install-recursive install-strip \
 	installcheck installcheck-am installdirs installdirs-am \
 	installdirs-recursive maintainer-clean maintainer-clean-generic \
diff --git a/lib/autoconf/Makefile.in b/lib/autoconf/Makefile.in
index e6cd521c3..905eeee58 100644
--- a/lib/autoconf/Makefile.in
+++ b/lib/autoconf/Makefile.in
@@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +34,24 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = $(srcdir)/../freeze.mk Makefile.in Makefile.am \
+	$(dist_autoconflib_DATA)
+subdir = lib/autoconf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__installdirs = $(DESTDIR)$(autoconflibdir) $(DESTDIR)$(autoconflibdir)
+dist_autoconflibDATA_INSTALL = $(INSTALL_DATA)
+nodist_autoconflibDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_autoconflib_DATA) $(nodist_autoconflib_DATA)
+ETAGS = etags
+ETAGSFLAGS = 
+CTAGS = ctags
+CTAGSFLAGS = 
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -93,7 +110,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 autoconflibdir = $(pkgdatadir)/autoconf
 dist_autoconflib_DATA = \
 	autoconf.m4 \
@@ -102,16 +118,12 @@ dist_autoconflib_DATA = \
 	lang.m4 c.m4 fortran.m4 \
         functions.m4 headers.m4 types.m4 libs.m4 programs.m4
 
-
 nodist_autoconflib_DATA = autoconf.m4f
 CLEANFILES = $(nodist_autoconflib_DATA)
-
 TAGS_FILES = $(dist_autoconflib_DATA)
-
 ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
 forbidden_patterns = -e '^_*EOF' -e ' cmp '
 forbidden_patterns_files = $(dist_autoconflib_DATA)
-
 SUFFIXES = .m4 .m4f
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
@@ -119,7 +131,6 @@ SUFFIXES = .m4 .m4f
 # others) to `false'.  But we _ship_ tests/autom4te, so it doesn't
 # apply to us.
 MY_AUTOM4TE = $(top_builddir)/tests/autom4te
-
 AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
 # Factor the dependencies between all the frozen files.
@@ -127,26 +138,21 @@ AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 # the dependencies...
 src_libdir = $(top_srcdir)/lib
 build_libdir = $(top_builddir)/lib
-
 m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
-
 m4sugar_m4f_dependencies = \
 	$(m4f_dependencies)			\
 	$(src_libdir)/m4sugar/m4sugar.m4	\
 	$(build_libdir)/m4sugar/version.m4
 
-
 m4sh_m4f_dependencies = \
 	$(m4sugar_m4f_dependencies)		\
 	$(src_libdir)/m4sugar/m4sh.m4
 
-
 autotest_m4f_dependencies = \
 	$(m4sh_m4f_dependencies)		\
 	$(src_libdir)/autotest/autotest.m4	\
 	$(src_libdir)/autotest/general.m4
 
-
 autoconf_m4f_dependencies = \
 	$(m4sh_m4f_dependencies)		\
 	$(src_libdir)/autoconf/autoscan.m4	\
@@ -167,39 +173,50 @@ autoconf_m4f_dependencies = \
 	$(src_libdir)/autoconf/programs.m4	\
 	$(src_libdir)/autoconf/autoconf.m4
 
-
 ETAGS_FOR_M4 = \
   --lang=none \
   --regex='/\(m4_define\|define\)(\[\([^]]*\)\]/\2/'
 
-
 ETAGS_FOR_M4SUGAR = \
   $(ETAGS_FOR_M4) \
   --regex='/m4_defun(\[\([^]]*\)\]/\1/'
 
-
 ETAGS_FOR_AUTOCONF = \
   $(ETAGS_FOR_M4SUGAR) \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
-subdir = lib/autoconf
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(dist_autoconflib_DATA) $(nodist_autoconflib_DATA)
-
-DIST_COMMON = $(dist_autoconflib_DATA) $(srcdir)/../freeze.mk \
-	Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .m4 .m4f
-$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../freeze.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../freeze.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/autoconf/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/autoconf/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 dist_autoconflibDATA_INSTALL = $(INSTALL_DATA)
 install-dist_autoconflibDATA: $(dist_autoconflib_DATA)
@@ -294,7 +311,7 @@ distclean-tags:
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/./..
+	$(mkinstalldirs) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -366,6 +383,8 @@ dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -402,11 +421,11 @@ uninstall-am: uninstall-dist_autoconflibDATA uninstall-info-am \
 
 .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
 	clean-generic ctags distclean distclean-generic distclean-tags \
-	distdir dvi dvi-am info info-am install install-am install-data \
-	install-data-am install-dist_autoconflibDATA install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-nodist_autoconflibDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	distdir dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dist_autoconflibDATA \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-nodist_autoconflibDATA install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-dist_autoconflibDATA uninstall-info-am \
diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in
index f77021938..6101ccff6 100644
--- a/lib/autoscan/Makefile.in
+++ b/lib/autoscan/Makefile.in
@@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +34,18 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = $(srcdir)/../freeze.mk Makefile.in Makefile.am
+subdir = lib/autoscan
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__installdirs = $(DESTDIR)$(autoscanlibdir)
+nodist_autoscanlibDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(nodist_autoscanlib_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -93,13 +104,10 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 autoscanlibdir = $(pkgdatadir)/autoscan
-
 EXTRA_DIST = autoscan.pre
 nodist_autoscanlib_DATA = autoscan.list
 CLEANFILES = autoscan.list
-
 SUFFIXES = .m4 .m4f
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
@@ -107,7 +115,6 @@ SUFFIXES = .m4 .m4f
 # others) to `false'.  But we _ship_ tests/autom4te, so it doesn't
 # apply to us.
 MY_AUTOM4TE = $(top_builddir)/tests/autom4te
-
 AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
 # Factor the dependencies between all the frozen files.
@@ -115,26 +122,21 @@ AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 # the dependencies...
 src_libdir = $(top_srcdir)/lib
 build_libdir = $(top_builddir)/lib
-
 m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
-
 m4sugar_m4f_dependencies = \
 	$(m4f_dependencies)			\
 	$(src_libdir)/m4sugar/m4sugar.m4	\
 	$(build_libdir)/m4sugar/version.m4
 
-
 m4sh_m4f_dependencies = \
 	$(m4sugar_m4f_dependencies)		\
 	$(src_libdir)/m4sugar/m4sh.m4
 
-
 autotest_m4f_dependencies = \
 	$(m4sh_m4f_dependencies)		\
 	$(src_libdir)/autotest/autotest.m4	\
 	$(src_libdir)/autotest/general.m4
 
-
 autoconf_m4f_dependencies = \
 	$(m4sh_m4f_dependencies)		\
 	$(src_libdir)/autoconf/autoscan.m4	\
@@ -155,38 +157,50 @@ autoconf_m4f_dependencies = \
 	$(src_libdir)/autoconf/programs.m4	\
 	$(src_libdir)/autoconf/autoconf.m4
 
-
 ETAGS_FOR_M4 = \
   --lang=none \
   --regex='/\(m4_define\|define\)(\[\([^]]*\)\]/\2/'
 
-
 ETAGS_FOR_M4SUGAR = \
   $(ETAGS_FOR_M4) \
   --regex='/m4_defun(\[\([^]]*\)\]/\1/'
 
-
 ETAGS_FOR_AUTOCONF = \
   $(ETAGS_FOR_M4SUGAR) \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
-subdir = lib/autoscan
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(nodist_autoscanlib_DATA)
-
-DIST_COMMON = $(srcdir)/../freeze.mk Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .m4 .m4f
-$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../freeze.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../freeze.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/autoscan/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/autoscan/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 nodist_autoscanlibDATA_INSTALL = $(INSTALL_DATA)
 install-nodist_autoscanlibDATA: $(nodist_autoscanlib_DATA)
@@ -215,7 +229,7 @@ CTAGS:
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/./..
+	$(mkinstalldirs) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -286,6 +300,8 @@ dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -319,8 +335,8 @@ ps-am:
 uninstall-am: uninstall-info-am uninstall-nodist_autoscanlibDATA
 
 .PHONY: all all-am 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 \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-nodist_autoscanlibDATA install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in
index 2dd9c9795..943873ed3 100644
--- a/lib/autotest/Makefile.in
+++ b/lib/autotest/Makefile.in
@@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +34,24 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = $(srcdir)/../freeze.mk Makefile.in Makefile.am \
+	$(dist_autotestlib_DATA)
+subdir = lib/autotest
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__installdirs = $(DESTDIR)$(autotestlibdir) $(DESTDIR)$(autotestlibdir)
+dist_autotestlibDATA_INSTALL = $(INSTALL_DATA)
+nodist_autotestlibDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_autotestlib_DATA) $(nodist_autotestlib_DATA)
+ETAGS = etags
+ETAGSFLAGS = 
+CTAGS = ctags
+CTAGSFLAGS = 
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -93,18 +110,14 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 autotestlibdir = $(pkgdatadir)/autotest
 dist_autotestlib_DATA = autotest.m4 general.m4
 nodist_autotestlib_DATA = autotest.m4f
 CLEANFILES = $(nodist_autotestlib_DATA)
-
 TAGS_FILES = $(dist_autotestlib_DATA)
-
 ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
 forbidden_patterns = -e '^_*EOF' -e ' cmp '
 forbidden_patterns_files = $(dist_autotestlib_DATA)
-
 SUFFIXES = .m4 .m4f
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
@@ -112,7 +125,6 @@ SUFFIXES = .m4 .m4f
 # others) to `false'.  But we _ship_ tests/autom4te, so it doesn't
 # apply to us.
 MY_AUTOM4TE = $(top_builddir)/tests/autom4te
-
 AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
 # Factor the dependencies between all the frozen files.
@@ -120,26 +132,21 @@ AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 # the dependencies...
 src_libdir = $(top_srcdir)/lib
 build_libdir = $(top_builddir)/lib
-
 m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
-
 m4sugar_m4f_dependencies = \
 	$(m4f_dependencies)			\
 	$(src_libdir)/m4sugar/m4sugar.m4	\
 	$(build_libdir)/m4sugar/version.m4
 
-
 m4sh_m4f_dependencies = \
 	$(m4sugar_m4f_dependencies)		\
 	$(src_libdir)/m4sugar/m4sh.m4
 
-
 autotest_m4f_dependencies = \
 	$(m4sh_m4f_dependencies)		\
 	$(src_libdir)/autotest/autotest.m4	\
 	$(src_libdir)/autotest/general.m4
 
-
 autoconf_m4f_dependencies = \
 	$(m4sh_m4f_dependencies)		\
 	$(src_libdir)/autoconf/autoscan.m4	\
@@ -160,39 +167,50 @@ autoconf_m4f_dependencies = \
 	$(src_libdir)/autoconf/programs.m4	\
 	$(src_libdir)/autoconf/autoconf.m4
 
-
 ETAGS_FOR_M4 = \
   --lang=none \
   --regex='/\(m4_define\|define\)(\[\([^]]*\)\]/\2/'
 
-
 ETAGS_FOR_M4SUGAR = \
   $(ETAGS_FOR_M4) \
   --regex='/m4_defun(\[\([^]]*\)\]/\1/'
 
-
 ETAGS_FOR_AUTOCONF = \
   $(ETAGS_FOR_M4SUGAR) \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
-subdir = lib/autotest
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(dist_autotestlib_DATA) $(nodist_autotestlib_DATA)
-
-DIST_COMMON = $(dist_autotestlib_DATA) $(srcdir)/../freeze.mk \
-	Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .m4 .m4f
-$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../freeze.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../freeze.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/autotest/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/autotest/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 dist_autotestlibDATA_INSTALL = $(INSTALL_DATA)
 install-dist_autotestlibDATA: $(dist_autotestlib_DATA)
@@ -287,7 +305,7 @@ distclean-tags:
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/./..
+	$(mkinstalldirs) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -359,6 +377,8 @@ dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -395,11 +415,11 @@ uninstall-am: uninstall-dist_autotestlibDATA uninstall-info-am \
 
 .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
 	clean-generic ctags distclean distclean-generic distclean-tags \
-	distdir dvi dvi-am info info-am install install-am install-data \
-	install-data-am install-dist_autotestlibDATA install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-nodist_autotestlibDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	distdir dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dist_autotestlibDATA \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-nodist_autotestlibDATA install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-dist_autotestlibDATA uninstall-info-am \
diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in
index 9efcc269f..121976e45 100644
--- a/lib/emacs/Makefile.in
+++ b/lib/emacs/Makefile.in
@@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +34,21 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = Makefile.in Makefile.am $(dist_lisp_LISP)
+subdir = lib/emacs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__installdirs = $(DESTDIR)$(lispdir)
+dist_lispLISP_INSTALL = $(INSTALL_DATA)
+LISP = $(dist_lisp_LISP)
+ELCFILES = autoconf-mode.elc autotest-mode.elc
+am__ELFILES = autoconf-mode.el autotest-mode.el
+elisp_comp = $(top_srcdir)/config/elisp-comp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -93,27 +107,38 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 dist_lisp_LISP = autoconf-mode.el autotest-mode.el
-subdir = lib/emacs
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-LISP = $(dist_lisp_LISP)
-
-ELCFILES = autoconf-mode.elc autotest-mode.elc
-am__ELFILES = autoconf-mode.el autotest-mode.el
-elisp_comp = $(top_srcdir)/config/elisp-comp
-DIST_COMMON = $(dist_lisp_LISP) Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .el .elc
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/emacs/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/emacs/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 dist_lispLISP_INSTALL = $(INSTALL_DATA)
 
@@ -241,6 +266,8 @@ dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -274,8 +301,8 @@ ps-am:
 uninstall-am: uninstall-dist_lispLISP uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic clean-lisp \
-	distclean distclean-generic distdir dvi dvi-am info info-am \
-	install install-am install-data install-data-am \
+	distclean distclean-generic distdir dvi dvi-am html html-am \
+	info info-am install install-am install-data install-data-am \
 	install-dist_lispLISP install-exec install-exec-am install-info \
 	install-info-am install-man install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in
index ddb23dfc9..f698f2587 100644
--- a/lib/m4sugar/Makefile.in
+++ b/lib/m4sugar/Makefile.in
@@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +34,24 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = $(srcdir)/../freeze.mk Makefile.in Makefile.am \
+	$(dist_m4sugarlib_DATA)
+subdir = lib/m4sugar
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__installdirs = $(DESTDIR)$(m4sugarlibdir) $(DESTDIR)$(m4sugarlibdir)
+dist_m4sugarlibDATA_INSTALL = $(INSTALL_DATA)
+nodist_m4sugarlibDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_m4sugarlib_DATA) $(nodist_m4sugarlib_DATA)
+ETAGS = etags
+ETAGSFLAGS = 
+CTAGS = ctags
+CTAGSFLAGS = 
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -93,18 +110,14 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 m4sugarlibdir = $(pkgdatadir)/m4sugar
 dist_m4sugarlib_DATA = m4sugar.m4 m4sh.m4
 nodist_m4sugarlib_DATA = version.m4 m4sugar.m4f m4sh.m4f
 CLEANFILES = $(nodist_m4sugarlib_DATA)
-
 TAGS_FILES = $(dist_m4sugarlib_DATA)
-
 ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
 forbidden_patterns = -e '^_*EOF' -e ' cmp '
 forbidden_patterns_files = $(dist_m4sugarlib_DATA)
-
 SUFFIXES = .m4 .m4f
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
@@ -112,7 +125,6 @@ SUFFIXES = .m4 .m4f
 # others) to `false'.  But we _ship_ tests/autom4te, so it doesn't
 # apply to us.
 MY_AUTOM4TE = $(top_builddir)/tests/autom4te
-
 AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
 # Factor the dependencies between all the frozen files.
@@ -120,26 +132,21 @@ AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 # the dependencies...
 src_libdir = $(top_srcdir)/lib
 build_libdir = $(top_builddir)/lib
-
 m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
-
 m4sugar_m4f_dependencies = \
 	$(m4f_dependencies)			\
 	$(src_libdir)/m4sugar/m4sugar.m4	\
 	$(build_libdir)/m4sugar/version.m4
 
-
 m4sh_m4f_dependencies = \
 	$(m4sugar_m4f_dependencies)		\
 	$(src_libdir)/m4sugar/m4sh.m4
 
-
 autotest_m4f_dependencies = \
 	$(m4sh_m4f_dependencies)		\
 	$(src_libdir)/autotest/autotest.m4	\
 	$(src_libdir)/autotest/general.m4
 
-
 autoconf_m4f_dependencies = \
 	$(m4sh_m4f_dependencies)		\
 	$(src_libdir)/autoconf/autoscan.m4	\
@@ -160,39 +167,50 @@ autoconf_m4f_dependencies = \
 	$(src_libdir)/autoconf/programs.m4	\
 	$(src_libdir)/autoconf/autoconf.m4
 
-
 ETAGS_FOR_M4 = \
   --lang=none \
   --regex='/\(m4_define\|define\)(\[\([^]]*\)\]/\2/'
 
-
 ETAGS_FOR_M4SUGAR = \
   $(ETAGS_FOR_M4) \
   --regex='/m4_defun(\[\([^]]*\)\]/\1/'
 
-
 ETAGS_FOR_AUTOCONF = \
   $(ETAGS_FOR_M4SUGAR) \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
-subdir = lib/m4sugar
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(dist_m4sugarlib_DATA) $(nodist_m4sugarlib_DATA)
-
-DIST_COMMON = $(dist_m4sugarlib_DATA) $(srcdir)/../freeze.mk \
-	Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .m4 .m4f
-$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../freeze.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../freeze.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/m4sugar/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/m4sugar/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 dist_m4sugarlibDATA_INSTALL = $(INSTALL_DATA)
 install-dist_m4sugarlibDATA: $(dist_m4sugarlib_DATA)
@@ -287,7 +305,7 @@ distclean-tags:
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/./..
+	$(mkinstalldirs) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -359,6 +377,8 @@ dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -395,11 +415,11 @@ uninstall-am: uninstall-dist_m4sugarlibDATA uninstall-info-am \
 
 .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
 	clean-generic ctags distclean distclean-generic distclean-tags \
-	distdir dvi dvi-am info info-am install install-am install-data \
-	install-data-am install-dist_m4sugarlibDATA install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-nodist_m4sugarlibDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	distdir dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dist_m4sugarlibDATA \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-nodist_m4sugarlibDATA install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-dist_m4sugarlibDATA uninstall-info-am \
diff --git a/man/Makefile.in b/man/Makefile.in
index 8d3d863b2..f886f249a 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -14,6 +14,8 @@
 
 @SET_MAKE@
 
+NROFF = nroff
+MANS = $(dist_man_MANS)
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -21,7 +23,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +36,19 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = Makefile.in Makefile.am $(dist_man_MANS)
+subdir = man
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+man1dir = $(mandir)/man1
+am__installdirs = $(DESTDIR)$(man1dir)
+NROFF = nroff
+MANS = $(dist_man_MANS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -93,40 +107,50 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
 dist_man_MANS = autoconf.1 autoreconf.1 autoheader.1 autoupdate.1 ifnames.1 \
 autoscan.1 autom4te.1 config.guess.1 config.sub.1
 
-
 man_aux = autoconf.x autoreconf.x autoheader.x autoupdate.x ifnames.x \
 autoscan.x autom4te.x config.guess.x config.sub.x
 
-
 EXTRA_DIST = $(man_aux) common.x
 MAINTAINERCLEANFILES = $(dist_man_MANS)
 
 # Depend on configure.ac to get version number changes.
 common_dep = $(top_srcdir)/configure.ac $(srcdir)/common.x
 binsrcdir = $(top_srcdir)/bin
-
 SUFFIXES = .x .1
-subdir = man
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-NROFF = nroff
-MANS = $(dist_man_MANS)
-DIST_COMMON = $(dist_man_MANS) Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .x .1
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  man/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 
 man1dir = $(mandir)/man1
@@ -254,6 +278,8 @@ dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -289,8 +315,8 @@ uninstall-am: uninstall-info-am uninstall-man
 uninstall-man: uninstall-man1
 
 .PHONY: all all-am 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 \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-man1 install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0fefc22d9..09ed7406b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -21,7 +20,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,6 +33,18 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+DIST_COMMON = $(srcdir)/../lib/freeze.mk Makefile.in Makefile.am \
+	atlocal.in wrapper.in wrapper.in wrapper.in wrapper.in \
+	wrapper.in wrapper.in wrapper.in
+subdir = tests
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__configure_deps = $(top_srcdir)/config/m4.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES = atlocal autoconf autoheader autom4te autoreconf \
+	autoscan autoupdate ifnames
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -102,9 +112,7 @@ EXTRA_DIST = $(TESTSUITE_AT) atspecific.m4 mktests.sh \
 
 # Running the uninstalled scripts.
 check_SCRIPTS = autoconf autoheader autoreconf autom4te autoscan autoupdate ifnames
-
 DISTCLEANFILES = atconfig atlocal $(TESTSUITE) $(check_SCRIPTS)
-
 SUFFIXES = .m4 .m4f
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
@@ -112,7 +120,6 @@ SUFFIXES = .m4 .m4f
 # others) to `false'.  But we _ship_ tests/autom4te, so it doesn't
 # apply to us.
 MY_AUTOM4TE = $(top_builddir)/tests/autom4te
-
 AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
 # Factor the dependencies between all the frozen files.
@@ -120,26 +127,21 @@ AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 # the dependencies...
 src_libdir = $(top_srcdir)/lib
 build_libdir = $(top_builddir)/lib
-
 m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
-
 m4sugar_m4f_dependencies = \
 	$(m4f_dependencies)			\
 	$(src_libdir)/m4sugar/m4sugar.m4	\
 	$(build_libdir)/m4sugar/version.m4
 
-
 m4sh_m4f_dependencies = \
 	$(m4sugar_m4f_dependencies)		\
 	$(src_libdir)/m4sugar/m4sh.m4
 
-
 autotest_m4f_dependencies = \
 	$(m4sh_m4f_dependencies)		\
 	$(src_libdir)/autotest/autotest.m4	\
 	$(src_libdir)/autotest/general.m4
 
-
 autoconf_m4f_dependencies = \
 	$(m4sh_m4f_dependencies)		\
 	$(src_libdir)/autoconf/autoscan.m4	\
@@ -160,23 +162,19 @@ autoconf_m4f_dependencies = \
 	$(src_libdir)/autoconf/programs.m4	\
 	$(src_libdir)/autoconf/autoconf.m4
 
-
 ETAGS_FOR_M4 = \
   --lang=none \
   --regex='/\(m4_define\|define\)(\[\([^]]*\)\]/\2/'
 
-
 ETAGS_FOR_M4SUGAR = \
   $(ETAGS_FOR_M4) \
   --regex='/m4_defun(\[\([^]]*\)\]/\1/'
 
-
 ETAGS_FOR_AUTOCONF = \
   $(ETAGS_FOR_M4SUGAR) \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
-
 TESTSUITE_GENERATED_AT = \
 	aclang.at acc.at acfortran.at \
 	acgeneral.at acstatus.at \
@@ -184,7 +182,6 @@ TESTSUITE_GENERATED_AT = \
 	acspecific.at acfunctions.at acheaders.at actypes.at \
 	aclibs.at acprograms.at
 
-
 TESTSUITE_HAND_AT = \
 	suite.at \
         m4sugar.at m4sh.at \
@@ -193,7 +190,6 @@ TESTSUITE_HAND_AT = \
 	semantics.at \
 	foreign.at
 
-
 TESTSUITE_AT = $(TESTSUITE_GENERATED_AT) $(TESTSUITE_HAND_AT)
 TESTSUITE = ./testsuite
 
@@ -201,7 +197,6 @@ TESTSUITE = ./testsuite
 # Don't use AUTOM4TE since `make alpha' makes it unavailable although
 # we are allowed to use it (since we ship it).
 AUTOTEST = ./autom4te --language=autotest
-
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE_GENERATED_AT)
 
 # The files which contains macro we check for syntax.  Don't use $(top_srcdir)
@@ -225,22 +220,37 @@ AUTOCONF_FILES = $(autoconfdir)/general.m4 \
 
 # The hairy heredoc is more robust than using echo.
 CLEANFILES = expr
-subdir = tests
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES = atlocal autoconf autoheader autom4te autoreconf \
-	autoscan autoupdate ifnames
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/../lib/freeze.mk Makefile.am Makefile.in \
-	atlocal.in wrapper.in
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .m4 .m4f
-$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../lib/freeze.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../lib/freeze.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
+	      exit 0;; \
+	  esac; \
+	done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  tests/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(top_srcdir)/configure.ac  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 atlocal: $(top_builddir)/config.status atlocal.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 autoconf: $(top_builddir)/config.status wrapper.in
@@ -267,7 +277,7 @@ CTAGS:
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/./../lib
+	$(mkinstalldirs) $(distdir)/../lib
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -341,6 +351,8 @@ dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -374,11 +386,11 @@ ps-am:
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-am check-local clean clean-generic \
-	clean-local distclean distclean-generic distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installcheck-local installdirs maintainer-clean \
+	clean-local distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installcheck-local installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am