From 19ee3b6e3f349fc3d9c052ae4219f599c2753eb1 Mon Sep 17 00:00:00 2001
From: Diego Petteno <flameeyes@gmail.com>
Date: Fri, 23 Nov 2007 16:17:16 +0000
Subject: 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
---
 configure.ac    | 2 +-
 src/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 441f8d65..19660f0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -836,7 +836,7 @@ if test "x$HAVE_HAL" = x1 ; then
    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 ],
         [
diff --git a/src/Makefile.am b/src/Makefile.am
index 2d710d41..dc3ba4f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1424,8 +1424,8 @@ module_jack_source_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
 # 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
-- 
cgit