Author: gsim
Date: Wed Dec 6 07:16:20 2006
New Revision: 483109
URL: http://svn.apache.org/viewvc?view=rev&rev=483109
Log:
Patch submitted to dev list:
2006-12-06 Jim Meyering <[EMAIL PROTECTED]>
* configure.ac: Add new configure-time options:
--enable-apr (default), --disable-apr.
Modified:
incubator/qpid/trunk/qpid/cpp/configure.ac
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=483109&r1=483108&r2=483109
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Wed Dec 6 07:16:20 2006
@@ -93,16 +93,30 @@
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
