diff options
| author | Alan Conway <aconway@apache.org> | 2007-06-26 02:11:55 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-06-26 02:11:55 +0000 |
| commit | e6566439f627e375f12f77044819bbb37b585348 (patch) | |
| tree | 18c52172d536b53df57e82a274a31bcfabc35f7b /cpp/configure.ac | |
| parent | 87c376ebc8fe6af86dc8aef8dcec03510ff5dcc0 (diff) | |
| download | qpid-python-e6566439f627e375f12f77044819bbb37b585348.tar.gz | |
2007-06-25 <aconway@redhat.com>
Cluster class implementing cluster membership map.
* src/qpid/cluster/Cluster.cpp: Cluster membership implementation.
* src/qpid/cluster/Cpg.cpp: Support for boost::function callbacks.
* src/tests/Url.cpp: Implements AMQP-95 URL format.
* xml/cluster.xml: Cluster join method.
Build/packaging
* README: Remove mention of openais till clustering is functional.
For now it is optional and we depend on an unpackaged version.
* configure.ac: Check openais has cpg_local_get().
* Makefile.am: Added cluster.xml to EXTRA_DIST.
* src/generate.sh: add cluster.xml to codegen.
* src/tests/Makefile.am:
- Generate individual "sudo -u ais" wrappers for openais tests.
- Drop "unit" directory, all unit tests in "tests" directory
Minor changes:
* src/qpid/sys/posix/Socket.cpp:
* src/qpid/sys/posix/PosixAcceptor.cpp:
* src/qpid/sys/posix/EventChannelAcceptor.cpp:
* src/qpid/sys/apr/APRAcceptor.cpp:
* src/qpid/sys/Acceptor.h (getHost): Added getHost()
* src/tests/.valgrind.supp-default: Suppress benign valgrind
warning in libcpg.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@550658 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index d0d1302ec7..67fe40d84d 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -162,15 +162,22 @@ AC_CHECK_HEADERS([boost/shared_ptr.hpp],,[missing="$missing boost"]) test -z "$missing" || AC_MSG_ERROR([Missing required headers. Install the folowing packages or -devel rpms: $missing.]) -# Enable/disable cluster functionality based on presence of openais -AC_CHECK_HEADER([openais/cpg.h],[cluster=yes],[cluster=no]) -AM_CONDITIONAL([CLUSTER], test x$cluster = xyes) -if test x$cluster = xyes; then - LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais" +# Enable/disable cluster functionality based on presence of usable openais +# and devel libs. +# cpg_local_get is not yet in a packaged release as of 2007-06-20 +LDFLAGS_save=$LDFLAGS +LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais" +AC_CHECK_LIB([cpg], [cpg_local_get], [libcpg=yes], [libcpg=no]) +AC_CHECK_HEADER([openais/cpg.h],[cpg_h=yes],[cpg_h=no]) +if test x$libcpg = xyes -a x$cpg_h = xyes; then + AM_CONDITIONAL([CLUSTER], true) CPPFLAGS+=-DCLUSTER - AC_CHECK_LIB([cpg], [cpg_initialize], [], - [AC_MSG_ERROR([Cannot find library -lcpg. Install openais.])]) +else + LDFLAGS=LDFLAGS_save fi +if test x$libcpg = xno -a x$cpg_h = xyes; then + AC_MSG_WARN([Found cpg.h but libcpg is missing or does not contain cpg_local_get. Need build of openais whitetank branch head as of 2007-06-20]) +fi AC_CONFIG_FILES([ qpidc.spec |