diff options
| author | Alan Conway <aconway@apache.org> | 2008-06-18 17:53:30 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-06-18 17:53:30 +0000 |
| commit | 9bf82c2c8c45a5228643a285f8db0b1061a69ad9 (patch) | |
| tree | d38be99fcb793712c2a2b5fb56dcbbb8294ff818 /cpp/configure.ac | |
| parent | 02757b560356e0ddb090fbe103e0b65db6dbd3b3 (diff) | |
| download | qpid-python-9bf82c2c8c45a5228643a285f8db0b1061a69ad9.tar.gz | |
Bring cluster code up to date.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@669236 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 76c0c77780..b8184483ca 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -46,9 +46,6 @@ AC_ARG_WITH([doxygen], esac]) AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"]) -# Check for use of CPG -AM_CONDITIONAL([CPG], [test x$with_CPG = xyes]) - AC_ARG_ENABLE(warnings, [ --enable-warnings turn on lots of compiler warnings (recommended)], [case "${enableval}" in @@ -152,10 +149,8 @@ AC_CHECK_HEADERS([boost/shared_ptr.hpp uuid/uuid.h],, # Check for optional CPG requirement. LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais" - - AC_ARG_WITH([cpg], - [AS_HELP_STRING([--with-cpg], [Build with CPG support])], + [AS_HELP_STRING([--with-cpg], [Build with CPG support for clustering.])], [case "${withval}" in yes) # yes - enable with_CPG=yes @@ -167,8 +162,8 @@ AC_ARG_WITH([cpg], ;; *) AC_MSG_ERROR([Bad value ${withval} for --with-cpg option]) ;; esac], - [ # not specified - GS 24-APR-2008 temporarily disabled - (enable if libs/headers available). - with_CPG=no + [ # not specified - enable if libs/headers available. + with_CPG=yes AC_CHECK_HEADERS([openais/cpg.h],,[with_CPG=no]) AC_CHECK_LIB([cpg],[cpg_initialize],,[with_CPG=no]) ] |