diff options
author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-02-27 23:09:52 +0100 |
---|---|---|
committer | Maarten Bosmans <mkbosmans@gmail.com> | 2011-03-19 13:38:37 +0100 |
commit | eb833da5700048953837bc75d42575ac771b2e67 (patch) | |
tree | 36cbe39838110a2bb3b4983892cb49dc7167555a /src/daemon | |
parent | 8852b80df865098a7c2895904fac99b6b1e23fbd (diff) |
Find modules and config files relative to the installed libraries.
Do not use replace %PULSE_ROOT% from the environment.
Diffstat (limited to 'src/daemon')
-rw-r--r-- | src/daemon/daemon-conf.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c index 3339f3b0..f640b039 100644 --- a/src/daemon/daemon-conf.c +++ b/src/daemon/daemon-conf.c @@ -159,7 +159,21 @@ pa_daemon_conf* pa_daemon_conf_new(void) { } else #endif +#ifdef OS_IS_WIN32 + { + char *t; + char *majorminor = pa_xstrdup(VERSION); + char *toplevel = pa_win32_get_toplevel(NULL); + + if ((t = strchr(majorminor, '-'))) + *t = '\0'; + + c->dl_search_path = pa_sprintf_malloc("%s" PA_PATH_SEP "lib" PA_PATH_SEP "pulse-%s" PA_PATH_SEP "modules", toplevel, majorminor); + pa_xfree(majorminor); + } +#else c->dl_search_path = pa_xstrdup(PA_DLSEARCHPATH); +#endif return c; } |