From 26af0fe51fa6b485d5bc6abb3d1745f34875591c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 23 Mar 2012 15:04:51 +0000 Subject: [PATCH 1/4] Avoid Wocky trying to install into --prefix=NONE Similar to https://bugs.freedesktop.org/show_bug.cgi?id=46417 in Gabble. --- configure.ac | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 9420f0e..baf7376 100644 --- a/configure.ac +++ b/configure.ac @@ -304,6 +304,13 @@ AM_CONDITIONAL(ENABLE_PLUGIN_API, test x$enable_plugin_api = xyes) # 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