diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:39:10 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:39:10 +0000 |
| commit | ac820293389b195332ac072240bd0930cdb305ec (patch) | |
| tree | 170a80ee72c11e15d8052e9cb1609108fc718592 /src/daemon | |
| parent | 95422a8d21115cdc78c816b2480b7ec048eb8f51 (diff) | |
merge r2132 from trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2175 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon')
| -rw-r--r-- | src/daemon/daemon.conf.in | 2 | ||||
| -rwxr-xr-x | src/daemon/default.pa.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in index d664962e..e4cfb82b 100644 --- a/src/daemon/daemon.conf.in +++ b/src/daemon/daemon.conf.in @@ -38,7 +38,7 @@ ; module-idle-time = 20 ; scache-idle-time = 20 -; dl-search-path = @PA_DLSEARCHPATH@ +; dl-search-path = (depends on architecture) ; default-script-file = @PA_DEFAULT_CONFIG_FILE@ diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in index 597993c4..56904f56 100755 --- a/src/daemon/default.pa.in +++ b/src/daemon/default.pa.in @@ -37,7 +37,7 @@ load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav #load-module module-pipe-sink ### Automatically load driver modules depending on the hardware available -.ifexists @PA_DLSEARCHPATH@/module-hal-detect@PA_SOEXT@ +.ifexists module-hal-detect@PA_SOEXT@ load-module module-hal-detect .else ### Alternatively use the static hardware detection module (for systems that @@ -79,7 +79,7 @@ load-module module-suspend-on-idle #load-module module-x11-bell sample=x11-bell ### Publish connection data in the X11 root window -.ifexists @PA_DLSEARCHPATH@/module-x11-publish@PA_SOEXT@ +.ifexists module-x11-publish@PA_SOEXT@ load-module module-x11-publish .endif @@ -91,7 +91,7 @@ load-module module-x11-publish ### Load additional modules from GConf settings. This can be configured with the paprefs tool. ### Please keep in mind that the modules configured by paprefs might conflict with manually ### loaded modules. -.ifexists @PA_DLSEARCHPATH@/module-gconf@PA_SOEXT@ +.ifexists module-gconf@PA_SOEXT@ load-module module-gconf .endif |