Rename the top-level functions that deal with yajl to prepare
for the possibility of a different JSON library.
Introduce a separate JSON libraries section in the configure summary
and rename the m4 file to virt-json.m4.
Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
configure.ac | 9 ++++++---
m4/{virt-yajl.m4 => virt-json.m4} | 8 ++++----
2 files changed, 10 insertions(+), 7 deletions(-)
rename m4/{virt-yajl.m4 => virt-json.m4} (94%)
diff --git a/configure.ac b/configure.ac
index 115eb6088..bef10c0fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,6 +253,7 @@ LIBVIRT_ARG_FUSE
LIBVIRT_ARG_GLUSTER
LIBVIRT_ARG_GNUTLS
LIBVIRT_ARG_HAL
+LIBVIRT_ARG_JSON
LIBVIRT_ARG_LIBPCAP
LIBVIRT_ARG_LIBSSH
LIBVIRT_ARG_LIBXML
@@ -272,7 +273,6 @@ LIBVIRT_ARG_SSH2
LIBVIRT_ARG_UDEV
LIBVIRT_ARG_VIRTUALPORT
LIBVIRT_ARG_WIRESHARK
-LIBVIRT_ARG_YAJL
LIBVIRT_CHECK_ACL
LIBVIRT_CHECK_APPARMOR
@@ -292,6 +292,7 @@ LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_GNUTLS
LIBVIRT_CHECK_HAL
+LIBVIRT_CHECK_JSON
LIBVIRT_CHECK_LIBNL
LIBVIRT_CHECK_LIBPARTED
LIBVIRT_CHECK_LIBPCAP
@@ -315,7 +316,6 @@ LIBVIRT_CHECK_UDEV
LIBVIRT_CHECK_VIRTUALPORT
LIBVIRT_CHECK_WIRESHARK
LIBVIRT_CHECK_XDR
-LIBVIRT_CHECK_YAJL
AC_CHECK_SIZEOF([long])
@@ -1011,7 +1011,10 @@ LIBVIRT_RESULT_VIRTUALPORT
LIBVIRT_RESULT_XDR
LIBVIRT_RESULT_XEN
LIBVIRT_RESULT_XENAPI
-LIBVIRT_RESULT_YAJL
+AC_MSG_NOTICE([])
+AC_MSG_NOTICE([JSON libraries])
+AC_MSG_NOTICE([])
+LIBVIRT_RESULT_JSON
AC_MSG_NOTICE([])
AC_MSG_NOTICE([Windows])
AC_MSG_NOTICE([])
diff --git a/m4/virt-yajl.m4 b/m4/virt-json.m4
similarity index 94%
rename from m4/virt-yajl.m4
rename to m4/virt-json.m4
index c4ea0102a..1179ff5bb 100644
--- a/m4/virt-yajl.m4
+++ b/m4/virt-json.m4
@@ -1,4 +1,4 @@
-dnl The libyajl.so library
+dnl The JSON libraries
dnl
dnl Copyright (C) 2012-2013 Red Hat, Inc.
dnl
@@ -17,11 +17,11 @@ dnl License along with this library. If not, see
dnl <http://www.gnu.org/licenses/>.
dnl
-AC_DEFUN([LIBVIRT_ARG_YAJL],[
+AC_DEFUN([LIBVIRT_ARG_JSON],[
LIBVIRT_ARG_WITH_FEATURE([YAJL], [yajl], [check])
])
-AC_DEFUN([LIBVIRT_CHECK_YAJL],[
+AC_DEFUN([LIBVIRT_CHECK_JSON],[
dnl YAJL JSON library http://lloyd.github.com/yajl/
if test "$with_qemu:$with_yajl" = yes:check; then
dnl Some versions of qemu require the use of yajl; try to detect them
@@ -50,6 +50,6 @@ AC_DEFUN([LIBVIRT_CHECK_YAJL],[
[yajl_tree_parse], [yajl/yajl_common.h])
])
-AC_DEFUN([LIBVIRT_RESULT_YAJL],[
+AC_DEFUN([LIBVIRT_RESULT_JSON],[
LIBVIRT_RESULT_LIB([YAJL])
])
--
2.16.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
