summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-02-19 05:02:52 +0100
committerLennart Poettering <lennart@poettering.net>2009-02-19 05:02:52 +0100
commitb0c0106824b47e7b21f022cb0f8dbf5b54a7b269 (patch)
tree115d44a8687035039772110ebaf496b2870f8b4a
parent7c78c3f6589eeba9e2a4d7f7abbcaaeb6a89d833 (diff)
parent05b74404813931744e1479c96f039ae2a79b0c7d (diff)
Merge commit 'elmarco/legacy-dir'
-rw-r--r--configure.ac6
-rw-r--r--src/pulse/context.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index ddf7a1cc..11b091bb 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 d8d0a51d..9309c6b7 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -554,6 +554,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;
@@ -597,10 +598,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 */
@@ -618,6 +621,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))) {