[pulseaudio-commits] r2141 - in /branches/prepare-0.9.10: configure.ac src/Makefile.am

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Thu Mar 27 22:22:29 2008
New Revision: 2141

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2141&root=pulseaudio&view=rev
Log:
merge r2076 from trunk

Modified:
    branches/prepare-0.9.10/configure.ac
    branches/prepare-0.9.10/src/Makefile.am

Modified: branches/prepare-0.9.10/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/prepare-0.9.10/configure.ac?rev=2141&root=pulseaudio&r1=2140&r2=2141&view=diff
==============================================================================
--- branches/prepare-0.9.10/configure.ac (original)
+++ branches/prepare-0.9.10/configure.ac Thu Mar 27 22:22:29 2008
@@ -836,7 +836,7 @@
    dbus=yes
 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 ],
         [

Modified: branches/prepare-0.9.10/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/prepare-0.9.10/src/Makefile.am?rev=2141&root=pulseaudio&r1=2140&r2=2141&view=diff
==============================================================================
--- branches/prepare-0.9.10/src/Makefile.am (original)
+++ branches/prepare-0.9.10/src/Makefile.am Thu Mar 27 22:22:29 2008
@@ -1424,8 +1424,8 @@
 # HAL
 libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h
 libdbus_util_la_LDFLAGS = -avoid-version
-libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la
-libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS)
+libdbus_util_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la
+libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
 module_hal_detect_la_SOURCES = modules/module-hal-detect.c
 module_hal_detect_la_LDFLAGS = -module -avoid-version