summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am4
-rwxr-xr-xsrc/daemon/default.pa.in4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index dfe35851..64df8614 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1295,7 +1295,9 @@ default.pa: daemon/default.pa.win32
cp $< $@
else
default.pa: daemon/default.pa.in Makefile
- sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' < $< > $@
+ sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \
+ -e 's,@HAVE_HAL_TRUE\@,@HAVE_HAL_TRUE@,g' \
+ -e 's,@HAVE_HAL_FALSE\@,@HAVE_HAL_FALSE@,g' < $< > $@
endif
daemon.conf: daemon/daemon.conf.in Makefile
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index a495f890..af2a6789 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -27,11 +27,11 @@
#load-module module-pipe-sink
### Automatically load driver modules depending on the hardware available
-load-module module-hal-detect
+@HAVE_HAL_TRUE@load-module module-hal-detect
### Alternatively use the static hardware detection module (for systems that
### lack HAL support
-#load-module module-detect
+@HAVE_HAL_FALSE@load-module module-detect
### Load audio drivers automatically on access
#add-autoload-sink output module-oss device="/dev/dsp" sink_name=output source_name=input