mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-16 08:56:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix default.pa on non udev systems

Browse source
This commit is contained in:
Maarten Bosmans 2011-08-05 15:33:48 +02:00 • committed by Colin Guthrie
parent e8df86807e
commit 738cea3cc3
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/daemon/default.pa.in
View file

@ -64,18 +64,18 @@ ifelse(@HAVE_MKFIFO@, 1, [dnl
])dnl ])dnl
### Automatically load driver modules depending on the hardware available ### Automatically load driver modules depending on the hardware available
ifelse(1, @HAVE_UDEV@, [dnl ifelse(@HAVE_UDEV@, 1, [dnl
.ifexists module-udev-detect@PA_SOEXT@ .ifexists module-udev-detect@PA_SOEXT@
load-module module-udev-detect load-module module-udev-detect
.else .else
], @HAVE_HAL@, [dnl ], @HAVE_HAL@, 1, [dnl
.ifexists module-hal-detect@PA_SOEXT@ .ifexists module-hal-detect@PA_SOEXT@
load-module module-hal-detect load-module module-hal-detect
.else .else
], [dnl ], [dnl
.ifexists module-detect@PA_SOEXT@ .ifexists module-detect@PA_SOEXT@
])dnl ])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 load-module module-detect
.endif .endif

12
src/daemon/system.pa.in
View file

@ -18,13 +18,21 @@
# This startup script is used only if PulseAudio is started in system # This startup script is used only if PulseAudio is started in system
# mode. # mode.
changequote(`[', `]')dnl Set up m4 quoting
### Automatically load driver modules depending on the hardware available ### Automatically load driver modules depending on the hardware available
ifelse(@HAVE_UDEV@, 1, [dnl
.ifexists module-udev-detect@PA_SOEXT@ .ifexists module-udev-detect@PA_SOEXT@
load-module module-udev-detect load-module module-udev-detect
.else .else
### Alternatively use the static hardware detection module (for systems that ], @HAVE_HAL@, 1, [dnl
### lack udev support) .ifexists module-hal-detect@PA_SOEXT@
load-module module-hal-detect
.else
], [dnl
.ifexists module-detect@PA_SOEXT@
])dnl
### Use the static hardware detection module (for systems that lack udev/hal support)
load-module module-detect load-module module-detect
.endif .endif