External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Revert "src: Move DLOPEN_LIBS to libraries introducing the dependency"

Browse Source 
This reverts commit 5d40272ea67c74049600e120095d1b42287ed2d2.

Jansson cannot parse QEMU's quirky JSON.
Revert back to yajl.

https://bugzilla.redhat.com/show_bug.cgi?id=1614569

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Ján Tomko 2018-08-13 13:37:53 +02:00
parent b88fce05ff
commit 9c3dad5677
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -752,7 +752,6 @@ libvirt_setuid_rpc_client_la_CFLAGS = \
$(AM_CFLAGS) \ $(AM_CFLAGS) \
$(SECDRIVER_CFLAGS) \ $(SECDRIVER_CFLAGS) \
$(XDR_CFLAGS) \ $(XDR_CFLAGS) \
$(DLOPEN_LIBS) \
$(NULL) $(NULL)
endif WITH_SETUID_RPC_CLIENT endif WITH_SETUID_RPC_CLIENT
@ -1001,7 +1000,6 @@ libvirt_nss_la_CFLAGS = \
$(NULL) $(NULL)
libvirt_nss_la_LDFLAGS = \ libvirt_nss_la_LDFLAGS = \
$(AM_LDFLAGS) \ $(AM_LDFLAGS) \
$(DLOPEN_LIBS) \
$(NULL) $(NULL)
endif WITH_NSS endif WITH_NSS

1
src/util/Makefile.inc.am
View File

@ -278,7 +278,6 @@ libvirt_util_la_LIBADD = \
$(NUMACTL_LIBS) \ $(NUMACTL_LIBS) \
$(ACL_LIBS) \ $(ACL_LIBS) \
$(GNUTLS_LIBS) \ $(GNUTLS_LIBS) \
$(DLOPEN_LIBS) \
$(NULL) $(NULL)

4
tools/Makefile.am
View File

@ -528,7 +528,7 @@ nss_libnss_libvirt_impl_la_CFLAGS = \
nss_libnss_libvirt_impl_la_LIBADD = \ nss_libnss_libvirt_impl_la_LIBADD = \
../gnulib/lib/libgnu.la \ ../gnulib/lib/libgnu.la \
../src/libvirt-nss.la \ ../src/libvirt-nss.la \
$(NULL) $(DLOPEN_LIBS)
nss_libnss_libvirt_la_SOURCES = nss_libnss_libvirt_la_SOURCES =
nss_libnss_libvirt_la_LDFLAGS = \ nss_libnss_libvirt_la_LDFLAGS = \
@ -556,7 +556,7 @@ nss_libnss_libvirt_guest_impl_la_CFLAGS = \
nss_libnss_libvirt_guest_impl_la_LIBADD = \ nss_libnss_libvirt_guest_impl_la_LIBADD = \
../gnulib/lib/libgnu.la \ ../gnulib/lib/libgnu.la \
../src/libvirt-nss.la \ ../src/libvirt-nss.la \
$(NULL) $(DLOPEN_LIBS)
nss_libnss_libvirt_guest_la_SOURCES = nss_libnss_libvirt_guest_la_SOURCES =
nss_libnss_libvirt_guest_la_LDFLAGS = \ nss_libnss_libvirt_guest_la_LDFLAGS = \