[pulseaudio-commits] r1401 - in /trunk/src: Makefile.am daemon/default.pa.in

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Wed Sep 20 21:02:45 2006
New Revision: 1401

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1401&root=3Dpulseaudio&vi=
ew=3Drev
Log:
enable module-hal-detect in the default configuration file only if HAL supp=
ort is enabled (closes #30)

Modified:
    trunk/src/Makefile.am
    trunk/src/daemon/default.pa.in

Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=3D140=
1&root=3Dpulseaudio&r1=3D1400&r2=3D1401&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Wed Sep 20 21:02:45 2006
@@ -1295,7 +1295,9 @@
 	cp $< $@
 else
 default.pa: daemon/default.pa.in Makefile
-	sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' < $< > $@
+	sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' \
+	    -e 's, at HAVE_HAL_TRUE\@, at HAVE_HAL_TRUE@,g' \
+	    -e 's, at HAVE_HAL_FALSE\@, at HAVE_HAL_FALSE@,g' < $< > $@
 endif
 =

 daemon.conf: daemon/daemon.conf.in Makefile

Modified: trunk/src/daemon/default.pa.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/default.pa.in?=
rev=3D1401&root=3Dpulseaudio&r1=3D1400&r2=3D1401&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/daemon/default.pa.in (original)
+++ trunk/src/daemon/default.pa.in Wed Sep 20 21:02:45 2006
@@ -27,11 +27,11 @@
 #load-module module-pipe-sink
 =

 ### Automatically load driver modules depending on the hardware available
-load-module module-hal-detect
+ at HAVE_HAL_TRUE@load-module module-hal-detect
 =

 ### Alternatively use the static hardware detection module (for systems th=
at
 ### lack HAL support
-#load-module module-detect
+ at HAVE_HAL_FALSE@load-module module-detect
 =

 ### Load audio drivers automatically on access
 #add-autoload-sink output module-oss device=3D"/dev/dsp" sink_name=3Doutpu=
t source_name=3Dinput