From 9c3dad5677883c9d1208173c054ab6d79864c31d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 13 Aug 2018 13:37:53 +0200 Subject: [PATCH] Revert "src: Move DLOPEN_LIBS to libraries introducing the dependency" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Daniel P. Berrangé --- src/Makefile.am | 2 -- src/util/Makefile.inc.am | 1 - tools/Makefile.am | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 61876cf382..a4f213480e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -752,7 +752,6 @@ libvirt_setuid_rpc_client_la_CFLAGS = \ $(AM_CFLAGS) \ $(SECDRIVER_CFLAGS) \ $(XDR_CFLAGS) \ - $(DLOPEN_LIBS) \ $(NULL) endif WITH_SETUID_RPC_CLIENT @@ -1001,7 +1000,6 @@ libvirt_nss_la_CFLAGS = \ $(NULL) libvirt_nss_la_LDFLAGS = \ $(AM_LDFLAGS) \ - $(DLOPEN_LIBS) \ $(NULL) endif WITH_NSS diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index c5c50f1844..8ef9ee1dfa 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -278,7 +278,6 @@ libvirt_util_la_LIBADD = \ $(NUMACTL_LIBS) \ $(ACL_LIBS) \ $(GNUTLS_LIBS) \ - $(DLOPEN_LIBS) \ $(NULL) diff --git a/tools/Makefile.am b/tools/Makefile.am index 3e129c04c4..26c887649e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -528,7 +528,7 @@ nss_libnss_libvirt_impl_la_CFLAGS = \ nss_libnss_libvirt_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ ../src/libvirt-nss.la \ - $(NULL) + $(DLOPEN_LIBS) nss_libnss_libvirt_la_SOURCES = nss_libnss_libvirt_la_LDFLAGS = \ @@ -556,7 +556,7 @@ nss_libnss_libvirt_guest_impl_la_CFLAGS = \ nss_libnss_libvirt_guest_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ ../src/libvirt-nss.la \ - $(NULL) + $(DLOPEN_LIBS) nss_libnss_libvirt_guest_la_SOURCES = nss_libnss_libvirt_guest_la_LDFLAGS = \ -- GitLab