From 9ac728eedd6d61987e8ca35ca92c49afe0102ca7 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 6 Dec 2006 15:16:20 +0000 Subject: Patch submitted to dev list: 2006-12-06 Jim Meyering * configure.ac: Add new configure-time options: --enable-apr (default), --disable-apr. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@483109 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/configure.ac | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'cpp') diff --git a/cpp/configure.ac b/cpp/configure.ac index 1f841a0a5b..8ba48d54e2 100644 --- a/cpp/configure.ac +++ b/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 -- cgit v1.2.1