rbb 00/02/03 17:07:04
Modified: src/lib/apr configure.in
src/lib/apr/include apr.h.in
Log:
Cleanup the code to determine what kind of shared memory we are using. This
is still not great, but at least we are trying now.
Revision Changes Path
1.51 +34 -3 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- configure.in 2000/01/28 17:42:45 1.50
+++ configure.in 2000/02/04 01:06:46 1.51
@@ -359,9 +359,40 @@
# Shared memory support. Until I figure out how to do this well, we are hard
# coding this. I am hoping to do this more generally ASAP.
-anonymous_shm="1"
-filebased_shm="0"
-keybased_shm="0"
+ AC_ARG_ENABLE(shmem,
+ [ --enable-shmem Enable shared memory support in APR. ],
+ [ ],
+ ac_cv_enable_shmem="mm" )
+
+if test "$ac_cv_enable_shmem" = "no"; then
+ sharedmem="0"
+ anonymous_shm="0"
+ filebased_shm="0"
+ keybased_shm="0"
+else
+ if test "$ac_cv_enable_shmem" = "mm"; then
+ sharedmem="1"
+ anonymous_shm="1"
+ filebased_shm="0"
+ keybased_shm="0"
+ else
+ if test "$ac_cv_enable_shmem" = "file"; then
+ sharedmem="1"
+ anonymous_shm="0"
+ filebased_shm="1"
+ keybased_shm="0"
+ else
+ if test "$ac_cv_enable_shmem" = "key"; then
+ sharedmem="1"
+ anonymous_shm="0"
+ filebased_shm="0"
+ keybased_shm="1"
+ fi
+ fi
+ fi
+fi
+
+AC_SUBST(sharedmem)
AC_SUBST(anonymous_shm)
AC_SUBST(filebased_shm)
AC_SUBST(keybased_shm)
1.14 +5 -4 apache-2.0/src/lib/apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- apr.h.in 2000/01/28 17:42:51 1.13
+++ apr.h.in 2000/02/04 01:06:57 1.14
@@ -56,10 +56,11 @@
#endif
/* APR Feature Macros */
-#define APR_HAS_THREADS @threads@
-#define APR_HAS_SENDFILE @sendfile@
-#define APR_HAS_MMAP @mmap@
-#define APR_HAS_FORK @fork@
+#define APR_HAS_SHARED_MEMORY @sharedmem@
+#define APR_HAS_THREADS @threads@
+#define APR_HAS_SENDFILE @sendfile@
+#define APR_HAS_MMAP @mmap@
+#define APR_HAS_FORK @fork@
/* Typedefs that APR needs. */
