summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-02-12 22:28:33 +0000
committerAlan Conway <aconway@apache.org>2009-02-12 22:28:33 +0000
commit7f6b3ae4aef9e5b2156a09fb9068f56fef0db94b (patch)
treeea7e27ed1c7c43971e5893544c4d8a08ebe14549
parent2373179461b356f540dacd27d0fd7413b0a550e2 (diff)
downloadqpid-python-7f6b3ae4aef9e5b2156a09fb9068f56fef0db94b.tar.gz
Enable --cluster-cman option if built with libcman support.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@743909 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--cpp/src/qpid/cluster/ClusterPlugin.cpp3
-rw-r--r--cpp/src/qpid/cluster/Quorum.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/qpid/cluster/ClusterPlugin.cpp b/cpp/src/qpid/cluster/ClusterPlugin.cpp
index 266e7f00b0..132043f91a 100644
--- a/cpp/src/qpid/cluster/ClusterPlugin.cpp
+++ b/cpp/src/qpid/cluster/ClusterPlugin.cpp
@@ -16,6 +16,7 @@
*
*/
+#include "config.h"
#include "Connection.h"
#include "ConnectionCodec.h"
#include "ClusterSettings.h"
@@ -67,7 +68,7 @@ struct ClusterOptions : public Options {
("cluster-username", optValue(settings.username, ""), "Username for connections between brokers")
("cluster-password", optValue(settings.password, ""), "Password for connections between brokers")
("cluster-mechanism", optValue(settings.mechanism, ""), "Authentication mechanism for connections between brokers")
-#if HAVE_LIBCMAN
+#if HAVE_LIBCMAN_H
("cluster-cman", optValue(settings.quorum), "Integrate with Cluster Manager (CMAN) cluster.")
#endif
("cluster-read-max", optValue(settings.readMax,"N"),
diff --git a/cpp/src/qpid/cluster/Quorum.h b/cpp/src/qpid/cluster/Quorum.h
index f07b58dfa6..ea55c36730 100644
--- a/cpp/src/qpid/cluster/Quorum.h
+++ b/cpp/src/qpid/cluster/Quorum.h
@@ -23,7 +23,7 @@
*/
#include "config.h"
-#if HAVE_LIBCMAN
+#if HAVE_LIBCMAN_H
#include "Quorum_cman.h"
#else
#include "Quorum_null.h"