diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2009-04-06 16:29:22 +1000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-04-10 02:14:07 +0200 |
| commit | 80e18c8da35eb988d10ccada436ab11710c298f6 (patch) | |
| tree | 0f1eef8e246170ebdc9571a47f68719a36fd6784 /src/pulse/internal.h | |
| parent | e011230f877408e78f2572c072a383034ea63d89 (diff) | |
make dbus optional during build
On Tue, 31 Mar 2009, Lennart Poettering wrote:
[snip]
>
> I have now merged your patch. I had to change a few things to make it
> apply cleanly. Since I have no access to Solaris I am unable to test
> this though, so please check if things still work for you.
>
> I also worked around the realpath() issue mostly. It should work fine on
> Solaris now, as well.
Thanks. 0.9.15-test7 seems to work fine.
The only new issue is that configure --without-dbus no longer builds. I
don't need dbus for my purposes (network audio server) and it seems that
dbus is not included with Solaris. A patch for this follows.
Finn
Diffstat (limited to 'src/pulse/internal.h')
| -rw-r--r-- | src/pulse/internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/pulse/internal.h b/src/pulse/internal.h index 344e6399..28a989b3 100644 --- a/src/pulse/internal.h +++ b/src/pulse/internal.h @@ -42,7 +42,9 @@ #include <pulsecore/hashmap.h> #include <pulsecore/refcnt.h> #include <pulsecore/time-smoother.h> +#ifdef HAVE_DBUS #include <pulsecore/dbus-util.h> +#endif #include "client-conf.h" @@ -51,8 +53,10 @@ struct pa_context { PA_REFCNT_DECLARE; +#ifdef HAVE_DBUS pa_dbus_wrap_connection *system_bus; pa_dbus_wrap_connection *session_bus; +#endif pa_proplist *proplist; pa_mainloop_api* mainloop; |