diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/pulse/context.c | 6 | 
2 files changed, 11 insertions, 1 deletions
| diff --git a/configure.ac b/configure.ac index c28a72cd..2ac40cc6 100644 --- a/configure.ac +++ b/configure.ac @@ -1220,6 +1220,12 @@ AC_SUBST(PA_SYSTEM_STATE_PATH)  #            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(          [static-bins],          AS_HELP_STRING([--enable-static-bins],[Statically link executables.]), diff --git a/src/pulse/context.c b/src/pulse/context.c index 8686e0de..9cc1ea78 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -555,6 +555,7 @@ static void setup_context(pa_context *c, pa_iochannel *io) {      pa_context_unref(c);  } +#if ENABLE_LEGACY_RUNTIME_DIR  static char *get_old_legacy_runtime_dir(void) {      char *p, u[128];      struct stat st; @@ -598,10 +599,12 @@ static char *get_very_old_legacy_runtime_dir(void) {      return p;  } - +#endif  static pa_strlist *prepend_per_user(pa_strlist *l) {      char *ufn; + +#if ENABLE_LEGACY_RUNTIME_DIR      static char *legacy_dir;      /* 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(legacy_dir);      } +#endif      /* The per-user instance */      if ((ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET))) { | 
