diff options
| author | Alan Conway <aconway@apache.org> | 2007-08-01 16:01:34 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-08-01 16:01:34 +0000 |
| commit | 9235b5d09b3273c7c495ff266e18781fad363a9b (patch) | |
| tree | 2d1d3d1416bf4a0616ce3ca3d287103fe8a98d42 /cpp | |
| parent | 7c16ea45a0193861868f27a53403995d57e49e66 (diff) | |
| download | qpid-python-9235b5d09b3273c7c495ff266e18781fad363a9b.tar.gz | |
* configure.ac: --disable-cluster flag.
* qpidc.spec.in: openais dependency removed by --disable-flag
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@561848 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/configure.ac | 25 | ||||
| -rw-r--r-- | cpp/qpidc.spec.in | 4 |
2 files changed, 19 insertions, 10 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 20c6426188..f94710232a 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -142,20 +142,29 @@ AC_SUBST(DOWNLOAD_URL) 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([ diff --git a/cpp/qpidc.spec.in b/cpp/qpidc.spec.in index b20a6b185e..c26e131f27 100644 --- a/cpp/qpidc.spec.in +++ b/cpp/qpidc.spec.in @@ -52,7 +52,7 @@ in C++ using Qpid. Qpid implements the AMQP messaging specification. 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 @@ Summary: Libraries and header files for developing Qpid broker extensions 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 |