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

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>

diff --git a/src/Makefile.am b/src/Makefile.am
index 61876cf38215fcef1a810655544c24d899455b38..a4f213480e26ba88904a6e06d5996d62fead2fe2 100644 (file)
--- 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 c5c50f1844ad315c9441141bbd651981e82aece1..8ef9ee1dfa868a351dcbd433e1bb3d8741fe974a 100644 (file)
--- 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 3e129c04c40453757c87cf5c4007c6205f848eb1..26c887649e2f1d9f63ffc769c8256f8efadaebdb 100644 (file)
--- 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 = \