[libvirt] [PATCH] build: use the gnulib version of the .m4 files when present
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 - # 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 -- 1.8.3.1
Giuseppe Scrivano <gscrivan@redhat.com> writes:
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>
ping
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 :|
"Daniel P. Berrange" <berrange@redhat.com> writes:
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.
thanks to have checked it. It seems that using directly the "bootstrap" script makes a difference, I had assumed it doesn't; and also it makes a difference if I run "git clean -fdx" before autogen.sh (so maybe it is a separate issue?). I'll investigate this better if Eric hasn't already an answer. Regards, Giuseppe
On 10/16/2013 07:38 AM, Giuseppe Scrivano wrote:
"Daniel P. Berrange" <berrange@redhat.com> writes:
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.
thanks to have checked it. It seems that using directly the "bootstrap" script makes a difference, I had assumed it doesn't; and also it makes a difference if I run "git clean -fdx" before autogen.sh (so maybe it is a separate issue?). I'll investigate this better if Eric hasn't already an answer.
Looking at it now; but I think we can just go one step further, and use a single m4 directory for everything. Stay tuned... -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
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@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
participants (3)
-
Daniel P. Berrange -
Eric Blake -
Giuseppe Scrivano