NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Michal Privoznik 2018-06-05 13:35:56 +02:00
parent 60d9ad6f1e
commit 4f15e75a9a
3 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libvirt_gnutls.syms
View File

@ -25,23 +25,6 @@ virNetServerServiceGetTLSContext;
virNetSocketSetTLSSession; 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 # Let emacs know we want case-insensitive sorting
# Local Variables: # Local Variables:
# sort-fold-case: t # sort-fold-case: t

17
src/libvirt_remote.syms
View File

@ -257,6 +257,23 @@ virNetSocketUpdateIOCallback;
virNetSocketWrite; 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 # Let emacs know we want case-insensitive sorting
# Local Variables: # Local Variables:
# sort-fold-case: t # sort-fold-case: t

14
src/rpc/Makefile.inc.am
View File

@ -31,6 +31,8 @@ libvirt_la_BUILT_LIBADD += \
libvirt_net_rpc_la_SOURCES = \ libvirt_net_rpc_la_SOURCES = \
rpc/virnetmessage.h \ rpc/virnetmessage.h \
rpc/virnetmessage.c \ rpc/virnetmessage.c \
rpc/virnettlscontext.h \
rpc/virnettlscontext.c \
rpc/virnetsocket.h \ rpc/virnetsocket.h \
rpc/virnetsocket.c \ rpc/virnetsocket.c \
rpc/virkeepalive.h \ rpc/virkeepalive.h \
@ -50,18 +52,6 @@ EXTRA_DIST += \
$(NULL) $(NULL)
endif ! WITH_SSH2 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 if WITH_SASL
libvirt_net_rpc_la_SOURCES += \ libvirt_net_rpc_la_SOURCES += \
rpc/virnetsaslcontext.h \ rpc/virnetsaslcontext.h \