From f2a9fd779e6bfc79d7e6f6f45447e9adbb873c34 Mon Sep 17 00:00:00 2001
From: Maarten Bosmans <mkbosmans@gmail.com>
Date: Thu, 17 Feb 2011 11:28:54 +0100
Subject: Give module-waveout a configure switch

 - Also disable the scary DBus and udev warnings when building for win32
 - and only install some dbus/x11 specific files when appropriate
---
 src/Makefile.am | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index ed4a06a1..d49d91c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -112,8 +112,10 @@ pulseconf_DATA = \
 		daemon.conf \
 		client.conf
 
+if HAVE_DBUS
 dbuspolicy_DATA = \
 		daemon/pulseaudio-system.conf
+endif
 
 if HAVE_X11
 xdgautostart_in_files = \
@@ -175,6 +177,8 @@ endif
 #       Utility programs          #
 ###################################
 
+bin_SCRIPTS = esdcompat
+
 bin_PROGRAMS += \
 		pacat \
 		pactl
@@ -189,14 +193,13 @@ endif
 
 if HAVE_X11
 bin_PROGRAMS += pax11publish
+bin_SCRIPTS += start-pulseaudio-x11 start-pulseaudio-kde
 endif
 
 if HAVE_AVAHI
 bin_PROGRAMS += pabrowse
 endif
 
-bin_SCRIPTS = esdcompat start-pulseaudio-x11 start-pulseaudio-kde
-
 pacat_SOURCES = utils/pacat.c
 pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
 pacat_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
@@ -1183,7 +1186,7 @@ pulselibexec_PROGRAMS += \
 		gconf-helper
 endif
 
-if OS_IS_WIN32
+if HAVE_WAVEOUT
 modlibexec_LTLIBRARIES += \
 		module-waveout.la
 endif
-- 
cgit