summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-03-09 13:04:13 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-03-23 14:11:13 +0000
commitb942885bb6bca2e56b1a24737fcb8cf266d9cb61 (patch)
treeeca03f71af72ebd10b5368fc68619630c7ff9f9e /configure.ac
parent531bffcfaf8bed572259981d4d900e7f1e42e473 (diff)
Avoid Wocky trying to install into --prefix=NONE
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46417 Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index c5f670177..0394e48f4 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