提交 9c3dad56 编写于 作者: J Ján Tomko

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

This reverts commit 5d40272e.

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

https://bugzilla.redhat.com/show_bug.cgi?id=1614569Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 b88fce05
...@@ -752,7 +752,6 @@ libvirt_setuid_rpc_client_la_CFLAGS = \ ...@@ -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 = \ ...@@ -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
......
...@@ -278,7 +278,6 @@ libvirt_util_la_LIBADD = \ ...@@ -278,7 +278,6 @@ libvirt_util_la_LIBADD = \
$(NUMACTL_LIBS) \ $(NUMACTL_LIBS) \
$(ACL_LIBS) \ $(ACL_LIBS) \
$(GNUTLS_LIBS) \ $(GNUTLS_LIBS) \
$(DLOPEN_LIBS) \
$(NULL) $(NULL)
......
...@@ -528,7 +528,7 @@ nss_libnss_libvirt_impl_la_CFLAGS = \ ...@@ -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 = \ ...@@ -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 = \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册