mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-12-16 08:56:40 -05:00
Enable D-Bus if Bluez or HAL are enabled; use DBUS_LIBS/DBUS_CFLAGS when building libdbus-util.la.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2076 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
ec91380f5c
commit
19ee3b6e3f
2 changed files with 3 additions and 3 deletions
|
|
@ -836,7 +836,7 @@ if test "x$HAVE_HAL" = x1 ; then
|
||||||
dbus=yes
|
dbus=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x${dbus}" != xno ; then
|
if test "x${dbus}" != xno || test "x${bluez}" != xno || "x${hal}" != xno ; then
|
||||||
|
|
||||||
PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.0.0 ],
|
PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.0.0 ],
|
||||||
[
|
[
|
||||||
|
|
|
||||||
|
|
@ -1424,8 +1424,8 @@ module_jack_source_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
|
||||||
# HAL
|
# HAL
|
||||||
libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h
|
libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h
|
||||||
libdbus_util_la_LDFLAGS = -avoid-version
|
libdbus_util_la_LDFLAGS = -avoid-version
|
||||||
libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la
|
libdbus_util_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la
|
||||||
libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS)
|
libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
|
||||||
|
|
||||||
module_hal_detect_la_SOURCES = modules/module-hal-detect.c
|
module_hal_detect_la_SOURCES = modules/module-hal-detect.c
|
||||||
module_hal_detect_la_LDFLAGS = -module -avoid-version
|
module_hal_detect_la_LDFLAGS = -module -avoid-version
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue