diff options
| author | Gordon Sim <gsim@apache.org> | 2006-12-06 15:16:20 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2006-12-06 15:16:20 +0000 |
| commit | d1c7d8c0ddcf3122e9bd9b126ae0a89619fe5ad6 (patch) | |
| tree | e3d8b9f43fff008f094994d30e31141b63ebe8c9 /qpid/cpp | |
| parent | ce6fcb957c0b72aa5c3508e47a2a4876784794b6 (diff) | |
| download | qpid-python-d1c7d8c0ddcf3122e9bd9b126ae0a89619fe5ad6.tar.gz | |
Patch submitted to dev list:
2006-12-06 Jim Meyering <meyering@redhat.com>
* configure.ac: Add new configure-time options:
--enable-apr (default), --disable-apr.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@483109 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/configure.ac | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac index 1f841a0a5b..8ba48d54e2 100644 --- a/qpid/cpp/configure.ac +++ b/qpid/cpp/configure.ac @@ -93,17 +93,31 @@ AC_SUBST(LIBTOOL_VERSION_INFO_ARG) gl_CLOCK_TIME -APR_MINIMUM_VERSION=1.2.2 -PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION]) - -APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR=1" -AC_SUBST(APR_CXXFLAGS) - CPPUNIT_MINIMUM_VERSION=1.10.2 PKG_CHECK_MODULES([CPPUNIT], [cppunit >= $CPPUNIT_MINIMUM_VERSION]) CPPUNIT_CXXFLAGS=$CPPUNIT_CFLAGS AC_SUBST(CPPUNIT_CXXFLAGS) +AC_ARG_ENABLE(apr, +[ --enable-apr use the Apache Portable Runtime library (default) + --disable-apr do not use the Apache Portable Runtime library], +[case $enable_APR in + yes|no) ;; + *) AC_MSG_ERROR([invalid APR enable/disable value: $enable_APR]) ;; + esac], +[enable_APR=yes]) + +APR_MINIMUM_VERSION=1.2.2 +AC_SUBST(APR_MINIMUM_VERSION) +AC_SUBST(APR_CXXFLAGS) +AC_SUBST(USE_APR) + +if test "$enable_APR" = yes; then + PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION]) + APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR=1" + USE_APR=1 +fi + AC_CONFIG_FILES([ Makefile gen/Makefile |