diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/daemon/main.c | 8 | ||||
| -rw-r--r-- | src/modules/dbus-util.c | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 7c8f3888..cb68f57b 100644 --- a/configure.ac +++ b/configure.ac @@ -769,7 +769,7 @@ if test "x${dbus}" != xno ; then LIBS="$LIBS $DBUS_LIBS" AC_CHECK_FUNCS(dbus_watch_get_unix_fd) LIBS="$saved_LIBS" - + AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.]) ], [ HAVE_DBUS=0 diff --git a/src/Makefile.am b/src/Makefile.am index 52fa4b84..a04a91a8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -135,10 +135,9 @@ pulseaudio_SOURCES = \ daemon/main.c \ pulsecore/gccmacro.h -pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) +pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(LIBOIL_CFLAGS) $(DBUS_CFLAGS) pulseaudio_CPPFLAGS = $(AM_CPPFLAGS) -pulseaudio_LDADD = $(AM_LDADD) libpulsecore.la $(LIBLTDL) \ - $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS) +pulseaudio_LDADD = $(AM_LDADD) libpulsecore.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS) $(DBUS_LIBS) # This is needed because automake doesn't properly expand the foreach below pulseaudio_DEPENDENCIES = libpulsecore.la $(PREOPEN_LIBS) diff --git a/src/daemon/main.c b/src/daemon/main.c index 93d4eb6b..e01bb231 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -58,6 +58,10 @@ #include <tcpd.h> #endif +#ifdef HAVE_DBUS +#include <dbus/dbus.h> +#endif + #include <pulse/mainloop.h> #include <pulse/mainloop-signal.h> #include <pulse/timeval.h> @@ -745,5 +749,9 @@ finish: libtool_done(); +#ifdef HAVE_DBUS + dbus_shutdown(); +#endif + return retval; } diff --git a/src/modules/dbus-util.c b/src/modules/dbus-util.c index 9078ec72..ccc658b7 100644 --- a/src/modules/dbus-util.c +++ b/src/modules/dbus-util.c @@ -26,10 +26,10 @@ #include <config.h> #endif -#include <pulsecore/log.h> -#include <pulsecore/props.h> #include <pulse/xmalloc.h> #include <pulse/timeval.h> +#include <pulsecore/log.h> +#include <pulsecore/props.h> #include "dbus-util.h" |