From 70dadfa7e77c4153bb4077cf0c0fc0316754fa02 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 7 Oct 2013 23:44:45 +0200 Subject: [PATCH] build: use the gnulib version of the .m4 files when present prevent aclocal from preferring .m4 files under m4/ over the version provided by gnulib, by using only one directory. 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. Having two different directories made sense back when we checked gnulib files into libvirt.git, but that was ages ago. Signed-off-by: Giuseppe Scrivano Signed-off-by: Eric Blake --- Makefile.am | 2 +- bootstrap.conf | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 66cb67733d..f3b5cd2b18 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ examples/dominfo examples/domsuspend examples/python examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap -ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 +ACLOCAL_AMFLAGS = -I m4 XML_EXAMPLES = \ $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/examples/xml/, \ diff --git a/bootstrap.conf b/bootstrap.conf index 68c4a890c5..8b3721741a 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -175,11 +175,11 @@ fi # Tell gnulib to: # require LGPLv2+ # apply any local diffs in gnulib/local/ dir -# put *.m4 files in new gnulib/m4/ dir +# put *.m4 files in m4/ dir # put *.[ch] files in new gnulib/lib/ dir # import gnulib tests in new gnulib/tests/ dir gnulib_name=libgnu -m4_base=gnulib/m4 +m4_base=m4 source_base=gnulib/lib tests_base=gnulib/tests gnulib_tool_option_extras="\ @@ -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 - # Build prerequisites # Note that some of these programs are only required for 'make dist' to # succeed from a fresh git checkout; not all of these programs are