[libvirt] [PATCH 2/3] Add pkg-config files for libvirt-qemu & libvirt-lxc

[Daniel P. Berrange]

For some reason there have never been pkg-config files created
for the libvirt-qemu.so and libvirt-lxc.so libraries.

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 .gitignore            |  2 +-
 Makefile.am           |  4 +++-
 configure.ac          |  5 ++++-
 libvirt-lxc.pc.in     | 14 ++++++++++++++
 libvirt-qemu.pc.in    | 14 ++++++++++++++
 libvirt.pc.in         |  3 +++
 libvirt.spec.in       | 15 ++++++++++++---
 mingw-libvirt.spec.in |  2 ++
 8 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 libvirt-lxc.pc.in
 create mode 100644 libvirt-qemu.pc.in

diff --git a/.gitignore b/.gitignore
index 8c3b870..a3d992f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,7 +84,7 @@
 /libtool
 /libvirt-*.tar.gz
 /libvirt-[0-9]*
-/libvirt.pc
+/libvirt*.pc
 /libvirt.spec
 /ltconfig
 /ltmain.sh
diff --git a/Makefile.am b/Makefile.am
index abc5a2f..a374e1a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,8 @@ EXTRA_DIST = \
   libvirt.spec libvirt.spec.in \
   mingw-libvirt.spec.in \
   libvirt.pc.in \
+  libvirt-qemu.pc.in \
+  libvirt-lxc.pc.in \
   autobuild.sh \
   Makefile.nonreentrant \
   autogen.sh \
@@ -47,7 +49,7 @@ EXTRA_DIST = \
   $(XML_EXAMPLES)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libvirt.pc
+pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc
 
 NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
 	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then			\
diff --git a/configure.ac b/configure.ac
index 710cb71..c2094d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2727,7 +2727,10 @@ AC_CONFIG_FILES([\
         docs/schemas/Makefile \
         gnulib/lib/Makefile \
         gnulib/tests/Makefile \
-        libvirt.pc libvirt.spec mingw-libvirt.spec \
+        libvirt.pc \
+        libvirt-qemu.pc \
+        libvirt-lxc.pc \
+        libvirt.spec mingw-libvirt.spec \
         po/Makefile.in \
         include/libvirt/Makefile include/libvirt/libvirt.h \
         daemon/Makefile \
diff --git a/libvirt-lxc.pc.in b/libvirt-lxc.pc.in
new file mode 100644
index 0000000..d78ccb6
--- /dev/null
+++ b/libvirt-lxc.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+
+libvirt_lxc_api=@datadir@/libvirt/api/libvirt-lxc-api.xml
+
+Name: libvirt-lxc
+Version: @VERSION@
+Description: libvirt LXC library
+Requires: libvirt
+Libs: -L${libdir} -lvirt-lxc
+Cflags: -I${includedir}
diff --git a/libvirt-qemu.pc.in b/libvirt-qemu.pc.in
new file mode 100644
index 0000000..0cb336a
--- /dev/null
+++ b/libvirt-qemu.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+
+libvirt_qemu_api=@datadir@/libvirt/api/libvirt-qemu-api.xml
+
+Name: libvirt-qemu
+Version: @VERSION@
+Description: libvirt QEMU library
+Requires: libvirt
+Libs: -L${libdir} -lvirt-qemu
+Cflags: -I${includedir}
diff --git a/libvirt.pc.in b/libvirt.pc.in
index 58645d9..a81df61 100644
--- a/libvirt.pc.in
+++ b/libvirt.pc.in
@@ -5,6 +5,9 @@ includedir=@includedir@
 datarootdir=@datarootdir@
 
 libvirt_api=@datadir@/libvirt/api/libvirt-api.xml
+
+# For compat with older versions - also present
+# in libvirt-qemu.pc / libvirt-lxc.pc
 libvirt_qemu_api=@datadir@/libvirt/api/libvirt-qemu-api.xml
 libvirt_lxc_api=@datadir@/libvirt/api/libvirt-lxc-api.xml
 
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 344748c..2ec7eed 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -2148,7 +2148,9 @@ exit 0
 %{_bindir}/virt-xml-validate
 %{_bindir}/virt-pki-validate
 %{_bindir}/virt-host-validate
-%{_libdir}/lib*.so.*
+%{_libdir}/libvirt.so.*
+%{_libdir}/libvirt-qemu.so.*
+%{_libdir}/libvirt-lxc.so.*
 
 %if %{with_dtrace}
 %{_datadir}/systemtap/tapset/libvirt_probes*.stp
@@ -2205,10 +2207,17 @@ exit 0
 %files devel
 %defattr(-, root, root)
 
-%{_libdir}/lib*.so
+%{_libdir}/libvirt.so
+%{_libdir}/libvirt-qemu.so
+%{_libdir}/libvirt-lxc.so
 %dir %{_includedir}/libvirt
-%{_includedir}/libvirt/*.h
+%{_includedir}/libvirt/virterror.h
+%{_includedir}/libvirt/libvirt.h
+%{_includedir}/libvirt/libvirt-qemu.h
+%{_includedir}/libvirt/libvirt-lxc.h
 %{_libdir}/pkgconfig/libvirt.pc
+%{_libdir}/pkgconfig/libvirt-qemu.pc
+%{_libdir}/pkgconfig/libvirt-lxc.pc
 
 %dir %{_datadir}/libvirt/api/
 %{_datadir}/libvirt/api/libvirt-api.xml
diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in
index 1b505e6..91c2dc2 100644
--- a/mingw-libvirt.spec.in
+++ b/mingw-libvirt.spec.in
@@ -195,6 +195,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
 
 %{mingw32_libdir}/libvirt.dll.a
 %{mingw32_libdir}/pkgconfig/libvirt.pc
+%{mingw32_libdir}/pkgconfig/libvirt-qemu.pc
+%{mingw32_libdir}/pkgconfig/libvirt-lxc.pc
 %{mingw32_libdir}/libvirt-lxc.dll.a
 %{mingw32_libdir}/libvirt-qemu.dll.a
 
-- 
1.9.3