diff options
| author | Alan Conway <aconway@apache.org> | 2009-02-12 22:28:33 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-02-12 22:28:33 +0000 |
| commit | a49f76d3935306429a1b9ba59f9a80689cc974d7 (patch) | |
| tree | dd92d60de49e3e225d5c2eea3e27e8df47a1e0c7 | |
| parent | b446b29e2a948bafba4c9afa13afb3b6d4ab669e (diff) | |
| download | qpid-python-a49f76d3935306429a1b9ba59f9a80689cc974d7.tar.gz | |
Enable --cluster-cman option if built with libcman support.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743909 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp | 3 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/cluster/Quorum.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp b/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp index 266e7f00b0..132043f91a 100644 --- a/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp +++ b/qpid/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/qpid/cpp/src/qpid/cluster/Quorum.h b/qpid/cpp/src/qpid/cluster/Quorum.h index f07b58dfa6..ea55c36730 100644 --- a/qpid/cpp/src/qpid/cluster/Quorum.h +++ b/qpid/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" |