apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1561322 - in /apr/apr/branches/1.5.x: ./ configure.in
Date Sat, 25 Jan 2014 15:17:30 GMT
Author: jim
Date: Sat Jan 25 15:17:29 2014
New Revision: 1561322

URL: http://svn.apache.org/r1561322
Log:
Merge r1561321 from trunk:

Maintain ordering but use OVERRIDE if enabled AND found

Reviewed/backported by: jim

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/configure.in

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1561321

Modified: apr/apr/branches/1.5.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/configure.in?rev=1561322&r1=1561321&r2=1561322&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/configure.in (original)
+++ apr/apr/branches/1.5.x/configure.in Sat Jan 25 15:17:29 2014
@@ -1238,6 +1238,11 @@ APR_IFALLYES(header:sys/mman.h func:mmap
              [havemmaptmp="1"
               APR_DECIDE(USE_SHMEM_MMAP_TMP, 
                   [Classical mmap() on temporary file])])
+APR_IFALLYES(header:sys/mman.h func:mmap func:munmap func:shm_open dnl
+             func:shm_unlink,
+             [havemmapshm="1"
+              APR_DECIDE(USE_SHMEM_MMAP_SHM, 
+                  [mmap() via POSIX.1 shm_open() on temporary file])])
 APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
              func:shmget func:shmat func:shmdt func:shmctl,
              [haveshmget="1"
@@ -1254,11 +1259,9 @@ APR_IFALLYES(header:windows.h,
 AC_ARG_ENABLE(posix-shm,
 [  --enable-posix-shm      Use POSIX shared memory (shm_open) if available],
 [
-APR_IFALLYES(header:sys/mman.h func:mmap func:munmap func:shm_open dnl
-             func:shm_unlink,
-             [havemmapshm="1"
-              APR_DECIDE(USE_SHMEM_MMAP_SHM, 
-                  [mmap() via POSIX.1 shm_open() on temporary file])])
+if test "$havemmapshm" = "1"; then
+  APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_SHM)
+fi
 ])
 case $host in
     *linux* ) 



Mime
View raw message