apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject svn commit: r189962 - /apr/apr/trunk/configure.in
Date Fri, 10 Jun 2005 14:10:41 GMT
Author: martin
Date: Fri Jun 10 07:10:40 2005
New Revision: 189962

URL: http://svn.apache.org/viewcvs?rev=189962&view=rev
Log:
Fix code which handles FreeBSD release numbers
 1.23.4-RELEASE => 1234
 1.2.3-RELEASE  => 1023
 1.2-RELEASE    => 1020
to accomodate for <onedigit>.<twodigits>[.<onedigit>] numbers.
Previously, configure would complain:
  /home/martin/apr/configure: line 27912: test: 4.11-STABLE: integer expression expected

Modified:
    apr/apr/trunk/configure.in

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/configure.in?rev=189962&r1=189961&r2=189962&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Fri Jun 10 07:10:40 2005
@@ -516,8 +516,8 @@
 # comparisons.
 case $host in
     *freebsd*)
-        # 3.4-RELEASE: 340   4.1.1-RELEASE: 411
-        os_version=`uname -r | sed -e 's/\(.\)\.\(.\)\.\(.\).*/\1\2\3/' | sed -e 's/\(.\)\.\(.\)\-.*/\1\20/'`
+        # 3.4-RELEASE: 3040   4.2.1-RELEASE: 4021  4.11-STABLE: 4110
+        os_version=`uname -r | sed -e 's/^\([1-9]\)\.\([0-9]\)\.\([0-9]\).*/\10\2\3/' -e
's/^\([1-9]\)\.\([0-9][0-9]\)\.\([0-9]\).*/\1\2\3/' -e 's/^\([1-9]\)\.\([0-9][0-9]\)-.*/\1\20/'
-e 's/^\([1-9]\)\.\([0-9][0-9]\)-.*/\1\20/' -e 's/\([1-9]\)\.\([0-9]\)\-.*/\10\20/'`
         ;;
     *linux*)
         os_version=`uname -r | sed -e 's/\(.\)\.\(.\)\.\(.\).*/\1\2\3/'`
@@ -900,7 +900,7 @@
     orig_sendfile=$sendfile
     case $host in
         *freebsd*)
-            if test $os_version -le "410"; then
+            if test $os_version -le "4010"; then
                 if test "$threads" = "1"; then
                     sendfile="0"
                 fi



Mime
View raw message