From ab57cf2823f68bb3de9caf44607984de02bdd717 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Thu, 24 Apr 2003 18:48:07 +0000
Subject: [PATCH] * automake.in (scan_aclocal_m4): Do not parse ACLOCAL_AMFLAGS
 and glob for m4_files (We've got all local m4 files while tracing
 m4_include's).  Diagnose ACLOCAL_M4_SOURCES as obsolete. Distribute
 aclocal.m4 only at the top-level. (my_glob): Remove.  This fixes PR
 automake/11. (handle_dist): Strip leading `./' from directories. * aclocal.in
 (add_file): Output 'm4_include([file.m4])' instead of copying local files.
 (write_aclocal, parse_arguments): Bump copyright date. * configure.in: De not
 build m4/amversion.m4 from here ... * m4/Makefile.am
 ($(srcdir)/amversion.m4): ... do this here. (nodist_m4data_DATA): Use
 $(srcdir)/amversion.m4 instead of amversion.m4. * tests/Makefile.am
 (XFAIL_TESTS): Remove aclocal5.test. (TESTS): Remove aclocal2.test.  Do not
 test aclocal.test twice. * tests/aclocal2.test: Delete (pointless). *
 tests/aclocal5.test: Make sure configure's dependencies are distributed. *
 tests/acinclude.test: Adjust to search for m4_include. * tests/dirlist.test,
 tests/dup3.test: Run $AUTOCONF and grep configure instead of aclocal.m4.

---
 ChangeLog                      |  22 ++
 Makefile.in                    |  29 +-
 NEWS                           |  20 +-
 aclocal.in                     |  20 +-
 aclocal.m4                     | 850 +----------------------------------------
 automake.in                    |  45 +--
 bootstrap                      |  11 +-
 configure                      |   3 +-
 configure.in                   |   1 -
 lib/Automake/Makefile.in       |  12 +-
 lib/Automake/tests/Makefile.in |  12 +-
 lib/Makefile.in                |  12 +-
 lib/am/Makefile.in             |  12 +-
 m4/Makefile.am                 |  15 +-
 m4/Makefile.in                 |  34 +-
 stamp-vti                      |   2 +-
 tests/Makefile.am              |   5 +-
 tests/Makefile.in              |  13 +-
 tests/acinclude.test           |  10 +-
 tests/aclocal2.test            |  41 --
 tests/aclocal5.test            |   4 +
 tests/dirlist.test             |   7 +-
 tests/dup3.test                |  10 +-
 version.texi                   |   2 +-
 24 files changed, 207 insertions(+), 985 deletions(-)
 delete mode 100755 tests/aclocal2.test

diff --git a/ChangeLog b/ChangeLog
index 5ca1331..2ec93a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2003-04-24  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* automake.in (scan_aclocal_m4): Do not parse ACLOCAL_AMFLAGS
+	and glob for m4_files (We've got all local m4 files while
+	tracing m4_include's).  Diagnose ACLOCAL_M4_SOURCES as obsolete.
+	Distribute aclocal.m4 only at the top-level.
+	(my_glob): Remove.  This fixes PR automake/11.
+	(handle_dist): Strip leading `./' from directories.
+	* aclocal.in (add_file): Output 'm4_include([file.m4])' instead
+	of copying local files.
+	(write_aclocal, parse_arguments): Bump copyright date.
+	* configure.in: De not build m4/amversion.m4 from here ...
+	* m4/Makefile.am ($(srcdir)/amversion.m4): ... do this here.
+	(nodist_m4data_DATA): Use $(srcdir)/amversion.m4 instead
+	of amversion.m4.
+	* tests/Makefile.am (XFAIL_TESTS): Remove aclocal5.test.
+	(TESTS): Remove aclocal2.test.  Do not test aclocal.test twice.
+	* tests/aclocal2.test: Delete (pointless).
+	* tests/aclocal5.test: Make sure configure's dependencies are
+	distributed.
+	* tests/acinclude.test: Adjust to search for m4_include.
+	* tests/dirlist.test, tests/dup3.test: Run $AUTOCONF and grep
+	configure instead of aclocal.m4.
+
 	For automake PR/46:
 	* automake.in (scan_aclocal_m4): Work in all directories, not only
 	the top-level.  Prepend $(top_srcdir) in front of each aclocal.m4
diff --git a/Makefile.in b/Makefile.in
index 37de402..885c10b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,9 +35,16 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = Makefile.in Makefile.am COPYING INSTALL NEWS README \
-	AUTHORS ChangeLog THANKS aclocal.m4 configure configure.in \
-	version.texi stamp-vti AUTHORS COPYING ChangeLog INSTALL NEWS \
-	README THANKS TODO configure configure.in
+	AUTHORS ChangeLog THANKS aclocal.m4 $(top_srcdir)/m4/init.m4 \
+	$(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 \
+	$(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 \
+	$(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 \
+	$(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 \
+	$(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 \
+	$(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 \
+	$(top_srcdir)/m4/runlog.m4 configure configure.in version.texi \
+	stamp-vti AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
+	TODO configure configure.in
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -181,9 +188,9 @@ all: all-recursive
 
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) ' in \
+	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \
 	    *$$dep*) \
 	      echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu '; \
 	      cd $(top_srcdir) && $(AUTOMAKE) --gnu ; \
@@ -203,13 +210,13 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
 
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) 
-	cd $(srcdir) && $(AUTOCONF)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(SHELL) ./config.status --recheck
 
-$(ACLOCAL_M4):  configure.in 
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(top_srcdir)/configure:  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
+	cd $(top_srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(top_srcdir)/configure.in 
+	$(ACLOCAL) $(ACLOCAL_AMFLAGS)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
diff --git a/NEWS b/NEWS
index 2d824e5..95b3ef9 100644
--- a/NEWS
+++ b/NEWS
@@ -84,7 +84,8 @@ New in 1.7a:
   non-PHONY `html' rule.
 
 * Any file which is m4_included from configure.ac will appear as
-  a configure and Makefile.in dependency.
+  a configure and Makefile.in dependency, and will be automatically
+  distributed.
 
 * The rules for rebuilding Makefiles and Makefile.ins will now rebuild
   all Makefiles and all Makefile.ins at once when one of configure's
@@ -101,6 +102,23 @@ New in 1.7a:
   were using the CONFIG_STATUS_DEPENDENCIES and CONFIGURE_DEPENDENCIES
   (undocumented) variables, you will have to define them in all directories.
   This is easily done using an AC_SUBST.
+
+* aclocal will now use `m4_include' instead of copying local m4 files
+  into aclocal.m4.  (Local m4 files are those you ship with your
+  project, other files will be copied as usual.)
+
+  Because m4_included files are automatically distributed, it means
+  for most projects there is no point in EXTRA_DISTing the list
+  of m4 files which used.  (You can probably get rid of m4/Makefile.am
+  if you had one.)
+
+  Some users where using the undocumented ACLOCAL_M4_SOURCES variable
+  to override the aclocal.m4 dependencies computed (inaccurately) by
+  older versions of Automake; this variable should be considered obsolete
+  and will be flagged as such when running `automake -Wobsolete'.
+  Note that local m4 files are no longer dependencies of aclocal.m4
+  (since it only includes them) but they are dependencies of configure.
+
 
 New in 1.7:
 * Autoconf 2.54 is required.
diff --git a/aclocal.in b/aclocal.in
index 9de50f7..1f73856 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -7,7 +7,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
 
 # aclocal - create aclocal.m4 by scanning configure.ac
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# 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
@@ -161,7 +161,7 @@ sub parse_arguments (@)
 	elsif ($arglist[0] eq '--version')
 	{
 	    print "aclocal (GNU $PACKAGE) $VERSION\n\n";
-	    print "Copyright (C) 2002 Free Software Foundation, Inc.\n";
+	    print "Copyright (C) 2003 Free Software Foundation, Inc.\n";
 	    print "This is free software; see the source for copying conditions.  There is NO\n";
 	    print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n";
 	    print "Written by Tom Tromey <tromey\@redhat.com>\n";
@@ -357,7 +357,19 @@ sub add_file ($)
     return if ($file_seen{$file});
     $file_seen{$file} = 1;
 
-    $output .= $file_contents{$file} . "\n";
+    # If the file to add looks like path outside the project,
+    # copy it to the output.
+    # The regex catches filenames starting with things like
+    #   / \ c:\ ../ ./../ etc.
+    if ($file =~ m,^(?:(?:\w:)?[\\/]|(?:\.[\\/]+)*\.\.[\\/]),)
+      {
+	$output .= $file_contents{$file} . "\n";
+      }
+    else
+      {
+	# Otherwise, simply include the file.
+	$output .= "m4_include([$file])\n";
+      }
     my (@rlist);
     foreach (split ("\n", $file_contents{$file}))
     {
@@ -443,7 +455,7 @@ sub write_aclocal ()
     print $out
 "# generated automatically by aclocal $VERSION -*- 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,
diff --git a/aclocal.m4 b/aclocal.m4
index d69966c..770a812 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,
@@ -11,837 +11,17 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Do all the work for Automake.                            -*- Autoconf -*-
-
-# 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 (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
-# 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.
-
-# serial 10
-
-AC_PREREQ([2.55])
-
-# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright 2002  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
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7a"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.7a])])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright 2001, 2002  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.
-
-# serial 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright 1996, 1997, 2000, 2001 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.
-
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-#  -*- Autoconf -*-
-
-
-# Copyright 1997, 1999, 2000, 2001 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.
-
-# serial 3
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# AM_AUX_DIR_EXPAND
-
-# Copyright 2001 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.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-# Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_AUX_DIR_EXPAND], [
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-
-# Copyright 2001 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_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# AM_PROG_INSTALL_STRIP
-
-# Copyright 2001 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.
-
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-#                                                          -*- Autoconf -*-
-# Copyright (C) 2003  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.
-
-# serial 1
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# serial 5						-*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003  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.
-
-
-# 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...
-
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
-
-# Copyright 1999, 2000, 2001, 2002 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.
-
-#serial 2
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Check to see how 'make' treats includes.	-*- Autoconf -*-
-
-# Copyright (C) 2001, 2002 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.
-
-# serial 2
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-doit:
-	@echo done
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST(am__include)
-AC_SUBST(am__quote)
-AC_MSG_RESULT($_am_result)
-rm -f confinc confmf
-])
-
-# AM_CONDITIONAL                                              -*- Autoconf -*-
-
-# Copyright 1997, 2000, 2001 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.
-
-# serial 5
-
-AC_PREREQ(2.52)
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
-
-# Copyright 2001 Free Software Foundation, Inc.             -*- Autoconf -*-
-
-# 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.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-
+m4_include([m4/init.m4])
+m4_include([m4/amversion.m4])
+m4_include([m4/options.m4])
+m4_include([m4/sanity.m4])
+m4_include([m4/missing.m4])
+m4_include([m4/auxdir.m4])
+m4_include([m4/install-sh.m4])
+m4_include([m4/strip.m4])
+m4_include([m4/lead-dot.m4])
+m4_include([m4/depend.m4])
+m4_include([m4/depout.m4])
+m4_include([m4/make.m4])
+m4_include([m4/cond.m4])
+m4_include([m4/runlog.m4])
diff --git a/automake.in b/automake.in
index 0331695..58f129a 100755
--- a/automake.in
+++ b/automake.in
@@ -4169,6 +4169,8 @@ sub handle_dist
 	next if /^\@.*\@$/;
 	s/\$\(top_srcdir\)/$topsrcdir/;
 	s/\$\(srcdir\)/./;
+	# Strip any leading `./'.
+	s,^(:?\./+)*,,;
 	next unless s,/+[^/]+$,,;
 	$dist_dirs{$_} = 1
 	    unless $_ eq '.';
@@ -4299,7 +4301,8 @@ sub scan_aclocal_m4
 
     if (-f 'aclocal.m4')
     {
-	&push_dist_common ('aclocal.m4');
+	&push_dist_common ('aclocal.m4')
+	  if $relative_dir eq '.';
 	&define_variable ("ACLOCAL_M4", '$(top_srcdir)/aclocal.m4', INTERNAL);
 
 	my $aclocal = new Automake::XFile "< aclocal.m4";
@@ -4318,33 +4321,9 @@ sub scan_aclocal_m4
     if (variable_defined ('ACLOCAL_M4_SOURCES'))
     {
 	push (@ac_deps, '$(ACLOCAL_M4_SOURCES)');
-    }
-    elsif (variable_defined ('ACLOCAL_AMFLAGS'))
-    {
-	# Scan all -I directories for m4 files.  These are our
-	# dependencies.
-	my $examine_next = 0;
-	foreach my $amdir (&variable_value_as_list_recursive ('ACLOCAL_AMFLAGS', TRUE))
-	{
-	    if ($examine_next)
-	    {
-		$examine_next = 0;
-		if ($amdir !~ /^\// && -d $amdir)
-		{
-		    foreach my $ac_dep (&my_glob ($amdir . '/*.m4'))
-		    {
-			$ac_dep =~ s/^\.\/+//;
-			push (@ac_deps, '$(top_srcdir)/' . $ac_dep)
-			  unless $ac_dep eq "aclocal.m4"
-			    || $ac_dep eq "acinclude.m4";
-		    }
-		}
-	    }
-	    elsif ($amdir eq '-I')
-	    {
-		$examine_next = 1;
-	    }
-	}
+	msg_var ('obsolete', 'ACLOCAL_M4_SOURCES',
+		 "`ACLOCAL_M4_SOURCES' is obsolete.\n"
+		 . "It should be safe to simply remove it.");
     }
 
     # Note that it might be possible that aclocal.m4 doesn't exist but
@@ -8723,16 +8702,6 @@ sub set_strictness
 
 ################################################################
 
-# Glob something.  Do this to avoid indentation screwups everywhere we
-# want to glob.  Gross!
-sub my_glob
-{
-    my ($pat) = @_;
-    return <${pat}>;
-}
-
-################################################################
-
 # INTEGER
 # require_variables ($WHERE, $REASON, $COND, @VARIABLES)
 # ------------------------------------------------------
diff --git a/bootstrap b/bootstrap
index c059569..ac1cfb3 100755
--- a/bootstrap
+++ b/bootstrap
@@ -99,16 +99,13 @@ sed -e "s%@PERL@%$PERL%g" \
     -e "s%@SHELL@%$BOOTSTRAP_SHELL%g" \
     aclocal.in >aclocal.tmp
 
-# Create temporary replacement for amversion.m4
-sed -e "s%@PERL@%$PERL%g" \
-    -e "s%@VERSION@%$VERSION%g" \
+# Overwrite amversion.m4
+sed -e "s%@VERSION@%$VERSION%g" \
     -e "s%@APIVERSION@%$APIVERSION%g" \
-    -e "s%@PACKAGE@%$PACKAGE%g" \
-    -e "s%@datadir@%$datadir%g" \
-    m4/amversion.in >aclocal-$APIVERSION/amversion-tmp.m4
+    m4/amversion.in >m4/amversion.m4
 
 # Run aclocal
-$PERL ./aclocal.tmp -I aclocal-$APIVERSION -I m4
+$PERL ./aclocal.tmp -I m4
 
 # Create temporary replacement for automake
 sed -e "s%@PERL@%$PERL%g" \
diff --git a/configure b/configure
index 8f3381f..2e1c01a 100755
--- a/configure
+++ b/configure
@@ -1839,7 +1839,7 @@ echo "${ECHO_T}$ac_cv_prog_fgrep" >&6
 
 
 
-                                                                                          ac_config_files="$ac_config_files Makefile lib/Automake/Makefile lib/Automake/tests/Makefile lib/Makefile lib/am/Makefile m4/Makefile m4/amversion.m4:m4/amversion.in tests/Makefile tests/defs"
+                                                                                ac_config_files="$ac_config_files Makefile lib/Automake/Makefile lib/Automake/tests/Makefile lib/Makefile lib/am/Makefile m4/Makefile tests/Makefile tests/defs"
 
 
 cat >confcache <<\_ACEOF
@@ -2398,7 +2398,6 @@ do
   "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
   "lib/am/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/am/Makefile" ;;
   "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
-  "m4/amversion.m4" ) CONFIG_FILES="$CONFIG_FILES m4/amversion.m4:m4/amversion.in" ;;
   "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
   "tests/defs" ) CONFIG_FILES="$CONFIG_FILES tests/defs" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/configure.in b/configure.in
index 681ad29..f880fd3 100644
--- a/configure.in
+++ b/configure.in
@@ -113,7 +113,6 @@ AC_CONFIG_FILES([
   lib/Makefile
   lib/am/Makefile
   m4/Makefile
-  m4/amversion.m4:m4/amversion.in
   tests/Makefile
   tests/defs
 ])
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 226870c..8357eb3 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -134,9 +134,9 @@ dist_perllib_DATA = \
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) ' in \
+	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \
 	    *$$dep*) \
 	      echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu '; \
 	      cd $(top_srcdir) && $(AUTOMAKE) --gnu ; \
@@ -155,6 +155,14 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	    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) && $(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
+	cd $(top_srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(top_srcdir)/configure.in 
+	cd $(top_srcdir) && $(MAKE) $(AM_MAKEFLAGS) '$$(ACLOCAL_M4)'
 uninstall-info-am:
 dist_perllibDATA_INSTALL = $(INSTALL_DATA)
 install-dist_perllibDATA: $(dist_perllib_DATA)
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 52ab779..f996a9b 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -114,9 +114,9 @@ EXTRA_DIST = $(TESTS)
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) ' in \
+	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \
 	    *$$dep*) \
 	      echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu '; \
 	      cd $(top_srcdir) && $(AUTOMAKE) --gnu ; \
@@ -135,6 +135,14 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	    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) && $(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
+	cd $(top_srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(top_srcdir)/configure.in 
+	cd $(top_srcdir) && $(MAKE) $(AM_MAKEFLAGS) '$$(ACLOCAL_M4)'
 uninstall-info-am:
 tags: TAGS
 TAGS:
diff --git a/lib/Makefile.in b/lib/Makefile.in
index e376b5c..1b184b1 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -132,9 +132,9 @@ mkinstalldirs elisp-comp ylwrap acinstall depcomp compile py-compile
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) ' in \
+	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \
 	    *$$dep*) \
 	      echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu '; \
 	      cd $(top_srcdir) && $(AUTOMAKE) --gnu ; \
@@ -153,6 +153,14 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	    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) && $(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
+	cd $(top_srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(top_srcdir)/configure.in 
+	cd $(top_srcdir) && $(MAKE) $(AM_MAKEFLAGS) '$$(ACLOCAL_M4)'
 uninstall-info-am:
 dist_pkgvdataDATA_INSTALL = $(INSTALL_DATA)
 install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA)
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index b76ad01..2c4c7f9 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -120,9 +120,9 @@ texinfos.am yacc.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) ' in \
+	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \
 	    *$$dep*) \
 	      echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu '; \
 	      cd $(top_srcdir) && $(AUTOMAKE) --gnu ; \
@@ -141,6 +141,14 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	    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) && $(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
+	cd $(top_srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(top_srcdir)/configure.in 
+	cd $(top_srcdir) && $(MAKE) $(AM_MAKEFLAGS) '$$(ACLOCAL_M4)'
 uninstall-info-am:
 dist_amDATA_INSTALL = $(INSTALL_DATA)
 install-dist_amDATA: $(dist_am_DATA)
diff --git a/m4/Makefile.am b/m4/Makefile.am
index b1b7a80..8c5c02d 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -53,6 +53,19 @@ runlog.m4 \
 sanity.m4 \
 strip.m4
 
-nodist_m4data_DATA = amversion.m4
+# Use `$(srcdir)' for the benefit of non-GNU makes.
+# Many implementations do not know that `./foo' is the same target as `foo'.
+nodist_m4data_DATA = $(srcdir)/amversion.m4
 DISTCLEANFILES = amversion.m4
 EXTRA_DIST = dirlist
+
+# We build amversion.m4 here, instead of from config.status,
+# because config.status is rerun each time one of configure's
+# dependencies change and amversion.m4 happens to be a configure
+# dependency.  configure and amversion.m4 would be rebuilt in
+# loop otherwise.
+$(srcdir)/amversion.m4: $(srcdir)/amversion.in
+	sed -e 's,[@]VERSION[@],$(VERSION),g' \
+	    -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
+	    $(srcdir)/amversion.in > $@t
+	mv -f $@t $@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 64a1981..7e38d11 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -34,11 +34,11 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = Makefile.in Makefile.am amversion.in $(dist_m4data_DATA)
+DIST_COMMON = Makefile.in Makefile.am $(dist_m4data_DATA)
 subdir = m4
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
-CONFIG_CLEAN_FILES = amversion.m4
+CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 am__installdirs = $(DESTDIR)$(m4datadir) $(DESTDIR)$(m4datadir)
@@ -141,15 +141,18 @@ runlog.m4 \
 sanity.m4 \
 strip.m4
 
-nodist_m4data_DATA = amversion.m4
+
+# Use `$(srcdir)' for the benefit of non-GNU makes.
+# Many implementations do not know that `./foo' is the same target as `foo'.
+nodist_m4data_DATA = $(srcdir)/amversion.m4
 DISTCLEANFILES = amversion.m4
 EXTRA_DIST = dirlist
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) ' in \
+	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \
 	    *$$dep*) \
 	      echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu '; \
 	      cd $(top_srcdir) && $(AUTOMAKE) --gnu ; \
@@ -168,8 +171,14 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-amversion.m4: $(top_builddir)/config.status amversion.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
+	cd $(top_srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(top_srcdir)/configure.in 
+	cd $(top_srcdir) && $(MAKE) $(AM_MAKEFLAGS) '$$(ACLOCAL_M4)'
 uninstall-info-am:
 dist_m4dataDATA_INSTALL = $(INSTALL_DATA)
 install-dist_m4dataDATA: $(dist_m4data_DATA)
@@ -333,6 +342,17 @@ uninstall-am: uninstall-dist_m4dataDATA uninstall-info-am \
 	uninstall-dist_m4dataDATA uninstall-info-am \
 	uninstall-nodist_m4dataDATA
 
+
+# We build amversion.m4 here, instead of from config.status,
+# because config.status is rerun each time one of configure's
+# dependencies change and amversion.m4 happens to be a configure
+# dependency.  configure and amversion.m4 would be rebuilt in
+# loop otherwise.
+$(srcdir)/amversion.m4: $(srcdir)/amversion.in
+	sed -e 's,[@]VERSION[@],$(VERSION),g' \
+	    -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
+	    $(srcdir)/amversion.in > $@t
+	mv -f $@t $@
 # 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.
 .NOEXPORT:
diff --git a/stamp-vti b/stamp-vti
index 63b1ed4..36f48a3 100644
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 23 April 2003
+@set UPDATED 24 April 2003
 @set UPDATED-MONTH April 2003
 @set EDITION 1.7a
 @set VERSION 1.7a
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 65f9139..edc7b37 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,11 @@
 ## Process this file with automake to create Makefile.in
 
-XFAIL_TESTS = aclocal5.test auxdir2.test cond17.test txinfo5.test
+XFAIL_TESTS = auxdir2.test cond17.test txinfo5.test
 
 TESTS =	\
 acinclude.test \
 aclibobj.test \
 aclocal.test \
-aclocal2.test \
-aclocal.test \
-aclocal2.test \
 aclocal3.test \
 aclocal4.test \
 aclocal5.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 085e985..246b6f9 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -33,7 +33,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = Makefile.in Makefile.am aclocal.m4 defs.in README
+DIST_COMMON = Makefile.in Makefile.am defs.in README
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
@@ -104,14 +104,11 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-XFAIL_TESTS = aclocal5.test auxdir2.test cond17.test txinfo5.test
+XFAIL_TESTS = auxdir2.test cond17.test txinfo5.test
 TESTS = \
 acinclude.test \
 aclibobj.test \
 aclocal.test \
-aclocal2.test \
-aclocal.test \
-aclocal2.test \
 aclocal3.test \
 aclocal4.test \
 aclocal5.test \
@@ -580,9 +577,9 @@ check_SCRIPTS = defs
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
 	@for dep in $?; do \
-	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) ' in \
+	  case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \
 	    *$$dep*) \
 	      echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu '; \
 	      cd $(top_srcdir) && $(AUTOMAKE) --gnu ; \
@@ -605,7 +602,7 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) 
+$(top_srcdir)/configure:  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4
 	cd $(top_srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(top_srcdir)/configure.in 
 	cd $(top_srcdir) && $(MAKE) $(AM_MAKEFLAGS) '$$(ACLOCAL_M4)'
diff --git a/tests/acinclude.test b/tests/acinclude.test
index 5187f53..930058d 100755
--- a/tests/acinclude.test
+++ b/tests/acinclude.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -23,8 +23,8 @@
 
 . ./defs || exit 1
 
-echo moo > acinclude.m4
+set -e
+: > acinclude.m4
 
-$ACLOCAL || exit 1
-
-grep moo aclocal.m4
+$ACLOCAL
+grep 'm4_include.*acinclude\.m4' aclocal.m4
diff --git a/tests/aclocal2.test b/tests/aclocal2.test
deleted file mode 100755
index c9461ac..0000000
--- a/tests/aclocal2.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2002  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake 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.
-#
-# GNU Automake 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 autoconf; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# Make sure that ACLOCAL_AMFLAGS doesn't cause circular dependencies.
-. ./defs || exit 1
-
-echo AM_QUUX >> configure.in
-
-cat > quux.m4 << 'END'
-AC_DEFUN([AM_QUUX], [
-])
-END
-
-cat > Makefile.am << 'END'
-ACLOCAL_AMFLAGS = -I .
-END
-
-# We have to run aclocal first to make sure that aclocal.m4 exists.
-# Otherwise automake won't guess that we want to auto-generate it.
-$ACLOCAL -I . || exit 1
-
-$AUTOMAKE || exit 1
-
-grep "\$(ACLOCAL_M4): *configure.in *quux.m4" Makefile.in || exit 1
diff --git a/tests/aclocal5.test b/tests/aclocal5.test
index 449de36..4bcbe22 100755
--- a/tests/aclocal5.test
+++ b/tests/aclocal5.test
@@ -59,3 +59,7 @@ $MAKE
 cd ..
 grep GREPME Makefile
 grep GREPME sub/Makefile
+
+# Make sure configure dependencies are distributed.
+$MAKE distdir
+test -f aclocal5-1.0/m4/moredefs.m4
diff --git a/tests/dirlist.test b/tests/dirlist.test
index 49b7535..8a7c985 100755
--- a/tests/dirlist.test
+++ b/tests/dirlist.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -46,11 +46,12 @@ AC_DEFUN([AM_INIT_AUTOMAKE], [I should not be included])
 EOF
 
 $ACLOCAL
-grep 'DEFUN.*AM_INIT_GUILE_MODULE' aclocal.m4
+$AUTOCONF
+grep 'GUILE-VERSION' configure
 
 # This bug can occur only when we do a VPATH build of Automake
 # (beause of the `-I' passed to aclocal in tests/defs) but it's
 # ok because this is what `make distcheck' does.
-grep 'I should not be included' aclocal.m4 && exit 1
+grep 'I should not be included' configure && exit 1
 
 :
diff --git a/tests/dup3.test b/tests/dup3.test
index 91868f8..4997faa 100755
--- a/tests/dup3.test
+++ b/tests/dup3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -22,11 +22,6 @@
 
 . ./defs || exit 1
 
-cat >> configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE
-END
-
 mkdir zoo
 cat > zoo/zoo.m4 << 'END'
 AC_DEFUN([AM_INIT_AUTOMAKE], zardoz)
@@ -35,4 +30,5 @@ END
 # Strip all options from ACLOCAL, especially -I's.
 ACLOCAL="`echo $ACLOCAL | sed -e 's/ -.*$//'` --acdir=$testsrcdir/../m4"
 $ACLOCAL -I zoo || exit 1
-$FGREP zardoz aclocal.m4
+$AUTOCONF
+grep zardoz configure
diff --git a/version.texi b/version.texi
index 63b1ed4..36f48a3 100644
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 23 April 2003
+@set UPDATED 24 April 2003
 @set UPDATED-MONTH April 2003
 @set EDITION 1.7a
 @set VERSION 1.7a
-- 
2.7.4