* configure.ac (AM_INIT_AUTOMAKE): Require Automake 1.6.3.

* Makefile.am (AUTOMAKE_OPTIONS): Don't.

diff --git a/ChangeLog b/ChangeLog
index 6e34ac31e1c2b08212441df866ea5a26fe1df7d7..3b21190f5a21d60f893de2deef110ec881d9ce46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-13  Akim Demaille  <akim@epita.fr>
+
+       * configure.ac (AM_INIT_AUTOMAKE): Require Automake 1.6.3.
+       * Makefile.am (AUTOMAKE_OPTIONS): Don't.
+
 2002-09-13  Akim Demaille  <akim@epita.fr>
 
        * configure.ac: Require 2.54.

diff --git a/Makefile.am b/Makefile.am
index 7dae8b9dad1fbd1c5b26ccb01e33f2802cb22567..400831cba6f993c07dea2c77d43e3d4f70c45b7c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-
 ## Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -15,9 +16,6 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 ## 02111-1307  USA
 
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
-AUTOMAKE_OPTIONS = 1.6 check-news readme-alpha dist-bzip2
-
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = config po lib data src doc m4 tests

diff --git a/README-cvs b/README-cvs
index 022b5ac5b5fc76067da9b2afb1a4f941e74dcb7a..17370f0c2042b055f42d867299f2fd5df788ece2 100644 (file)
--- a/README-cvs
+++ b/README-cvs
@@ -9,14 +9,11 @@ Only the sources are installed in the CVS repository (to ease the
 maintenance, merges etc.), therefore you will have to the maintainer
 tools we depend upon:
 
-- Automake 1.6 or 1.6.1
+- Automake 1.6.3
 
-- Autoconf 2.53a or better
-  ftp://alpha.gnu.org/gnu/autoconf/autoconf-2.53a.tar.gz   (992 kB)
-  ftp://alpha.gnu.org/gnu/autoconf/autoconf-2.53a.tar.bz2  (756 kB)
+- Autoconf 2.54
 
-- Gettext 0.11.3 pre 2 or better
-  http://www.lrde.epita.fr/~akim/download/gettext-0.11.3-pre2.tar.gz
+- Gettext 0.11.5
 
 Only building the initial full source tree will be a bit painful,
 later, a plain `cvs update -P & make' should be sufficient.
@@ -55,8 +52,8 @@ If you experience problems, I suggest the following:
 
 1. Do a regular CVS checkout
 
-2. Fetch a recent tarball.
-   http://www.lrde.epita.fr/~akim/download/bison-1.49b.tar.gz
+2. Fetch a recent tarball in:
+   http://www.lrde.epita.fr/~akim/download/
 
 3. Extract it
 

diff --git a/configure.ac b/configure.ac
index 2a2f915a38326c3d9ac3678a2bb21091eb461b92..3d0a1a3f681dee1ed6eacb199f44fd96ec9857ef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_PREREQ(2.54)
 AC_INIT([GNU Bison], [1.49c], [bug-bison@gnu.org])
 AC_CONFIG_AUX_DIR(config)
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.6.3 check-news readme-alpha dist-bzip2])
 AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.