diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-09-20 19:02:45 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-09-20 19:02:45 +0000 |
| commit | f1021b9e0ba9727ff08009295dea28cc247b9d4f (patch) | |
| tree | 66f3fb454f468163eab8ee3d011a936126d6916f | |
| parent | bf83a961d5b246b6aed1d52d27f37e4b745bf264 (diff) | |
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
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rwxr-xr-x | src/daemon/default.pa.in | 4 |
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 |