[pulseaudio-commits] src/daemon

[Colin Guthrie]

 src/daemon/default.pa.in |    6 +++---
 src/daemon/system.pa.in  |   12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 738cea3cc3a14d182b50f1fc652ce49e3209130e
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date:   Fri Aug 5 15:33:48 2011 +0200

    Fix default.pa on non udev systems

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 605f42c..e5dd28c 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -64,18 +64,18 @@ ifelse(@HAVE_MKFIFO@, 1, [dnl
 ])dnl
 
 ### Automatically load driver modules depending on the hardware available
-ifelse(1, @HAVE_UDEV@, [dnl
+ifelse(@HAVE_UDEV@, 1, [dnl
 .ifexists module-udev-detect at PA_SOEXT@
 load-module module-udev-detect
 .else
-], @HAVE_HAL@, [dnl
+], @HAVE_HAL@, 1, [dnl
 .ifexists module-hal-detect at PA_SOEXT@
 load-module module-hal-detect
 .else
 ], [dnl
 .ifexists module-detect at PA_SOEXT@
 ])dnl
-### Use the static hardware detection module (for systems that lack udev support)
+### Use the static hardware detection module (for systems that lack udev/hal support)
 load-module module-detect
 .endif
 
diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in
index aaefd1d..0cd10b8 100755
--- a/src/daemon/system.pa.in
+++ b/src/daemon/system.pa.in
@@ -18,13 +18,21 @@
 
 # This startup script is used only if PulseAudio is started in system
 # mode.
+changequote(`[', `]')dnl Set up m4 quoting
 
 ### Automatically load driver modules depending on the hardware available
+ifelse(@HAVE_UDEV@, 1, [dnl
 .ifexists module-udev-detect at PA_SOEXT@
 load-module module-udev-detect
 .else
-### Alternatively use the static hardware detection module (for systems that
-### lack udev support)
+], @HAVE_HAL@, 1, [dnl
+.ifexists module-hal-detect at PA_SOEXT@
+load-module module-hal-detect
+.else
+], [dnl
+.ifexists module-detect at PA_SOEXT@
+])dnl
+### Use the static hardware detection module (for systems that lack udev/hal support)
 load-module module-detect
 .endif