From 918ae02a60af28875876fbea649870ced686412c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 13 Aug 2018 13:38:28 +0200 Subject: [PATCH 02/16] Revert "Fix link errors in tools/nss and tests" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b3d9b08ef797e569b14cfa42d3dceba23c2a5b14. 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é --- tools/Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 26c887649e..1452d984a0 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -527,8 +527,7 @@ nss_libnss_libvirt_impl_la_CFLAGS = \ nss_libnss_libvirt_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ - ../src/libvirt-nss.la \ - $(DLOPEN_LIBS) + ../src/libvirt-nss.la nss_libnss_libvirt_la_SOURCES = nss_libnss_libvirt_la_LDFLAGS = \ @@ -555,8 +554,7 @@ nss_libnss_libvirt_guest_impl_la_CFLAGS = \ nss_libnss_libvirt_guest_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ - ../src/libvirt-nss.la \ - $(DLOPEN_LIBS) + ../src/libvirt-nss.la nss_libnss_libvirt_guest_la_SOURCES = nss_libnss_libvirt_guest_la_LDFLAGS = \ -- 2.18.0