* 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.

diff --git a/ChangeLog b/ChangeLog
index 3e7e942cc8a01dbf13598fa4ef731b003369fd9f..7bfc340601a422310acc931f22c946335d73dc42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-08-19  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * 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.
+
        * NEWS, configure.ac, m4/init.m4, m4/lispdir.m4, m4/mkdirp.m4:
        Require Autoconf 2.60 instead of some intermediate development
        version.

diff --git a/Makefile.am b/Makefile.am
index 642f3180d8ca9e905d2da8f71f0918e06cdd1110..ee9c8021c895e10558b57d8fcdef78e807b0a58b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
 

diff --git a/Makefile.in b/Makefile.in
index b5817fb665ae23c8810fa5be7d9a38f9d6251e5e..689dad09297ddeed28f4aa3fee434eb131eb8a4d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -161,7 +161,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = . doc m4 lib tests
+SUBDIRS = lib . doc m4 tests
 bin_SCRIPTS = automake aclocal
 CLEANFILES = $(bin_SCRIPTS)
 AUTOMAKESOURCES = automake.in aclocal.in

diff --git a/configure b/configure
index 7f91cbad3074c452e846cb7eb6cca436edd3bc5a..1e7b7f958ac05f0171aa623f63c5c7fa3a862836 100755 (executable)
--- a/configure
+++ b/configure
@@ -2193,7 +2193,7 @@ pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION"
 
 # $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"
 
 # Extract the first word of "perl", so it can be a program name with args.

diff --git a/configure.ac b/configure.ac
index cd9db9b0243def92865d7e89160129451e18f63e..b4b777e7d0bf37d620929fa72043b6ff7c9b36dc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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 @@ AC_SUBST([pkgvdatadir], ["\${datadir}/$PACKAGE-$APIVERSION"])
 
 # $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)