src: Always build virnettlscontext into libvirt-net-rpc.la

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>

diff --git a/src/libvirt_gnutls.syms b/src/libvirt_gnutls.syms
index 6eb674101fb2fbaf0fa631b6513e0f2af165b528..1adf3af16460b45dfa6e4ddc5882eb1c2e3511cd 100644 (file)
--- 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 97e22275b980ede98983e237ffeb784132b63be7..cab93ab27f52ff6d863b5a6ab5d05e30b3e5b8de 100644 (file)
--- 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 14c798d05d8f3e37cba9b28d7e819621977525c3..b8c80528d29a14a5a62c3339d207ac0ce6ecea0d 100644 (file)
--- 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 \