rbb 99/12/10 12:22:08
Modified: src/include ap_ac_config.h
src/main config.m4
Log:
We now make the decision to USE_MMAP_FILES based on whether or not APR
has MMAP. If APR_HAS_MMAP is true then USE_MMAP_FILES is true. We also
no longer check for MMAP in autoconf within Apache. Apache relies on APR
to give us MMAP functionality, and therefore doesn't need to check for
itself.
Revision Changes Path
1.4 +11 -0 apache-2.0/src/include/ap_ac_config.h
Index: ap_ac_config.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_ac_config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ap_ac_config.h 1999/12/05 08:29:27 1.3
+++ ap_ac_config.h 1999/12/10 20:22:05 1.4
@@ -67,9 +67,11 @@
#ifdef WIN32
#include "ap_config_win32.h"
#include "../os/win32/os.h"
+#include "apr_win.h"
#else
#include "ap_config_auto.h"
#include "os.h"
+#include "apr.h"
#endif /* WIN32 */
#ifdef STDC_HEADERS
@@ -301,6 +303,15 @@
#define XtOffsetOf(s_type,field) offsetof(s_type,field)
#else
#define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
+#endif
+
+#undef PACKAGE
+#undef VERSION
+
+#if APR_HAS_MMAP
+#define USE_MMAP_FILES 1
+#else
+#undef USE_MMAP_FILES
#endif
#endif /* AP_AC_CONFIG_H */
1.3 +0 -6 apache-2.0/src/main/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/config.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.m4 1999/12/01 01:16:09 1.2
+++ config.m4 1999/12/10 20:22:07 1.3
@@ -46,9 +46,3 @@
difftime \
syslog \
)
-AC_FUNC_MMAP
-
-dnl XXX - is autoconf's detection routine good enough?
-if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then
- AC_DEFINE(USE_MMAP_FILES)
-fi
