From 93348331bb415b1d0a5a1067fbe597f58353c5c9 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Tue, 22 Mar 2011 16:02:24 +0100 Subject: Move compile-time checks around pa_run_from_build_tree to core-util To make the code cleaner and have the checks all in one place. --- src/daemon/daemon-conf.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/daemon') diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c index 59579d92..2872c745 100644 --- a/src/daemon/daemon-conf.c +++ b/src/daemon/daemon-conf.c @@ -144,7 +144,7 @@ static const pa_daemon_conf default_conf = { #endif }; -pa_daemon_conf* pa_daemon_conf_new(void) { +pa_daemon_conf *pa_daemon_conf_new(void) { pa_daemon_conf *c; c = pa_xnewdup(pa_daemon_conf, &default_conf, 1); @@ -153,19 +153,10 @@ pa_daemon_conf* pa_daemon_conf_new(void) { c->dl_search_path = pa_sprintf_malloc("%s" PA_PATH_SEP "lib" PA_PATH_SEP "pulse-%d.%d" PA_PATH_SEP "modules", pa_win32_get_toplevel(NULL), PA_MAJOR, PA_MINOR); #else -#if defined(__linux__) && !defined(__OPTIMIZE__) - - /* We abuse __OPTIMIZE__ as a check whether we are a debug build - * or not. If we are and are run from the build tree then we - * override the search path to point to our build tree */ - if (pa_run_from_build_tree()) { pa_log_notice("Detected that we are run from the build tree, fixing search path."); c->dl_search_path = pa_xstrdup(PA_BUILDDIR "/.libs/"); - } else - -#endif c->dl_search_path = pa_xstrdup(PA_DLSEARCHPATH); #endif -- cgit