Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 89523 invoked from network); 12 Feb 2009 22:28:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Feb 2009 22:28:54 -0000 Received: (qmail 43688 invoked by uid 500); 12 Feb 2009 22:28:54 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 43649 invoked by uid 500); 12 Feb 2009 22:28:54 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 43640 invoked by uid 99); 12 Feb 2009 22:28:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Feb 2009 14:28:54 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Feb 2009 22:28:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 98FC223888CA; Thu, 12 Feb 2009 22:28:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r743909 - in /qpid/trunk/qpid/cpp/src/qpid/cluster: ClusterPlugin.cpp Quorum.h Date: Thu, 12 Feb 2009 22:28:33 -0000 To: commits@qpid.apache.org From: aconway@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090212222833.98FC223888CA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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