diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-10-08 08:45:34 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-10-12 21:21:26 +0200 |
| commit | e5ac4b5ee738c1e766a250b85854fa3b9c1a70ed (patch) | |
| tree | cb03ff927b472ce22a6da1b4c34685cb896b060f /src/Makefile.am | |
| parent | 0ff2a6b434dec1a694f4cde64469ca19d97d9897 (diff) | |
buil-sys: fix build w/o DBus
The current git head does not build without DBus libraries installed.
Does the patch below look suitable?
Thanks,
Daniel
>From f69145fc603c56cef02134ceeba10e1727fa217e Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@caiaq.de>
Date: Thu, 8 Oct 2009 14:41:21 +0800
Subject: [PATCH] Makefile.am: fix builds without DBus
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c5d3ab7b..98c04683 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -180,14 +180,19 @@ pulseaudio_SOURCES = \ daemon/daemon-conf.c daemon/daemon-conf.h \ daemon/dumpmodules.c daemon/dumpmodules.h \ daemon/ltdl-bind-now.c daemon/ltdl-bind-now.h \ - daemon/main.c \ - daemon/server-lookup.c daemon/server-lookup.h + daemon/main.c -pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(DBUS_CFLAGS) -pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(DBUS_LIBS) +pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) +pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) # This is needed because automake doesn't properly expand the foreach below pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(PREOPEN_LIBS) +if HAVE_DBUS +pulseaudio_CFLAGS += $(DBUS_CFLAGS) +pulseaudio_SOURCES += daemon/server-lookup.c daemon/server-lookup.h +pulseaudio_LDADD += $(DBUS_LIBS) +endif + if PREOPEN_MODS PREOPEN_LIBS = $(PREOPEN_MODS) else |