always check for libtool prefix binary name to avoid confusion when using both installed and run-from-build-tree versions of PA in parallel

This commit is contained in:
Lennart Poettering 2008-10-19 22:24:18 +02:00
parent 60c2a82462
commit d395792788

View file

@ -171,14 +171,14 @@ static int proc_name_ours(pid_t pid, const char *procname) {
good = pa_startswith(stored, expected); good = pa_startswith(stored, expected);
pa_xfree(expected); pa_xfree(expected);
#if !defined(__OPTIMIZE__) /*#if !defined(__OPTIMIZE__)*/
if (!good) { if (!good) {
/* libtool likes to rename our binary names ... */ /* libtool likes to rename our binary names ... */
expected = pa_sprintf_malloc("%lu (lt-%s)", (unsigned long) pid, procname); expected = pa_sprintf_malloc("%lu (lt-%s)", (unsigned long) pid, procname);
good = pa_startswith(stored, expected); good = pa_startswith(stored, expected);
pa_xfree(expected); pa_xfree(expected);
} }
#endif /*#endif*/
return !!good; return !!good;
} }