From 4f15e75a9abe7b01157a767255ee69135a527824 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 5 Jun 2018 13:35:56 +0200
Subject: [PATCH] src: Always build virnettlscontext into libvirt-net-rpc.la
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since GnuTLS is required there is no way to go with !WITH_GNUTLS
branch and just distribute these files.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/libvirt_gnutls.syms | 17 -----------------
 src/libvirt_remote.syms | 17 +++++++++++++++++
 src/rpc/Makefile.inc.am | 14 ++------------
 3 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/src/libvirt_gnutls.syms b/src/libvirt_gnutls.syms
index 6eb674101f..1adf3af164 100644
--- a/src/libvirt_gnutls.syms
+++ b/src/libvirt_gnutls.syms
@@ -25,23 +25,6 @@ virNetServerServiceGetTLSContext;
 virNetSocketSetTLSSession;
 
 
-# rpc/virnettlscontext.h
-virNetTLSContextCheckCertificate;
-virNetTLSContextNewClient;
-virNetTLSContextNewClientPath;
-virNetTLSContextNewServer;
-virNetTLSContextNewServerPath;
-virNetTLSInit;
-virNetTLSSessionGetHandshakeStatus;
-virNetTLSSessionGetKeySize;
-virNetTLSSessionGetX509DName;
-virNetTLSSessionHandshake;
-virNetTLSSessionNew;
-virNetTLSSessionRead;
-virNetTLSSessionSetIOCallbacks;
-virNetTLSSessionWrite;
-
-
 # Let emacs know we want case-insensitive sorting
 # Local Variables:
 # sort-fold-case: t
diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index 97e22275b9..cab93ab27f 100644
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -257,6 +257,23 @@ virNetSocketUpdateIOCallback;
 virNetSocketWrite;
 
 
+# rpc/virnettlscontext.h
+virNetTLSContextCheckCertificate;
+virNetTLSContextNewClient;
+virNetTLSContextNewClientPath;
+virNetTLSContextNewServer;
+virNetTLSContextNewServerPath;
+virNetTLSInit;
+virNetTLSSessionGetHandshakeStatus;
+virNetTLSSessionGetKeySize;
+virNetTLSSessionGetX509DName;
+virNetTLSSessionHandshake;
+virNetTLSSessionNew;
+virNetTLSSessionRead;
+virNetTLSSessionSetIOCallbacks;
+virNetTLSSessionWrite;
+
+
 # Let emacs know we want case-insensitive sorting
 # Local Variables:
 # sort-fold-case: t
diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am
index 14c798d05d..b8c80528d2 100644
--- a/src/rpc/Makefile.inc.am
+++ b/src/rpc/Makefile.inc.am
@@ -31,6 +31,8 @@ libvirt_la_BUILT_LIBADD += \
 libvirt_net_rpc_la_SOURCES = \
 	rpc/virnetmessage.h \
 	rpc/virnetmessage.c \
+	rpc/virnettlscontext.h \
+	rpc/virnettlscontext.c \
 	rpc/virnetsocket.h \
 	rpc/virnetsocket.c \
 	rpc/virkeepalive.h \
@@ -50,18 +52,6 @@ EXTRA_DIST += \
 	$(NULL)
 endif ! WITH_SSH2
 
-if WITH_GNUTLS
-libvirt_net_rpc_la_SOURCES += \
-	rpc/virnettlscontext.h \
-	rpc/virnettlscontext.c \
-	$(NULL)
-else ! WITH_GNUTLS
-EXTRA_DIST += \
-	rpc/virnettlscontext.h \
-	rpc/virnettlscontext.c \
-	$(NULL)
-endif ! WITH_GNUTLS
-
 if WITH_SASL
 libvirt_net_rpc_la_SOURCES += \
 	rpc/virnetsaslcontext.h \