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> --- src/admin/Makefile.inc.am | 6 ++++++ src/locking/Makefile.inc.am | 12 ++++++++++++ src/logging/Makefile.inc.am | 6 ++++++ src/remote/Makefile.inc.am | 6 ++++++ src/rpc/Makefile.inc.am | 6 ++++++ 5 files changed, 36 insertions(+) diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 55d721f0bf..19afb0e179 100644 --- 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 6de7f7bab8..5d5e923769 100644 --- 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 a4739b2d44..3f4a87d91a 100644 --- 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 dccecf8cd3..13a1f9f8f2 100644 --- 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 b8c80528d2..722ef64db1 100644 --- 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 -- 2.20.1

Since commit 4e75b0a00fb4 we support SASL 2.1.26 and newer releases only, all of which ship a .pc file. Using pkg-config allows FreeBSD builds to pick up the dependency automatically. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- m4/virt-sasl.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-sasl.m4 b/m4/virt-sasl.m4 index 7ab9b2c368..674e169350 100644 --- a/m4/virt-sasl.m4 +++ b/m4/virt-sasl.m4 @@ -22,7 +22,7 @@ AC_DEFUN([LIBVIRT_ARG_SASL],[ ]) AC_DEFUN([LIBVIRT_CHECK_SASL],[ - LIBVIRT_CHECK_LIB([SASL], [sasl2], [sasl_client_init], [sasl/sasl.h]) + LIBVIRT_CHECK_PKG([SASL], [libsasl2], [2.1.26]) ]) AC_DEFUN([LIBVIRT_RESULT_SASL],[ -- 2.20.1