svn commit: r757607 - /apr/apr/trunk/build/aprenv.py

[pq...@apache.org]

Author: pquerna
Date: Tue Mar 24 00:01:59 2009
New Revision: 757607

URL: http://svn.apache.org/viewvc?rev=757607&view=rev
Log:
Scons:
 Add detection of fork and mmap.
 Add detection of accept filters.

Modified:
    apr/apr/trunk/build/aprenv.py

Modified: apr/apr/trunk/build/aprenv.py
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/aprenv.py?rev=757607&r1=757606&r2=757607&view=diff
==============================================================================
--- apr/apr/trunk/build/aprenv.py (original)
+++ apr/apr/trunk/build/aprenv.py Tue Mar 24 00:01:59 2009
@@ -509,7 +509,9 @@
         'strnicmp',
         'strstr',
         'memchr',
-        'iovec'
+        'iovec',
+        'fork',
+        'mmap'
     ]
 
     for func in check_functions:
@@ -520,15 +522,14 @@
 
     # Set Features
     # TODO: Not done yet
-    subst['@sharedmem@'] = 0
-    subst['@threads@'] = 0
+    subst['@sharedmem@'] = 1
+    subst['@threads@'] = 1
     subst['@sendfile@'] = 0
-    subst['@mmap@'] = 0
-    subst['@fork@'] = 0
+    subst['@mmap@'] = subst['@have_mmap@']
+    subst['@fork@'] = subst['@have_fork@']
     subst['@rand@'] = 0
     subst['@oc@'] = 0
     subst['@aprdso@'] = 0
-    subst['@acceptfilter@'] = 0
     subst['@have_unicode_fs@'] = 0
     subst['@have_proc_invoked@'] = 0
     subst['@aprlfs@'] = 0
@@ -546,6 +547,11 @@
     else:
         subst['@have_ipv6@'] = 0
 
+    if conf.CheckDeclaration('SO_ACCEPTFILTER', '#include <sys/socket.h>'):
+        subst['@acceptfilter@'] = 1
+    else:
+        subst['@acceptfilter@'] = 0
+
     if conf.CheckDeclaration('IPPROTO_SCTP', '#include <netinet/in.h>') and \
         conf.Check_apr_sctp():
         subst['@have_sctp@'] = 1