src: Include SASL_CFLAGS where appropriate

A bunch of files include src/rpc/virnetsaslcontext.h, which
in turn includes <sasl/sasl.h>, and without the corresponding
CFLAGS the compiler can't locate the latter if it happens to
be installed outside of the default include path as is the
case, for example, on FreeBSD.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am
index 55d721f0bf4800b84b67bfe9c45016260f92cb20..19afb0e179e5340e6704d949a7d5f7b90d76f683 100644 (file)
--- a/src/admin/Makefile.inc.am
+++ b/src/admin/Makefile.inc.am
@@ -32,6 +32,12 @@ libvirt_driver_admin_la_CFLAGS = \
 libvirt_driver_admin_la_LIBADD = ../gnulib/lib/libgnu.la
 libvirt_driver_admin_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
 
+if WITH_SASL
+libvirt_driver_admin_la_CFLAGS += \
+       $(SASL_CFLAGS) \
+       $(NULL)
+endif WITH_SASL
+
 # admin/admin_remote.c is being included in libvirt-admin.c, so we
 # need to include it in the dist
 EXTRA_DIST += admin/admin_remote.c

diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 6de7f7bab873edfa79ec0552df61c5eb848fe1ba..5d5e92376947e5ce44194f3202e5fb54cfad2747 100644 (file)
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -105,6 +105,12 @@ if WITH_DTRACE_PROBES
 lockd_la_LIBADD += libvirt_probes.lo
 endif WITH_DTRACE_PROBES
 
+if WITH_SASL
+lockd_la_CFLAGS += \
+       $(SASL_CFLAGS) \
+       $(NULL)
+endif WITH_SASL
+
 if WITH_QEMU
 augeastest_DATA += test_libvirt_lockd.aug
 CLEANFILES += test_libvirt_lockd.aug
@@ -148,6 +154,12 @@ if WITH_DTRACE_PROBES
 virtlockd_LDADD += libvirt_probes.lo
 endif WITH_DTRACE_PROBES
 
+if WITH_SASL
+virtlockd_CFLAGS += \
+       $(SASL_CFLAGS) \
+       $(NULL)
+endif WITH_SASL
+
 if WITH_SANLOCK
 lockdriver_LTLIBRARIES += sanlock.la
 sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES)

diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index a4739b2d44369b5d4023e7573f94bc31c2134df4..3f4a87d91a68b31554fa44a28b6a7df394ba27f1 100644 (file)
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -88,6 +88,12 @@ if WITH_DTRACE_PROBES
 virtlogd_LDADD += libvirt_probes.lo
 endif WITH_DTRACE_PROBES
 
+if WITH_SASL
+virtlogd_CFLAGS += \
+       $(SASL_CFLAGS) \
+       $(NULL)
+endif WITH_SASL
+
 conf_DATA += logging/virtlogd.conf
 
 augeas_DATA += logging/virtlogd.aug

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index dccecf8cd31775a8739876b015a55ff1e14e275d..13a1f9f8f2f136691b4e2e82cb7d5c2c052263dc 100644 (file)
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -99,6 +99,12 @@ libvirt_driver_remote_la_CFLAGS = \
 libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES)
 
+if WITH_SASL
+libvirt_driver_remote_la_CFLAGS += \
+       $(SASL_CFLAGS) \
+       $(NULL)
+endif WITH_SASL
+
 endif WITH_REMOTE
 
 if WITH_REMOTE

diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am
index b8c80528d29a14a5a62c3339d207ac0ce6ecea0d..722ef64db1eaf392c0d118525a6c0beb8fb5e76d 100644 (file)
--- a/src/rpc/Makefile.inc.am
+++ b/src/rpc/Makefile.inc.am
@@ -135,3 +135,9 @@ libvirt_net_rpc_client_la_CFLAGS = \
        $(NULL)
 libvirt_net_rpc_client_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_net_rpc_client_la_LIBADD = $(CYGWIN_EXTRA_LIBADD)
+
+if WITH_SASL
+libvirt_net_rpc_client_la_CFLAGS += \
+       $(SASL_CFLAGS) \
+       $(NULL)
+endif WITH_SASL