diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2007-05-22 15:18:08 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2007-05-22 15:18:08 +0000 |
| commit | f646350b5e59ccf49f1253bd55f98d062769f2ee (patch) | |
| tree | ba8143aa842ced96eaa450cc236a96abdd8b9c05 /cpp/configure.ac | |
| parent | b8f00ac2a358a02d0cdae2dc098f2bacb2af44d5 (diff) | |
| download | qpid-python-f646350b5e59ccf49f1253bd55f98d062769f2ee.tar.gz | |
* Split apart platform (threading etc.) from network io
you can now use a posix platform implementation by configuring
--disable-apr-platform
* Changed Time classes to distinguish between absolute times (AbsTime)
and durations (Duration). This should avoid bugs caused by confusing
the two types of time.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@540608 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 1901480a4b..13c2ca8870 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -90,26 +90,44 @@ CPPUNIT_CXXFLAGS=$CPPUNIT_CFLAGS AC_SUBST(CPPUNIT_LIBS) AC_SUBST(CPPUNIT_CXXFLAGS) -AC_ARG_ENABLE([apr], - [AS_HELP_STRING([--enable-apr], - [use the Apache Portable Runtime library (default yes)])], +AC_ARG_ENABLE([apr-netio], + [AS_HELP_STRING([--enable-apr-netio], + [use the Apache Portable Runtime library for network IO (default yes)])], [case $enableval in - yes|no) enable_APR=$enableval;; - *) AC_MSG_ERROR([Invalid value for --enable-apr: $enableval]);; + yes|no) enable_APR_NETIO=$enableval;; + *) AC_MSG_ERROR([Invalid value for --enable-apr-netio: $enableval]);; esac], - [enable_APR=yes] + [enable_APR_NETIO=yes] ) -AM_CONDITIONAL([USE_APR], [test x$enable_APR = xyes]) +AM_CONDITIONAL([USE_APR_NETIO], [test x$enable_APR_NETIO = xyes]) + +AC_ARG_ENABLE([apr-platform], + [AS_HELP_STRING([--enable-apr-platform], + [use the Apache Portable Runtime library for platform (default yes)])], + [case $enableval in + yes|no) enable_APR_PLATFORM=$enableval;; + *) AC_MSG_ERROR([Invalid value for --enable-apr-platform: $enableval]);; + esac], + [enable_APR_PLATFORM=yes] +) +AM_CONDITIONAL([USE_APR_PLATFORM], [test x$enable_APR_PLATFORM = xyes]) APR_MINIMUM_VERSION=1.2.2 AC_SUBST(APR_MINIMUM_VERSION) AC_SUBST(APR_CXXFLAGS) -AC_SUBST(USE_APR) +AC_SUBST(USE_APR_PLATFORM) -if test "$enable_APR" = yes; then +if test "$enable_APR_NETIO" = yes -o "$enable_APR_PLATFORM" = yes; then PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION]) - APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR=1" - USE_APR=1 + APR_CXXFLAGS="$APR_CFLAGS" + if test "$enable_APR_NETIO" = yes; then + APR_CXXFLAGS+=" -DUSE_APR_NETIO=1" + USE_APR_NETIO=1 + fi + if test "$enable_APR_PLATFORM" = yes; then + APR_CXXFLAGS+=" -DUSE_APR_PLATFORM=1" + USE_APR_PLATFORM=1 + fi fi AC_ARG_ENABLE([valgrind], |