[pulseaudio-discuss] [PATCH 3/6] build: Use more conditional inclusions in default.pa

[Maarten Bosmans]

---
 src/daemon/default.pa.in |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 8ee3bdc..c0f396e 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -46,35 +46,58 @@ load-module module-augment-properties
 ### Load audio drivers statically (it's probably better to not load
 ### these drivers manually, but instead use module-udev-detect --
 ### see below -- for doing this automatically)
+ at if @HAVE_ALSA@
 #load-module module-alsa-sink
 #load-module module-alsa-source device=hw:1,0
+ at endif
+ at if @HAVE_OSS_OUTPUT@
 #load-module module-oss device="/dev/dsp" sink_name=output source_name=input
 #load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
+ at endif
+ at if @OS_IS_WIN32@
+load-module module-waveout sink_name=output source_name=input
+ at endif
 #load-module module-null-sink
 #load-module module-pipe-sink
 
 ### Automatically load driver modules depending on the hardware available
+ at if @HAVE_UDEV@
 .ifexists module-udev-detect at PA_SOEXT@
 load-module module-udev-detect
 .else
+ at else
+ at if @HAVE_HAL
+.ifexists module-hal-detect at PA_SOEXT@
+load-module module-hal-detect
+.else
+ at else
+.ifexists module-detect at PA_SOEXT@
+ at endif
+ at endif
 ### Alternatively use the static hardware detection module (for systems that
 ### lack udev support)
 load-module module-detect
 .endif
 
+ at if @HAVE_BLUEZ@
 ### Automatically load driver modules for Bluetooth hardware
 .ifexists module-bluetooth-discover at PA_SOEXT@
 load-module module-bluetooth-discover
 .endif
 
+ at endif
+ at if @HAVE_SYS_UN_H@
 ### Load several protocols
 .ifexists module-esound-protocol-unix at PA_SOEXT@
 load-module module-esound-protocol-unix
 .endif
+load-module module-native-protocol-unix
+ at endif
+ at if @HAVE_DBUS@
 .ifexists module-dbus-protocol at PA_SOEXT@
 load-module module-dbus-protocol
 .endif
-load-module module-native-protocol-unix
+ at endif
 
 ### Network access (may be configured with paprefs, so leave this commented
 ### here if you plan to use paprefs)
@@ -83,9 +106,6 @@ load-module module-native-protocol-unix
 #load-module module-zeroconf-publish
 
 @if @OS_IS_WIN32@
-# Load audio drivers statically
-load-module module-waveout sink_name=output source_name=input
-
 # Load audio drivers automatically on access
 #add-autoload-sink output module-waveout sink_name=output source_name=input
 #add-autoload-source input module-waveout sink_name=output source_name=input
@@ -135,6 +155,8 @@ load-module module-position-event-sounds
 ### Cork music streams when a phone stream is active
 load-module module-cork-music-on-phone
 
+ at endif
+ at if @HAVE_X11@
 # X11 modules should not be started from default.pa so that one daemon
 # can be shared by multiple sessions.
 
-- 
1.7.1