diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-08-21 22:05:27 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-08-21 22:05:27 +0200 |
| commit | 14c27c7ade403683e06705e45b9a3df28102a909 (patch) | |
| tree | e99e7c317dd526bb8e9a668c89d3074a8c18086c | |
| parent | 9abc010c930999eed67253f5b83f7c226b1a17f6 (diff) | |
gconf: use correct path for gconf-helper tool when running from build tree
| -rw-r--r-- | src/modules/gconf/module-gconf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c index c01ebbf6..85523b39 100644 --- a/src/modules/gconf/module-gconf.c +++ b/src/modules/gconf/module-gconf.c @@ -52,9 +52,6 @@ PA_MODULE_LOAD_ONCE(TRUE); #define MAX_MODULES 10 #define BUF_MAX 2048 -/* #undef PA_GCONF_HELPER */ -/* #define PA_GCONF_HELPER "/home/lennart/projects/pulseaudio/src/gconf-helper" */ - struct module_item { char *name; char *args; @@ -343,7 +340,11 @@ int pa__init(pa_module*m) { u->io_event = NULL; u->buf_fill = 0; - if ((u->fd = pa_start_child_for_read(PA_GCONF_HELPER, NULL, &u->pid)) < 0) + if ((u->fd = pa_start_child_for_read( +#if defined(__linux__) && !defined(__OPTIMIZE__) + pa_run_from_build_tree() ? PA_BUILDDIR "/.libs/gconf-helper" : +#endif + PA_GCONF_HELPER, NULL, &u->pid)) < 0) goto fail; u->io_event = m->core->mainloop->io_new( |