Now that GnuTLS is required these source files must be compiled in. Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- 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 - if WITH_SSH2 USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms else ! WITH_SSH2 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 \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 1ce3dbb50f..99c79e3208 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -227,10 +227,9 @@ test_programs += \ virnetsockettest \ virnetdaemontest \ virnetserverclienttest \ + virnettlscontexttest \ + virnettlssessiontest \ $(NULL) -if WITH_GNUTLS -test_programs += virnettlscontexttest virnettlssessiontest -endif WITH_GNUTLS endif WITH_REMOTE if WITH_LINUX @@ -1027,7 +1026,6 @@ virnetserverclientmock_la_SOURCES = \ virnetserverclientmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virnetserverclientmock_la_LIBADD = $(MOCKLIBS_LIBS) -if WITH_GNUTLS virnettlscontexttest_SOURCES = \ virnettlscontexttest.c \ virnettlshelpers.h virnettlshelpers.c \ @@ -1046,12 +1044,6 @@ virnettlssessiontest_LDADD += -ltasn1 else ! HAVE_LIBTASN1 EXTRA_DIST += pkix_asn1_tab.c endif ! HAVE_LIBTASN1 -else ! WITH_GNUTLS -EXTRA_DIST += \ - virnettlscontexttest.c virnettlssessiontest.c \ - virnettlshelpers.h virnettlshelpers.c \ - testutils.h testutils.c pkix_asn1_tab.c -endif ! WITH_GNUTLS virtimetest_SOURCES = \ virtimetest.c testutils.h testutils.c -- 2.16.4 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
