apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r191047 - /apr/apr/trunk/configure.in
Date Fri, 17 Jun 2005 01:42:07 GMT
Author: pquerna
Date: Thu Jun 16 18:42:06 2005
New Revision: 191047

URL: http://svn.apache.org/viewcvs?rev=191047&view=rev
Log:
* 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/trunk/configure.in

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/configure.in?rev=191047&r1=191046&r2=191047&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Thu Jun 16 18:42:06 2005
@@ -516,8 +516,11 @@
 # comparisons.
 case $host in
     *freebsd*)
-        # 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/'`
+        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/'`
@@ -900,7 +903,8 @@
     orig_sendfile=$sendfile
     case $host in
         *freebsd*)
-            if test $os_version -le "4010"; 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