I'm installing this, to fix some issues occurring in "build from
scratch" situations.
2006-08-19 Alexandre Duret-Lutz <[EMAIL PROTECTED]>
* Makefile.am (SUBDIRS): Build lib first, for lib/Automake/Config.pm.
* configure.ac (ACLOCAL): Use --acdir=m4 in addition to
-I m4. Running aclocal during the rebuild rules will fail
if the default acdir does not exist.
Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.244
diff -u -r1.244 Makefile.am
--- Makefile.am 19 Aug 2006 13:28:25 -0000 1.244
+++ Makefile.am 19 Aug 2006 15:05:07 -0000
@@ -20,9 +20,11 @@
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
-## We need `.' in SUBDIRS because we want `check' to build `.' before
-## tests. It should go before `doc', because doc/amhello uses automake.
-SUBDIRS = . doc m4 lib tests
+## lib goes first, because it builds Config.pm, used by aclocal and
+## automake (run in doc, tests, and in the rebuild rules.)
+## `.' goes before doc and check, because the latter two directories
+## run aclocal and automake.
+SUBDIRS = lib . doc m4 tests
bin_SCRIPTS = automake aclocal
Index: configure.ac
===================================================================
RCS file: /cvs/automake/automake/configure.ac,v
retrieving revision 1.29
diff -u -r1.29 configure.ac
--- configure.ac 19 Aug 2006 13:58:03 -0000 1.29
+++ configure.ac 19 Aug 2006 15:05:08 -0000
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006,
# 2004, 2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@
# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
# hence `.' is really what we want for perllibdir, libdir, and acdir.
-ACLOCAL="perllibdir=`pwd`\"/lib$PATH_SEPARATOR./lib\" `pwd`/aclocal -I m4"
+ACLOCAL="perllibdir=`pwd`\"/lib$PATH_SEPARATOR./lib\" `pwd`/aclocal --acdir=m4
-I m4"
AUTOMAKE="perllibdir=`pwd`\"/lib$PATH_SEPARATOR./lib\" `pwd`/automake
--libdir=lib"
AC_PATH_PROG(PERL, perl)
--
Alexandre Duret-Lutz
Shared books are happy books. http://www.bookcrossing.com/friend/gadl
