apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r376817 - /apr/apr/branches/0.9.x/configure.in
Date Fri, 10 Feb 2006 19:47:07 GMT
Author: rooneg
Date: Fri Feb 10 11:47:05 2006
New Revision: 376817

URL: http://svn.apache.org/viewcvs?rev=376817&view=rev
Log:
Merge r191047 to 0.9.x.

Original log message:

* configure.in: Fix the test for ancient FreeBSD that fails on a 6.0-CURRENT Machine.  Use
the kern.osreldate sysctl which gives us a stable versioning method.  We already use it for
the FreeBSD version detection in the build hints code.

Modified:
    apr/apr/branches/0.9.x/configure.in

Modified: apr/apr/branches/0.9.x/configure.in
URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/configure.in?rev=376817&r1=376816&r2=376817&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/configure.in (original)
+++ apr/apr/branches/0.9.x/configure.in Fri Feb 10 11:47:05 2006
@@ -449,8 +449,11 @@
 # 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/'`
+        if test -x /sbin/sysctl; then
+            os_version=`/sbin/sysctl -n kern.osreldate`
+        else
+            os_version=000000
+        fi
         ;;
     *linux*)
         os_version=`uname -r | sed -e 's/\(.\)\.\(.\)\.\(.\).*/\1\2\3/'`
@@ -833,7 +836,8 @@
     orig_sendfile=$sendfile
     case $host in
         *freebsd*)
-            if test $os_version -le "410"; then
+            # FreeBSD < 4.2 has issues with threads+sendfile
+            if test $os_version -le "401999"; then
                 if test "$threads" = "1"; then
                     sendfile="0"
                 fi



Mime
View raw message