[libvirt] [PATCH] build: use the gnulib version of the .m4 files when present

[Eric Blake]

On 10/07/2013 03:44 PM, Giuseppe Scrivano wrote:
> prevent aclocal to prefer .m4 files under m4/ to the version provided
> by gnulib.

s/to prefer/from preferring/; s/to the/over the/

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

Basically, xgettext was honoring configure's AC_CONFIG_MACRO_DIR
designation of m4/ for where to stick the (often older) versions of its
macros, while gnulib was honoring bootstrap.conf and trying to stick all
gnulib macros into gnulib/m4/, and with lock.m4 installed into
two locations, we get weird effects.

> 
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---
>  bootstrap.conf | 5 -----
>  1 file changed, 5 deletions(-)

I think we can go one step further, by squashing in this, to use only
one directory in the first place (so no matter what xgettext installs,
gnulib installs over the same location so we always end up with just one
version of the file):

diff --git i/bootstrap.conf w/bootstrap.conf
index e7353e2..8b37217 100644
--- i/bootstrap.conf
+++ w/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="\
diff --git i/Makefile.am w/Makefile.am
index 66cb677..f3b5cd2 100644
--- i/Makefile.am
+++ w/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/, \

ACK with that change, and pushed on your behalf, after testing that
'make distcheck' still works with the new layout.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 621 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20131016/c9ef3fe9/attachment-0001.sig>