diff options
| author | Alan Conway <aconway@apache.org> | 2007-06-07 14:29:24 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-06-07 14:29:24 +0000 |
| commit | 50cd0cd44deb7b5c90e71eed1c9f3cf1666a70fe (patch) | |
| tree | 640da8126854a4e07c11ca73216b932c84e9d445 /cpp/configure.ac | |
| parent | fca1397c9ee37e92b57fd419186182cbec567435 (diff) | |
| download | qpid-python-50cd0cd44deb7b5c90e71eed1c9f3cf1666a70fe.tar.gz | |
Build support for clustering, initial CPG wrapper & tests.
- src/qpid/cluster/Cpg.cpp: C++ wrapper for the openais CPG library.
- src/tests/unit/Cpg.cpp: verify CPG functions in make check.
- makefiles etc.: build cluster stuff only if openais is installed.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@545190 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 13c2ca8870..664b1e5c74 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -158,11 +158,21 @@ AC_SUBST(DOWNLOAD_URL) # Check for headers from required devel kits. missing="" -AC_CHECK_HEADERS([libdaemon/daemon.h],,[missing="$missing libdaemon development files"]) -AC_CHECK_HEADERS([boost/shared_ptr.hpp],,[missing="$missing boost developement files"]) +AC_CHECK_HEADERS([libdaemon/daemon.h],,[missing="$missing libdaemon"]) +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" + CPPFLAGS+=-DCLUSTER + AC_CHECK_LIB([cpg], [cpg_initialize], [], + [AC_MSG_ERROR([Cannot find library -lcpg. Install openais.])]) +fi + AC_CONFIG_FILES([ qpidc.spec Makefile |