svn commit: r1144897 - in /tomcat/native/trunk/native: build/tcnative.m4 buildconf srclib/VERSIONS

[rj...@apache.org]

Author: rjung
Date: Sun Jul 10 16:33:59 2011
New Revision: 1144897

URL: http://svn.apache.org/viewvc?rev=1144897&view=rev
Log:
We need at least APR 1.4.3 for tcnative trunk.

Modified:
    tomcat/native/trunk/native/build/tcnative.m4
    tomcat/native/trunk/native/buildconf
    tomcat/native/trunk/native/srclib/VERSIONS

Modified: tomcat/native/trunk/native/build/tcnative.m4
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=1144897&r1=1144896&r2=1144897&view=diff
==============================================================================
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Sun Jul 10 16:33:59 2011
@@ -33,12 +33,10 @@ AC_DEFUN(TCN_FIND_APR,[
   sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`"
   tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS
   decimal_apr_version=`printf %02d%02d%03d ${1} ${2} ${3}`
-  if test "${decimal_apr_version}" -lt "0102000"; then
-    AC_MSG_ERROR(Found APR $sapr_version. You need version 1.2 or newer installed.)
-  fi
-  if test "${decimal_apr_version}" -lt "0104000"; then
-    AC_MSG_NOTICE(APR $sapr_version detected.)
+  if test "${decimal_apr_version}" -lt "0104003"; then
+    AC_MSG_ERROR(Found APR $sapr_version. You need version 1.4.3 or newer installed.)
   fi
+  AC_MSG_NOTICE(APR $sapr_version detected.)
 
   APR_BUILD_DIR="`$apr_config --installbuilddir`"
 

Modified: tomcat/native/trunk/native/buildconf
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/buildconf?rev=1144897&r1=1144896&r2=1144897&view=diff
==============================================================================
--- tomcat/native/trunk/native/buildconf (original)
+++ tomcat/native/trunk/native/buildconf Sun Jul 10 16:33:59 2011
@@ -19,7 +19,7 @@
 
 # Default place to look for apr source.  Can be overridden with 
 #   --with-apr=[directory]
-apr_src_dir=`pwd`/srclib/apr-1.3.3
+apr_src_dir=`pwd`/srclib/apr-1.4.3
 
 while test $# -gt 0 
 do

Modified: tomcat/native/trunk/native/srclib/VERSIONS
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/VERSIONS?rev=1144897&r1=1144896&r2=1144897&view=diff
==============================================================================
--- tomcat/native/trunk/native/srclib/VERSIONS (original)
+++ tomcat/native/trunk/native/srclib/VERSIONS Sun Jul 10 16:33:59 2011
@@ -1,4 +1,4 @@
 Use the following version of the libraries
 
-- APR 1.3.3, http://apr.apache.org
+- APR 1.4.3, http://apr.apache.org
 - OpenSSL 0.9.8k, http://www.openssl.org



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org