[libvirt] [PATCH 2/6] Always link with libgcrypt

Wolfgang Mauerer wolfgang.mauerer at siemens.com
Fri Feb 26 13:09:15 UTC 2010


... 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 at siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
---
 src/Makefile.am |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

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 at 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 at 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
-- 
1.6.4




More information about the libvir-list mailing list