From bd7018115a82071562c11d30fc4fc699a079f12e Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 13 Sep 2002 15:39:52 +0000 Subject: [PATCH] * configure.ac (AM_INIT_AUTOMAKE): Require Automake 1.6.3. * Makefile.am (AUTOMAKE_OPTIONS): Don't. --- ChangeLog | 5 +++++ Makefile.am | 4 +--- README-cvs | 13 +++++-------- configure.ac | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e34ac31..3b21190f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-09-13 Akim Demaille + + * configure.ac (AM_INIT_AUTOMAKE): Require Automake 1.6.3. + * Makefile.am (AUTOMAKE_OPTIONS): Don't. + 2002-09-13 Akim Demaille * configure.ac: Require 2.54. diff --git a/Makefile.am b/Makefile.am index 7dae8b9d..400831cb 100644 --- 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 022b5ac5..17370f0c 100644 --- 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 2a2f915a..3d0a1a3f 100644 --- 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. -- 2.45.2