On Mon, Oct 07, 2013 at 11:44:45PM +0200, Giuseppe Scrivano wrote:
prevent aclocal to prefer .m4 files under m4/ to the version provided by gnulib.
I have noticed this after './configure --help' gave me two different versions of "--enable-threads". This was caused by aclocal that preferred the version of lock.m4 provided by autopoint instead of using the newer version distributed with gnulib.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> --- bootstrap.conf | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf index 68c4a89..e7353e2 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -191,11 +191,6 @@ gnulib_tool_option_extras="\ " local_gl_dir=gnulib/local
-# Convince bootstrap to use multiple m4 directories. -: ${ACLOCAL=aclocal} -ACLOCAL="$ACLOCAL -I m4" -export ACLOCAL -
Makefile.am has ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 and looking at what is run by autogen.sh with strace, it seems to use 'aclocal -I m4 -I gnulib/m4'. So this bootstrap.conf ACLOCAL setting doesn't appear to have any effect. None the less removing it does change the contents of 'configure' I think this needs Eric's review. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|