From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 6 Nov 2014 09:59:44 +0000 (+0100)
Subject: Fix build-time pkg-config files in VPATH
X-Git-Tag: CVE-2014-8135~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a097fee55afa0ce24259c62a4b6f81f0626bb5fa;p=thirdparty%2Flibvirt.git

Fix build-time pkg-config files in VPATH

Since libvirt.h was split into several files, it is impossible to
compile anything against a VPATH-built libvirt. In VPATH, only libvirt.h
is in build/include/libvirt while all other libvirt-*.h files are in
source/include/libvirt.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/libvirt-lxc.pc.in b/src/libvirt-lxc.pc.in
index dd049501ea..b9e131954b 100644
--- a/src/libvirt-lxc.pc.in
+++ b/src/libvirt-lxc.pc.in
@@ -6,6 +6,7 @@ prefix=@abs_top_builddir@
 exec_prefix=@abs_top_builddir@
 libdir=@abs_top_builddir@/src/.libs
 includedir=@abs_top_builddir@/include
+source_includedir=@abs_top_srcdir@/include
 datarootdir=@abs_top_srcdir@
 
 libvirt_lxc_api=@datadir@/docs/libvirt-lxc-api.xml
@@ -15,4 +16,4 @@ Version: @VERSION@
 Description: libvirt LXC library
 Requires:
 Libs: -L${libdir} -lvirt-lxc
-Cflags: -I${includedir}
+Cflags: -I${includedir} -I${source_includedir}
diff --git a/src/libvirt-qemu.pc.in b/src/libvirt-qemu.pc.in
index 5483da95e1..173ec5c50e 100644
--- a/src/libvirt-qemu.pc.in
+++ b/src/libvirt-qemu.pc.in
@@ -6,6 +6,7 @@ prefix=@abs_top_builddir@
 exec_prefix=@abs_top_builddir@
 libdir=@abs_top_builddir@/src/.libs
 includedir=@abs_top_builddir@/include
+source_includedir=@abs_top_srcdir@/include
 datarootdir=@abs_top_srcdir@
 
 libvirt_qemu_api=@datadir@/docs/libvirt-qemu-api.xml
@@ -15,4 +16,4 @@ Version: @VERSION@
 Description: libvirt QEMU library
 Requires:
 Libs: -L${libdir} -lvirt-qemu
-Cflags: -I${includedir}
+Cflags: -I${includedir} -I${source_includedir}
diff --git a/src/libvirt.pc.in b/src/libvirt.pc.in
index 548fa77bb1..9fe2f1f694 100644
--- a/src/libvirt.pc.in
+++ b/src/libvirt.pc.in
@@ -6,6 +6,7 @@ prefix=@abs_top_builddir@
 exec_prefix=@abs_top_builddir@
 libdir=@abs_top_builddir@/src/.libs
 includedir=@abs_top_builddir@/include
+source_includedir=@abs_top_srcdir@/include
 datarootdir=@abs_top_srcdir@
 
 libvirt_api=@datadir@/docs/libvirt-api.xml
@@ -20,4 +21,4 @@ Version: @VERSION@
 Description: libvirt library
 Requires:
 Libs: -L${libdir} -lvirt
-Cflags: -I${includedir}
+Cflags: -I${includedir} -I${source_includedir}