From: Maarten Bosmans <mkbosmans@gmail.com>
Date: Tue, 15 Mar 2011 11:30:42 +0000 (+0100)
Subject: build: Protect some more variables by ifdefs
X-Git-Tag: 1.0_branch~697^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09d7baec645c8720b9ba71fc1e8db6b35c3da943;p=profile%2Fivi%2Fpulseaudio.git

build: Protect some more variables by ifdefs

This avoids empty directories being created on builds without X11, ALSA, etc.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 9de5d4f..2d73b72 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,10 +27,16 @@ pulseincludedir=$(includedir)/pulse
 pulsecoreincludedir=$(includedir)/pulsecore
 pulseconfdir=$(sysconfdir)/pulse
 pulselibexecdir=$(libexecdir)/pulse
+if HAVE_X11
 xdgautostartdir=$(sysconfdir)/xdg/autostart
+endif
+if HAVE_ALSA
 alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets
 alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths
+endif
+if HAVE_DBUS
 dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+endif
 
 ###################################
 #            Defines              #
@@ -117,9 +123,9 @@ if HAVE_X11
 xdgautostart_in_files = \
 		daemon/pulseaudio.desktop.in \
 		daemon/pulseaudio-kde.desktop.in
-endif
 xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
+endif
 
 
 ###################################
@@ -1902,8 +1908,10 @@ else
 SYMLINK_PROGRAM=ln -sf
 endif
 install-exec-hook:
+if HAVE_BLUEZ
 	-chown root $(DESTDIR)$(pulselibexecdir)/proximity-helper
 	-chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper
+endif
 	$(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parec$(EXEEXT)
 	$(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/pamon$(EXEEXT)
 	$(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/paplay$(EXEEXT)