[FYI] {master} docs: remove mention of deprecated option `--acdir'

2011-09-20 Thread Stefano Lattarini
* doc/automake.texi (aclocal Options): Remove mention of deprecated `--acdir' option. --- ChangeLog |6 ++ doc/automake.texi |5 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0fdb295..d89b280 100644 --- a/ChangeLog +++ b/Change

[FYI] {master} fix: cleanup NEWS after botched merges

2011-09-20 Thread Stefano Lattarini
--- ChangeLog |4 NEWS | 19 --- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01388cc..0fdb295 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-09-20 Stefano Lattarini + * NEWS: Cleanup after bot

Re: [PATCH] aclocal: handle ACLOCAL_PATH environment variable

2011-09-20 Thread Stefano Lattarini
On Tuesday 20 September 2011, Stefano Lattarini wrote: > We definitely want to clean this all up in 1.12 -- code, documentation and > testsuite as well. > For the moment, I'd like to push this follow-up patch to maint as well, to "smooth out" the transition a bit. I will push this patch and the

Re: [PATCH] aclocal: handle ACLOCAL_PATH environment variable

2011-09-20 Thread Stefano Lattarini
On Tuesday 20 September 2011, Paolo Bonzini wrote: > On 09/20/2011 02:09 PM, Stefano Lattarini wrote: > >> Yeah, I think the problem is that in the normal search path (from > >> `aclocal -I /foo -I /bar'): > >> > >> 1. `/foo' > >> > >> 2. `/bar' > >> > >> 3. ACDIR-APIVERSION > >> > >>

Re: [PATCH] aclocal: handle ACLOCAL_PATH environment variable

2011-09-20 Thread Paolo Bonzini
On 09/20/2011 02:09 PM, Stefano Lattarini wrote: Yeah, I think the problem is that in the normal search path (from `aclocal -I /foo -I /bar'): 1. `/foo' 2. `/bar' 3. ACDIR-APIVERSION 4. ACDIR The directories from dirlist and ACLOCAL_PATH should go after (3), rather than after

Re: [PATCH] aclocal: handle ACLOCAL_PATH environment variable

2011-09-20 Thread Stefano Lattarini
On Tuesday 20 September 2011, Paolo Bonzini wrote: > On 09/20/2011 12:51 PM, Stefano Lattarini wrote: > > > Yes (and that's on purpose: ACLOCAL_PATH is typically used by a user > > > which has newer versions of libraries installed, so they need their > > > directories to override everything). >

Re: [PATCH] aclocal: handle ACLOCAL_PATH environment variable

2011-09-20 Thread Paolo Bonzini
On 09/20/2011 12:51 PM, Stefano Lattarini wrote: > Yes (and that's on purpose: ACLOCAL_PATH is typically used by a user > which has newer versions of libraries installed, so they need their > directories to override everything). Yes, this might be desirable. But then, for consistency sake, s

Re: [PATCH] aclocal: handle ACLOCAL_PATH environment variable

2011-09-20 Thread Stefano Lattarini
On Monday 19 September 2011, Paolo Bonzini wrote: > On Mon, Sep 19, 2011 at 18:39, Stefano Lattarini > wrote: > >> Just to be sure, you are not including > >> http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00091.html > >> are you? > >> > > No, not yet at least. > > > > Because, if I