rbb 01/08/13 22:15:00
Modified: . CHANGES configure.in
Log:
Fix the new shared memory configure script. The APR_DECIDE
macros go in order, so the last set of dependancies that are
met are the ones used. That means that when using those macros,
options should be listed with the least desirable option first,
and the most desirable last. The new shared memory routines did
the opposite, so we chose the wrong shared memory option on Linux.
CS: Obtained from:
Revision Changes Path
1.138 +8 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- CHANGES 2001/08/13 21:49:08 1.137
+++ CHANGES 2001/08/14 05:14:59 1.138
@@ -1,5 +1,13 @@
Changes with APR b1
+ *) Fix the new shared memory configure script. The APR_DECIDE
+ macros go in order, so the last set of dependancies that are
+ met are the ones used. That means that when using those macros,
+ options should be listed with the least desirable option first,
+ and the most desirable last. The new shared memory routines did
+ the opposite, so we chose the wrong shared memory option on Linux.
+ [Ryan Bloom]
+
*) Move the necessary shared memory code from MM into APR and remove
our dependency upon MM. [Justin Erenkrantz]
1.357 +12 -12 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- configure.in 2001/08/13 21:49:08 1.356
+++ configure.in 2001/08/14 05:14:59 1.357
@@ -394,22 +394,22 @@
dnl Now we determine which one is our preference.
APR_BEGIN_DECISION([shared memory allocation method])
-APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
- APR_DECIDE(USE_SHMEM_MMAP_TMP,
- [Classical mmap() on temporary file]))
+APR_IFALLYES(header:sys/mman.h func:mmap func:munmap define:MAP_ANON,
+ APR_DECIDE(USE_SHMEM_MMAP_ANON,
+ [4.4BSD-style mmap() via MAP_ANON]))
+APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
+ func:shmget func:shmat func:shmdt func:shmctl,
+ APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()]))
+APR_IFALLYES(header:sys/mman.h func:mmap func:munmap file:/dev/zero,
+ APR_DECIDE(USE_SHMEM_MMAP_ZERO,
+ [SVR4-style mmap() on /dev/zero]))
APR_IFALLYES(header:sys/mman.h func:mmap func:munmap func:shm_open dnl
func:shm_unlink,
APR_DECIDE(USE_SHMEM_MMAP_SHM,
[mmap() via POSIX.1 shm_open() on temporary file]))
-APR_IFALLYES(header:sys/mman.h func:mmap func:munmap file:/dev/zero,
- APR_DECIDE(USE_SHMEM_MMAP_ZERO,
- [SVR4-style mmap() on /dev/zero]))
-APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
- func:shmget func:shmat func:shmdt func:shmctl,
- APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()]))
-APR_IFALLYES(header:sys/mman.h func:mmap func:munmap define:MAP_ANON,
- APR_DECIDE(USE_SHMEM_MMAP_ANON,
- [4.4BSD-style mmap() via MAP_ANON]))
+APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
+ APR_DECIDE(USE_SHMEM_MMAP_TMP,
+ [Classical mmap() on temporary file]))
APR_IFALLYES(header:kernel/OS.h func:create_area,
APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas]))
APR_END_DECISION
