You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ji...@apache.org on 2014/01/25 16:17:01 UTC
svn commit: r1561321 - /apr/apr/trunk/configure.in
Author: jim
Date: Sat Jan 25 15:17:01 2014
New Revision: 1561321
URL: http://svn.apache.org/r1561321
Log:
Maintain ordering but use OVERRIDE if enabled AND found
Modified:
apr/apr/trunk/configure.in
Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=1561321&r1=1561320&r2=1561321&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Sat Jan 25 15:17:01 2014
@@ -1150,6 +1150,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"
@@ -1166,11 +1171,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* )