External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

src: Include SASL_CFLAGS where appropriate

Browse Source 
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>
This commit is contained in:
Andrea Bolognani 2019-04-11 17:58:24 +02:00
parent 65b08aff08
commit 4637048f8d
5 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/admin/Makefile.inc.am
View File

@ -32,6 +32,12 @@ libvirt_driver_admin_la_CFLAGS = \
libvirt_driver_admin_la_LIBADD = ../gnulib/lib/libgnu.la libvirt_driver_admin_la_LIBADD = ../gnulib/lib/libgnu.la
libvirt_driver_admin_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) 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 # admin/admin_remote.c is being included in libvirt-admin.c, so we
# need to include it in the dist # need to include it in the dist
EXTRA_DIST += admin/admin_remote.c EXTRA_DIST += admin/admin_remote.c

12
src/locking/Makefile.inc.am
View File

@ -105,6 +105,12 @@ if WITH_DTRACE_PROBES
lockd_la_LIBADD += libvirt_probes.lo lockd_la_LIBADD += libvirt_probes.lo
endif WITH_DTRACE_PROBES endif WITH_DTRACE_PROBES
if WITH_SASL
lockd_la_CFLAGS += \
$(SASL_CFLAGS) \
$(NULL)
endif WITH_SASL
if WITH_QEMU if WITH_QEMU
augeastest_DATA += test_libvirt_lockd.aug augeastest_DATA += test_libvirt_lockd.aug
CLEANFILES += test_libvirt_lockd.aug CLEANFILES += test_libvirt_lockd.aug
@ -148,6 +154,12 @@ if WITH_DTRACE_PROBES
virtlockd_LDADD += libvirt_probes.lo virtlockd_LDADD += libvirt_probes.lo
endif WITH_DTRACE_PROBES endif WITH_DTRACE_PROBES
if WITH_SASL
virtlockd_CFLAGS += \
$(SASL_CFLAGS) \
$(NULL)
endif WITH_SASL
if WITH_SANLOCK if WITH_SANLOCK
lockdriver_LTLIBRARIES += sanlock.la lockdriver_LTLIBRARIES += sanlock.la
sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES) sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES)

6
src/logging/Makefile.inc.am
View File

@ -88,6 +88,12 @@ if WITH_DTRACE_PROBES
virtlogd_LDADD += libvirt_probes.lo virtlogd_LDADD += libvirt_probes.lo
endif WITH_DTRACE_PROBES endif WITH_DTRACE_PROBES
if WITH_SASL
virtlogd_CFLAGS += \
$(SASL_CFLAGS) \
$(NULL)
endif WITH_SASL
conf_DATA += logging/virtlogd.conf conf_DATA += logging/virtlogd.conf
augeas_DATA += logging/virtlogd.aug augeas_DATA += logging/virtlogd.aug

6
src/remote/Makefile.inc.am
View File

@ -99,6 +99,12 @@ libvirt_driver_remote_la_CFLAGS = \
libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS)
libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES) 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 endif WITH_REMOTE
if WITH_REMOTE if WITH_REMOTE

6
src/rpc/Makefile.inc.am
View File

@ -135,3 +135,9 @@ libvirt_net_rpc_client_la_CFLAGS = \
$(NULL) $(NULL)
libvirt_net_rpc_client_la_LDFLAGS = $(AM_LDFLAGS) libvirt_net_rpc_client_la_LDFLAGS = $(AM_LDFLAGS)
libvirt_net_rpc_client_la_LIBADD = $(CYGWIN_EXTRA_LIBADD) libvirt_net_rpc_client_la_LIBADD = $(CYGWIN_EXTRA_LIBADD)
if WITH_SASL
libvirt_net_rpc_client_la_CFLAGS += \
$(SASL_CFLAGS) \
$(NULL)
endif WITH_SASL