On Tue, Jan 21, 2014 at 11:06:24AM +0100, Christophe Fergeau wrote: > On Fri, Jan 17, 2014 at 04:56:27PM +0000, Daniel P. Berrange wrote: > > Remove hand crafted configure.ac and Makefile.am rules in > > favour of the standard macros. > > > > Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> > As discussed in https://bugzilla.redhat.com/show_bug.cgi?id=1054657, > something like the patch below needs to be squashed in or this won't build > on systems without the .gir files already installed in a system location > > diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am > index 4659642..c0258c0 100644 > --- a/libvirt-gobject/Makefile.am > +++ b/libvirt-gobject/Makefile.am > @@ -158,6 +158,9 @@ LibvirtGObject_1_0_gir_SCANNERFLAGS = \ > --include-uninstalled > $(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir \ > $(NULL) > INTROSPECTION_GIRS += LibvirtGObject-1.0.gir > +INTROSPECTION_COMPILER_ARGS = \ > + --includedir=$(top_builddir)/libvirt-glib \ > + --includedir=$(top_builddir)/libvirt-gconfig > > girdir = $(datadir)/gir-1.0 > gir_DATA = LibvirtGObject-1.0.gir Thanks, I'll squash this in before pushing. 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 :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list