Re: [libvirt] [PATCH 2/6] Always link with libgcrypt
On Fri, Feb 26, 2010 at 02:09:15PM +0100, Wolfgang Mauerer wrote:
... not just when using the remote driver: libvirt.c always depends
on it.
This unbreaks builds with --without-remote
Signed-off-by: Wolfgang Mauerer <wolfgang.mauerer(a)siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com>
---
src/Makefile.am | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
Hmm, I think we also need to make the TLS threads code in libvirt.c
conditional on WITH_REMOTE, since we don't want that compiled at
all if the remote driver isn't present
diff --git a/src/Makefile.am b/src/Makefile.am
index 2051e5d..8f0fd30 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -334,8 +334,11 @@ libvirt_la_LIBADD += libvirt_driver.la
libvirt_driver_la_SOURCES = $(DRIVER_SOURCES)
libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS) \
+ $(GNUTLS_CFLAGS) \
-I@top_srcdir@/src/conf
-libvirt_driver_la_LDFLAGS = $(NUMACTL_LIBS)
+libvirt_driver_la_LDFLAGS = $(NUMACTL_LIBS) \
+ $(GNUTLS_LIBS)
+
USED_SYM_FILES = libvirt_private.syms
@@ -362,11 +365,9 @@ noinst_LTLIBRARIES += libvirt_driver_remote.la
libvirt_la_LIBADD += libvirt_driver_remote.la
endif
libvirt_driver_remote_la_CFLAGS = \
- $(GNUTLS_CFLAGS) \
$(SASL_CFLAGS) \
-I@top_srcdir@/src/conf
libvirt_driver_remote_la_LDFLAGS = \
- $(GNUTLS_LIBS) \
$(SASL_LIBS)
if WITH_DRIVER_MODULES
libvirt_driver_remote_la_LDFLAGS += -module -avoid-version
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|