mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-12 13:30:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge r2076 from trunk

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2141 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-27 21:22:29 +00:00
parent aceb80043f
commit 5e1324981f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -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 ],
[ [

4
src/Makefile.am
View file

@ -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