You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2011/06/28 21:50:57 UTC
svn commit: r1140816 -
/activemq/activemq-cpp/trunk/activemq-c/m4/apr_tools.m4
Author: tabish
Date: Tue Jun 28 19:50:57 2011
New Revision: 1140816
URL: http://svn.apache.org/viewvc?rev=1140816&view=rev
Log:
Add fixes for build with later apr versions.
Modified:
activemq/activemq-cpp/trunk/activemq-c/m4/apr_tools.m4
Modified: activemq/activemq-cpp/trunk/activemq-c/m4/apr_tools.m4
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-c/m4/apr_tools.m4?rev=1140816&r1=1140815&r2=1140816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-c/m4/apr_tools.m4 (original)
+++ activemq/activemq-cpp/trunk/activemq-c/m4/apr_tools.m4 Tue Jun 28 19:50:57 2011
@@ -40,9 +40,8 @@ AC_DEFUN([DECAF_CONFIGURE_APR],
DECAF_DOWNLOAD_APU
fi
- APR_VER_REGEXES=["1\.3\.[0-9] 1\.3\.1[0-9] "]
+ APR_VER_REGEXES=["1\.[3-4]\.[0-9] 1\.[3-4]\.1[0-9] "]
APU_VER_REGEXES=["1\.3\.[0-9] 1\.3\.1[0-9] "]
-
dnl check APR version number against regex
AC_MSG_CHECKING([APR version])
@@ -76,7 +75,7 @@ AC_DEFUN([DECAF_CONFIGURE_APR],
APU_WANTED_REGEX_MATCH=0
for apu_wanted_regex in $APU_VER_REGEXES; do
- if test `expr $apr_version : $apu_wanted_regex` -ne 0; then
+ if test `expr $apu_version : $apu_wanted_regex` -ne 0; then
APU_WANTED_REGEX_MATCH=1
break
fi