Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 58826 invoked from network); 5 Jan 2010 10:58:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Jan 2010 10:58:17 -0000 Received: (qmail 59632 invoked by uid 500); 5 Jan 2010 10:58:17 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 59551 invoked by uid 500); 5 Jan 2010 10:58:16 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 59540 invoked by uid 99); 5 Jan 2010 10:58:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2010 10:58:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2010 10:58:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E2C8023888DD; Tue, 5 Jan 2010 10:57:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r895984 - /tomcat/native/trunk/native/build/tcnative.m4 Date: Tue, 05 Jan 2010 10:57:55 -0000 To: dev@tomcat.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100105105755.E2C8023888DD@eris.apache.org> Author: rjung Date: Tue Jan 5 10:57:52 2010 New Revision: 895984 URL: http://svn.apache.org/viewvc?rev=895984&view=rev Log: Get rid of nested version test by formatting version number as one big decimal. Modified: tomcat/native/trunk/native/build/tcnative.m4 Modified: tomcat/native/trunk/native/build/tcnative.m4 URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=895984&r1=895983&r2=895984&view=diff ============================================================================== --- tomcat/native/trunk/native/build/tcnative.m4 (original) +++ tomcat/native/trunk/native/build/tcnative.m4 Tue Jan 5 10:57:52 2010 @@ -32,16 +32,9 @@ fi sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`" tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS - if test "${1}" -lt "1"; then + decimal_apr_version=`printf %02d%02d%03d ${1} ${2} ${3}` + if test "${decimal_apr_version}" -lt "0101003"; then AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.) - else - if test "${2}" -lt "3"; then - AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.) - else - if test "${3}" -lt "3"; then - AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.) - fi - fi fi APR_BUILD_DIR="`$apr_config --installbuilddir`" --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org