From nobody Wed May 14 13:02:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522278659034189.0537495454971; Wed, 28 Mar 2018 16:10:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5CE7E12E384; Wed, 28 Mar 2018 23:10:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C80E5D755; Wed, 28 Mar 2018 23:10:27 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EA7A6180BAD8; Wed, 28 Mar 2018 23:10:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2SNA7Am023941 for ; Wed, 28 Mar 2018 19:10:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id A94117C33; Wed, 28 Mar 2018 23:10:07 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 500B98442B for ; Wed, 28 Mar 2018 23:10:07 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 29 Mar 2018 01:09:52 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/9] configure: rename LIBVIRT_*_YAJL to LIBVIRT_*_JSON X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 28 Mar 2018 23:10:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 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=C3=A1n Tomko --- configure.ac | 9 ++++++--- m4/{virt-yajl.m4 =3D> virt-json.m4} | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) rename m4/{virt-yajl.m4 =3D> 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 =20 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 =20 AC_CHECK_SIZEOF([long]) =20 @@ -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 . dnl =20 -AC_DEFUN([LIBVIRT_ARG_YAJL],[ +AC_DEFUN([LIBVIRT_ARG_JSON],[ LIBVIRT_ARG_WITH_FEATURE([YAJL], [yajl], [check]) ]) =20 -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" =3D 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]) ]) =20 -AC_DEFUN([LIBVIRT_RESULT_YAJL],[ +AC_DEFUN([LIBVIRT_RESULT_JSON],[ LIBVIRT_RESULT_LIB([YAJL]) ]) --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list