diff options
| author | Alan Conway <aconway@apache.org> | 2007-07-19 02:19:17 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-07-19 02:19:17 +0000 |
| commit | ac530f5770150abe56acf270dfcea6287afb189d (patch) | |
| tree | 11bef494467fab36b05d9f0420198a78a18ada79 /cpp/configure.ac | |
| parent | a51da643a383c5c55fcd33861e379607037983f2 (diff) | |
| download | qpid-python-ac530f5770150abe56acf270dfcea6287afb189d.tar.gz | |
* src/qpid/broker/Daemon.cpp, .h
- Rewrote to remove libdaemon dependency.
- PID file stored in /var/run if root, /tmp otherwise.
* src/qpidd.cpp: Use new Daemon.cpp.
* lib/broker/Makefile.am (libqpidbroker_la_LIBADD):
- Daemon.cpp now needs -lboost_iostreams
* NOTICE, README, qpidc.spec.in: Removed mention of libdaemon.
* configure.ac:
- removed libdaemon
- cluster off by default - no ais dependencies.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@557455 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 63ec993a56..07366a4a59 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -156,30 +156,31 @@ DOWNLOAD_URL=http://rhm.et.redhat.com/download AC_SUBST(DOWNLOAD_URL) # Check for headers from required devel kits. -missing="" -AC_CHECK_HEADERS([libdaemon/daemon.h],,[missing="$missing libdaemon"]) -AC_CHECK_HEADERS([boost/shared_ptr.hpp],,[missing="$missing boost"]) -AC_CHECK_HEADERS([uuid/uuid.h],,[missing="$missing libuuid"]) -test -z "$missing" || - AC_MSG_ERROR([Missing required headers. Install the following packages or -devel rpms: $missing.]) - -# 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" -else - AM_CONDITIONAL([CLUSTER], false) - 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]) +AC_CHECK_HEADERS([boost/shared_ptr.hpp uuid/uuid.h],, + AC_MSG_ERROR([Missing required header files.])) + +# Enable cluster functionality. +AC_ARG_ENABLE([cluster], + [AS_HELP_STRING([--enable-cluster], + [Enable cluster functionality, requires openais (default no)])], + [case $enableval in + yes|no) enable_CLUSTER=$enableval;; + *) AC_MSG_ERROR([Invalid value for --enable-apr-cluster: $enableval]);; + esac], + [enable_CLUSTER=no]) + +AM_CONDITIONAL([CLUSTER], [test x$enable_CLUSTER = xyes]) +if test x$enable_CLUSTER = xyes; then + CPPFLAGS+=" -DCLUSTER" + LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais" + # cpg_local_get is not yet in a packaged release as of 2007-06-20 + AC_CHECK_LIB([cpg],[cpg_local_get],, + AC_MSG_ERROR([cpg_local_get not available. openais missing/too old.])) + AC_CHECK_HEADERS([openais/cpg.h],, + AC_MSG_ERROR([Required header files not found.],[])) fi + + AC_CONFIG_FILES([ qpidc.spec Makefile |