mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-01 22:58:47 -04:00
pulse/context: add --enable-legacy-runtime-dir
This commit is contained in:
parent
a571565f86
commit
05b7440481
2 changed files with 11 additions and 1 deletions
|
|
@ -1220,6 +1220,12 @@ AC_SUBST(PA_SYSTEM_STATE_PATH)
|
||||||
# Output #
|
# Output #
|
||||||
###################################
|
###################################
|
||||||
|
|
||||||
|
AC_ARG_ENABLE([legacy-runtime-dir],
|
||||||
|
AS_HELP_STRING([--disable-legacy-runtime-dir], [Try to connect on legacy (< 0.9.12) socket paths.]))
|
||||||
|
if test "x$enable_legacy_runtime_dir" != "xno" ; then
|
||||||
|
AC_DEFINE(ENABLE_LEGACY_RUNTIME_DIR, [1], [Legacy runtime dir])
|
||||||
|
fi
|
||||||
|
|
||||||
AC_ARG_ENABLE(
|
AC_ARG_ENABLE(
|
||||||
[static-bins],
|
[static-bins],
|
||||||
AS_HELP_STRING([--enable-static-bins],[Statically link executables.]),
|
AS_HELP_STRING([--enable-static-bins],[Statically link executables.]),
|
||||||
|
|
|
||||||
|
|
@ -555,6 +555,7 @@ static void setup_context(pa_context *c, pa_iochannel *io) {
|
||||||
pa_context_unref(c);
|
pa_context_unref(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if ENABLE_LEGACY_RUNTIME_DIR
|
||||||
static char *get_old_legacy_runtime_dir(void) {
|
static char *get_old_legacy_runtime_dir(void) {
|
||||||
char *p, u[128];
|
char *p, u[128];
|
||||||
struct stat st;
|
struct stat st;
|
||||||
|
|
@ -598,10 +599,12 @@ static char *get_very_old_legacy_runtime_dir(void) {
|
||||||
|
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static pa_strlist *prepend_per_user(pa_strlist *l) {
|
static pa_strlist *prepend_per_user(pa_strlist *l) {
|
||||||
char *ufn;
|
char *ufn;
|
||||||
|
|
||||||
|
#if ENABLE_LEGACY_RUNTIME_DIR
|
||||||
static char *legacy_dir;
|
static char *legacy_dir;
|
||||||
|
|
||||||
/* The very old per-user instance path (< 0.9.11). This is supported only to ease upgrades */
|
/* The very old per-user instance path (< 0.9.11). This is supported only to ease upgrades */
|
||||||
|
|
@ -619,6 +622,7 @@ static pa_strlist *prepend_per_user(pa_strlist *l) {
|
||||||
pa_xfree(p);
|
pa_xfree(p);
|
||||||
pa_xfree(legacy_dir);
|
pa_xfree(legacy_dir);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* The per-user instance */
|
/* The per-user instance */
|
||||||
if ((ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET))) {
|
if ((ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET))) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue