Skip to content

Commit 65d8c92

Browse files
committed
Add pkg-config files for libvirt-qemu & libvirt-lxc
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 <[email protected]>
1 parent 1167751 commit 65d8c92

8 files changed

+53
-6
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
/libtool
8585
/libvirt-*.tar.gz
8686
/libvirt-[0-9]*
87-
/libvirt.pc
87+
/libvirt*.pc
8888
/libvirt.spec
8989
/ltconfig
9090
/ltmain.sh

Makefile.am

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ EXTRA_DIST = \
3838
libvirt.spec libvirt.spec.in \
3939
mingw-libvirt.spec.in \
4040
libvirt.pc.in \
41+
libvirt-qemu.pc.in \
42+
libvirt-lxc.pc.in \
4143
autobuild.sh \
4244
Makefile.nonreentrant \
4345
autogen.sh \
@@ -47,7 +49,7 @@ EXTRA_DIST = \
4749
$(XML_EXAMPLES)
4850

4951
pkgconfigdir = $(libdir)/pkgconfig
50-
pkgconfig_DATA = libvirt.pc
52+
pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc
5153

5254
NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
5355
$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \

configure.ac

+4-1
Original file line numberDiff line numberDiff line change
@@ -2727,7 +2727,10 @@ AC_CONFIG_FILES([\
27272727
docs/schemas/Makefile \
27282728
gnulib/lib/Makefile \
27292729
gnulib/tests/Makefile \
2730-
libvirt.pc libvirt.spec mingw-libvirt.spec \
2730+
libvirt.pc \
2731+
libvirt-qemu.pc \
2732+
libvirt-lxc.pc \
2733+
libvirt.spec mingw-libvirt.spec \
27312734
po/Makefile.in \
27322735
include/libvirt/Makefile include/libvirt/libvirt.h \
27332736
daemon/Makefile \

libvirt-lxc.pc.in

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
prefix=@prefix@
2+
exec_prefix=@exec_prefix@
3+
libdir=@libdir@
4+
includedir=@includedir@
5+
datarootdir=@datarootdir@
6+
7+
libvirt_lxc_api=@datadir@/libvirt/api/libvirt-lxc-api.xml
8+
9+
Name: libvirt-lxc
10+
Version: @VERSION@
11+
Description: libvirt LXC library
12+
Requires: libvirt
13+
Libs: -L${libdir} -lvirt-lxc
14+
Cflags: -I${includedir}

libvirt-qemu.pc.in

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
prefix=@prefix@
2+
exec_prefix=@exec_prefix@
3+
libdir=@libdir@
4+
includedir=@includedir@
5+
datarootdir=@datarootdir@
6+
7+
libvirt_qemu_api=@datadir@/libvirt/api/libvirt-qemu-api.xml
8+
9+
Name: libvirt-qemu
10+
Version: @VERSION@
11+
Description: libvirt QEMU library
12+
Requires: libvirt
13+
Libs: -L${libdir} -lvirt-qemu
14+
Cflags: -I${includedir}

libvirt.pc.in

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ includedir=@includedir@
55
datarootdir=@datarootdir@
66

77
libvirt_api=@datadir@/libvirt/api/libvirt-api.xml
8+
9+
# For compat with older versions - also present
10+
# in libvirt-qemu.pc / libvirt-lxc.pc
811
libvirt_qemu_api=@datadir@/libvirt/api/libvirt-qemu-api.xml
912
libvirt_lxc_api=@datadir@/libvirt/api/libvirt-lxc-api.xml
1013

libvirt.spec.in

+12-3
Original file line numberDiff line numberDiff line change
@@ -2148,7 +2148,9 @@ exit 0
21482148
%{_bindir}/virt-xml-validate
21492149
%{_bindir}/virt-pki-validate
21502150
%{_bindir}/virt-host-validate
2151-
%{_libdir}/lib*.so.*
2151+
%{_libdir}/libvirt.so.*
2152+
%{_libdir}/libvirt-qemu.so.*
2153+
%{_libdir}/libvirt-lxc.so.*
21522154

21532155
%if %{with_dtrace}
21542156
%{_datadir}/systemtap/tapset/libvirt_probes*.stp
@@ -2205,10 +2207,17 @@ exit 0
22052207
%files devel
22062208
%defattr(-, root, root)
22072209

2208-
%{_libdir}/lib*.so
2210+
%{_libdir}/libvirt.so
2211+
%{_libdir}/libvirt-qemu.so
2212+
%{_libdir}/libvirt-lxc.so
22092213
%dir %{_includedir}/libvirt
2210-
%{_includedir}/libvirt/*.h
2214+
%{_includedir}/libvirt/virterror.h
2215+
%{_includedir}/libvirt/libvirt.h
2216+
%{_includedir}/libvirt/libvirt-qemu.h
2217+
%{_includedir}/libvirt/libvirt-lxc.h
22112218
%{_libdir}/pkgconfig/libvirt.pc
2219+
%{_libdir}/pkgconfig/libvirt-qemu.pc
2220+
%{_libdir}/pkgconfig/libvirt-lxc.pc
22122221

22132222
%dir %{_datadir}/libvirt/api/
22142223
%{_datadir}/libvirt/api/libvirt-api.xml

mingw-libvirt.spec.in

+2
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
195195

196196
%{mingw32_libdir}/libvirt.dll.a
197197
%{mingw32_libdir}/pkgconfig/libvirt.pc
198+
%{mingw32_libdir}/pkgconfig/libvirt-qemu.pc
199+
%{mingw32_libdir}/pkgconfig/libvirt-lxc.pc
198200
%{mingw32_libdir}/libvirt-lxc.dll.a
199201
%{mingw32_libdir}/libvirt-qemu.dll.a
200202

0 commit comments

Comments
 (0)