diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2002-01-07 20:25:24 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2002-01-07 20:25:24 +0000 |
| commit | 57a6006eff5d1d5b6b606310c7d72b82d3f18160 (patch) | |
| tree | 0f7afd2243b94ab604533dc47c39a3bb04f59bd5 /configure.in | |
| parent | 3b52bf3faaef4803c53b0a7413945d0716e43d86 (diff) | |
| download | automake-57a6006eff5d1d5b6b606310c7d72b82d3f18160.tar.gz | |
* configure.in (AUTOMAKE): Create m4/amversion.m4.
* m4/amversion.in: New file.
* m4/Makefile.am (m4data_DATA, EXTRA_DIST): Replace by ...
(dist_m4data_DATA): ... this.
(nodist_m4data_DATA, DISTCLEANFILES): Add amversion.m4.
* m4/init.m4 (AM_INIT_AUTOMAKE): Require
AM_SET_CURRENT_AUTOMAKE_VERSION.
* automake.in (seen_automake_version): New variable.
(scan_autoconf_traces, scan_one_autoconf_file,
scan_autoconf_files): Scan for AM_AUTOMAKE_VERSION and complain
when the version used in aclocal.m4 differs from Automake's.
* tests/defs (ACLOCAL): Look in ../m4 too.
* tests/installsh.test (ACLOCAL): Likewise.
* tests/installdir.test (installdirs-local): Run $ACLOCAL.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/configure.in b/configure.in index aa880b2c5..c1027ab4a 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. -# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software -# Foundation, Inc. +# Copyright 1995, 1996, 1997, 1998, 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 @@ -49,9 +49,14 @@ rm conftest.ac AC_CONFIG_FILES([automake], [chmod +x automake]) AC_CONFIG_FILES([aclocal], [chmod +x aclocal]) -AC_OUTPUT([Makefile - lib/Makefile - lib/Automake/Makefile - lib/am/Makefile - m4/Makefile - tests/Makefile]) +AC_CONFIG_FILES([ + Makefile + lib/Automake/Makefile + lib/Makefile + lib/am/Makefile + m4/Makefile + m4/amversion.m4:m4/amversion.in + tests/Makefile +]) + +AC_OUTPUT |