--- pulseaudio-0.9.15.orig/src/Makefile.am	2009-03-30 15:31:35.000000000 -0700
+++ pulseaudio-0.9.15/src/Makefile.am	2009-04-15 20:30:45.000000000 -0700
@@ -1336,6 +1336,8 @@
 libalsa_util_la_SOURCES += modules/reserve.h modules/reserve.c modules/reserve-wrap.c modules/reserve-wrap.h
 libalsa_util_la_LIBADD += $(DBUS_LIBS)
 libalsa_util_la_CFLAGS += $(DBUS_CFLAGS)
+else
+libalsa_util_la_SOURCES += modules/reserve-wrap.c modules/reserve-wrap.h
 endif
 
 module_alsa_sink_la_SOURCES = modules/alsa/module-alsa-sink.c
--- pulseaudio-0.9.15.orig/src/modules/reserve-wrap.c	2009-04-09 17:03:29.000000000 -0700
+++ pulseaudio-0.9.15/src/modules/reserve-wrap.c	2009-04-15 21:08:27.000000000 -0700
@@ -31,30 +31,38 @@
 #include <pulsecore/core-error.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/shared.h>
+#ifdef HAVE_DBUS
 #include <pulsecore/dbus-shared.h>
 
 #include "reserve.h"
+#endif
 #include "reserve-wrap.h"
 
 struct pa_reserve_wrapper {
     PA_REFCNT_DECLARE;
     pa_core *core;
+#ifdef HAVE_DBUS
     pa_dbus_connection *connection;
-    pa_hook hook;
     struct rd_device *device;
+#endif
+    pa_hook hook;
     char *shared_name;
 };
 
 static void reserve_wrapper_free(pa_reserve_wrapper *r) {
     pa_assert(r);
 
+#ifdef HAVE_DBUS
     if (r->device)
         rd_release(r->device);
+#endif
 
     pa_hook_done(&r->hook);
 
+#ifdef HAVE_DBUS
     if (r->connection)
         pa_dbus_connection_unref(r->connection);
+#endif
 
     if (r->shared_name) {
         pa_assert_se(pa_shared_remove(r->core, r->shared_name) >= 0);
@@ -64,6 +72,7 @@
     pa_xfree(r);
 }
 
+#ifdef HAVE_DBUS
 static int request_cb(rd_device *d, int forced) {
     pa_reserve_wrapper *r;
     int k;
@@ -81,14 +90,19 @@
 
     return k < 0 ? -1 : 1;
 }
+#endif
 
 pa_reserve_wrapper* pa_reserve_wrapper_get(pa_core *c, const char *device_name) {
     pa_reserve_wrapper *r;
+#ifdef HAVE_DBUS
     DBusError error;
+#endif
     int k;
     char *t;
 
+#ifdef HAVE_DBUS
     dbus_error_init(&error);
+#endif
 
     pa_assert(c);
     pa_assert(device_name);
@@ -112,6 +126,7 @@
 
     pa_assert_se(pa_shared_set(c, r->shared_name, r) >= 0);
 
+#ifdef HAVE_DBUS
     if (!(r->connection = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
         pa_log_warn("Unable to contact D-Bus session bus: %s: %s", error.name, error.message);
 
@@ -141,15 +156,18 @@
     pa_log_debug("Successfully acquired reservation lock on device '%s'", device_name);
 
     rd_set_userdata(r->device, r);
+#endif
 
     return r;
 
+#ifdef HAVE_DBUS
 fail:
     dbus_error_free(&error);
 
     reserve_wrapper_free(r);
 
     return NULL;
+#endif
 }
 
 void pa_reserve_wrapper_unref(pa_reserve_wrapper *r) {
@@ -173,5 +191,7 @@
     pa_assert(r);
     pa_assert(PA_REFCNT_VALUE(r) >= 1);
 
+#ifdef HAVE_DBUS
     rd_set_application_device_name(r->device, name);
+#endif
 }
