You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2009/02/12 23:28:33 UTC

svn commit: r743909 - in /qpid/trunk/qpid/cpp/src/qpid/cluster: ClusterPlugin.cpp Quorum.h

Author: aconway
Date: Thu Feb 12 22:28:33 2009
New Revision: 743909

URL: http://svn.apache.org/viewvc?rev=743909&view=rev
Log:
Enable --cluster-cman option if built with libcman support.

Modified:
    qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
    qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum.h

Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp?rev=743909&r1=743908&r2=743909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp Thu Feb 12 22:28:33 2009
@@ -16,6 +16,7 @@
  *
  */
 
+#include "config.h"
 #include "Connection.h"
 #include "ConnectionCodec.h"
 #include "ClusterSettings.h"
@@ -67,7 +68,7 @@
             ("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"),

Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum.h?rev=743909&r1=743908&r2=743909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum.h Thu Feb 12 22:28:33 2009
@@ -23,7 +23,7 @@
  */
 #include "config.h"
 
-#if HAVE_LIBCMAN
+#if HAVE_LIBCMAN_H
 #include "Quorum_cman.h"
 #else
 #include "Quorum_null.h"



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org