From eb833da5700048953837bc75d42575ac771b2e67 Mon Sep 17 00:00:00 2001
From: Maarten Bosmans <mkbosmans@gmail.com>
Date: Sun, 27 Feb 2011 23:09:52 +0100
Subject: Find modules and config files relative to the installed libraries.

Do not use replace %PULSE_ROOT% from the environment.
---
 src/daemon/daemon-conf.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src/daemon/daemon-conf.c')

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;
 }
-- 
cgit