Re: [libvirt] [PATCH 2/3] build: Build gnutls related sources unconditionally
On Tue, Jun 05, 2018 at 10:45:56AM +0200, Michal Privoznik wrote:
Now that GnuTLS is required these source files must be compiled
in.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/Makefile.am | 7 +------
src/rpc/Makefile.inc.am | 14 ++------------
tests/Makefile.am | 12 ++----------
3 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index b2db1e9db9..b0e2171eea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -440,6 +440,7 @@ EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl
#
USED_SYM_FILES += $(srcdir)/libvirt_driver_modules.syms
+USED_SYM_FILES += $(srcdir)/libvirt_gnutls.syms
if WITH_LINUX
USED_SYM_FILES += $(srcdir)/libvirt_linux.syms
@@ -453,12 +454,6 @@ else ! WITH_SASL
SYM_FILES += $(srcdir)/libvirt_sasl.syms
endif ! WITH_SASL
-if WITH_GNUTLS
-USED_SYM_FILES += $(srcdir)/libvirt_gnutls.syms
-else ! WITH_GNUTLS
-SYM_FILES += $(srcdir)/libvirt_gnutls.syms
-endif ! WITH_GNUTLS
The libvirt_gnutls.syms file only exists because gnutls was
optional, so shouldn't this just get merged into libvirt_private.syms
or libvirt_rpc.syms as appropriate ?
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|