enable module-hal-detect in the default configuration file only if HAL support is enabled (closes #30)

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1401 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-09-20 19:02:45 +00:00
parent bf83a961d5
commit f1021b9e0b
2 changed files with 5 additions and 3 deletions

View file

@ -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

View file

@ -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