From nobody Wed Dec 17 04:18:36 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 1526385857995892.2422161003433; Tue, 15 May 2018 05:04:17 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 06AE9C0D18A4; Tue, 15 May 2018 12:04:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B0944608EF; Tue, 15 May 2018 12:04:15 +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 646ED4BB79; Tue, 15 May 2018 12:04:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4FC418X024811 for ; Tue, 15 May 2018 08:04:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 447062024CAB; Tue, 15 May 2018 12:04:01 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE7802024CBA for ; Tue, 15 May 2018 12:04:00 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 15 May 2018 14:03:54 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 8/8] Remove check for gnutls/crypto.h 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 15 May 2018 12:04:17 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Assume its presence for gnutls >=3D 3.2. Check introduced by . Signed-off-by: J=C3=A1n Tomko --- m4/virt-gnutls.m4 | 13 ------------- src/rpc/virnettlscontext.c | 4 +--- src/util/vircrypto.c | 4 +--- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/m4/virt-gnutls.m4 b/m4/virt-gnutls.m4 index f25cfb60f7..426a1a0348 100644 --- a/m4/virt-gnutls.m4 +++ b/m4/virt-gnutls.m4 @@ -27,19 +27,6 @@ AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[ dnl Require gnutls >=3D 3.2.0 because of 3.2.11 in Ubuntu 14.04 dnl That should have all the functions we use (in >=3D 2.12) dnl and also use nettle, because it's >=3D 3.0 - - if test "$with_gnutls" =3D "yes" ; then - OLD_CFLAGS=3D"$CFLAGS" - OLD_LIBS=3D"$LIBS" - CFLAGS=3D"$CFLAGS $GNUTLS_CFLAGS" - LIBS=3D"$LIBS $GNUTLS_LIBS" - AC_CHECK_HEADERS([gnutls/crypto.h], [], [], [[ - #include - ]]) - - CFLAGS=3D"$OLD_CFLAGS" - LIBS=3D"$OLD_LIBS" - fi ]) =20 AC_DEFUN([LIBVIRT_RESULT_GNUTLS],[ diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 2c46aebf31..97b74de89e 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -25,9 +25,7 @@ #include =20 #include -#if HAVE_GNUTLS_CRYPTO_H -# include -#endif +#include #include =20 #include "virnettlscontext.h" diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 2118fdba22..bbc2a01f22 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -28,9 +28,7 @@ =20 #ifdef WITH_GNUTLS # include -# if HAVE_GNUTLS_CRYPTO_H -# include -# endif +# include #endif =20 VIR_LOG_INIT("util.crypto"); --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list