提交 4637048f 编写于 作者: A Andrea Bolognani

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: NAndrea Bolognani <abologna@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 65b08aff
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册