Mailing-List: contact qpid-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: qpid-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r561848 - in /incubator/qpid/trunk/qpid/cpp: configure.ac
 qpidc.spec.in
Date: Wed, 01 Aug 2007 16:01:35 -0000
To: qpid-commits@incubator.apache.org
From: aconway@apache.org
Message-Id: <20070801160135.BE3FA1A981A@eris.apache.org>

Author: aconway
Date: Wed Aug  1 09:01:34 2007
New Revision: 561848

URL: http://svn.apache.org/viewvc?view=rev&rev=561848
Log:
	* configure.ac: --disable-cluster flag.
	* qpidc.spec.in: openais dependency removed by --disable-flag

Modified:
    incubator/qpid/trunk/qpid/cpp/configure.ac
    incubator/qpid/trunk/qpid/cpp/qpidc.spec.in

Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=561848&r1=561847&r2=561848
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Wed Aug  1 09:01:34 2007
@@ -142,20 +142,29 @@
 AC_CHECK_HEADERS([boost/shared_ptr.hpp uuid/uuid.h],,
   AC_MSG_ERROR([Missing required header files.]))
 
-# Check for cluster requirements.
+# Check for cluster requirements. Need openais 0.80.3 or higher.x1
 save_ldflags=$LDFLAGS  
-  LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais"
+LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais"
 AC_CHECK_LIB([cpg],[cpg_local_get],[cpg_lib=yes])
 AC_CHECK_HEADER([openais/cpg.h],[cpg_h=yes])
-if test x$cpg_lib = xyes -a x$cpg_h = xyes; then
-   enable_CLUSTER=yes; 
-   CPPFLAGS+=" -DCLUSTER"
+test x$cpg_lib = xyes -a x$cpg_h = xyes && enable_CLUSTER=yes 
+
+if test x$enable_CLUSTER = xyes; then
+  AC_ARG_ENABLE([cluster],  
+    [AS_HELP_STRING([--disable-cluster],
+      [disable cluster functionality (default enabled)])],
+    [enable_CLUSTER=$enableval])   
+fi
+AM_CONDITIONAL([CLUSTER], [test x$enable_CLUSTER = xyes])
+if test x$enable_CLUSTER = xyes; then
+  CPPFLAGS+=" -DCLUSTER"
+  REQUIRES_OPENAIS="Requires: openais"
+  AC_SUBST(REQUIRES_OPENAIS)
+  REQUIRES_OPENAIS_DEVEL="Requires: openais-devel"
+  AC_SUBST(REQUIRES_OPENAIS_DEVEL)
 else
-   enable_CLUSTER=no; 
    LDFLAGS=$save_ldflags	    
 fi
-AM_CONDITIONAL([CLUSTER], [test x$enable_CLUSTER = xyes])
-
 	
 # Files to generate	
 AC_CONFIG_FILES([

Modified: incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.spec.in?view=diff&rev=561848&r1=561847&r2=561848
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/qpidc.spec.in (original)
+++ incubator/qpid/trunk/qpid/cpp/qpidc.spec.in Wed Aug  1 09:01:34 2007
@@ -52,7 +52,7 @@
 Summary: An AMQP message broker daemon
 Group: System Environment/Daemons
 Requires: %name = %version-%release
-Requires: openais
+@REQUIRES_OPENAIS@
 
 %description -n %{qpidd}
 A message broker daemon that receives stores and routes messages using
@@ -63,7 +63,7 @@
 Group: Development/System
 Requires: %name-devel = %version-%release
 Requires: %{qpidd} = %version-%release
-Requires: openais-devel
+@REQUIRES_OPENAIS_DEVEL@
 
 %description -n %{qpidd}-devel
 Libraries and header files for developing extensions to the