From a0ca52a989ab1c9f7a10a2be539cd89c35912786 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 9 Mar 2012 13:04:13 +0000 Subject: [PATCH 3/6] Avoid Wocky trying to install into --prefix=NONE Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46417 --- configure.ac | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index e7daa6f..6680ffe 100644 --- a/configure.ac +++ b/configure.ac @@ -309,6 +309,13 @@ AM_CONDITIONAL([WANT_TWISTED_TESTS], test false != "$TEST_PYTHON") # We have to run Wocky's configure *before* looking for it with PKG_CHECK_MODULES so wocky-uninstalled.pc has been generated +# If you don't specify --prefix, it starts off as NONE. Autoconf +# would normally do this defaulting for us later, but that's too +# late to help Wocky. +if test "x${prefix}" = "xNONE"; then + prefix=/usr/local +fi + # We tell Wocky to install its headers alongside gabble's so that an actual # separate Wocky installation won't clash with them. This is a bit of a hack. # AX_CONFIG_DIR doesn't make it very easy to pass extra arguments to the -- 1.7.9.1