[libvirt] [libvirt-glib] gir: use libraries from build tree, not installed ones

[Daniel P. Berrange]

On Tue, Nov 29, 2011 at 10:06:01PM +0100, Christophe Fergeau wrote:
> If we don't explicitly mention path to our uninstalled libraries
> to g-ir-scanner, it will use installed libvirt-* libraries instead
> of the ones we just built to run a binary during the generation of
> the gir file. However this binary will have been compiled with the
> uninstalled ones,
> This is an issue if the installed libraries are not ABI compatible
> with the uninstalled one, and will cause a compile failure because
> the binary will fail to run.
> This fix has been suggested by Colin Walters (gobject-introspection
> maintainer).
> ---
>  libvirt-gobject/Makefile.am |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am
> index 1e0f851..c4405f0 100644
> --- a/libvirt-gobject/Makefile.am
> +++ b/libvirt-gobject/Makefile.am
> @@ -130,6 +130,8 @@ LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am
>                  --include-uninstalled $(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir \
>                  --identifier-prefix=GVir \
>                  --symbol-prefix=gvir \
> +                --library=$(top_builddir)/libvirt-glib/libvirt-glib-1.0.la \
> +                --library=$(top_builddir)/libvirt-gconfig/libvirt-gconfig-1.0.la \
>                  --library=$(builddir)/libvirt-gobject-1.0.la \
>                  --output $@ \
>                  -I$(top_builddir) \

ACK


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