akosut 96/10/21 21:21:47
Modified: src Configuration.tmpl Configure conf.h
Log:
Remove the BADMMAP rule, and fix HP-UX shared memory (finally).
Revision Changes Path
1.46 +2 -8 apache/src/Configuration.tmpl
Index: Configuration.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
retrieving revision 1.45
retrieving revision 1.46
diff -C3 -r1.45 -r1.46
*** Configuration.tmpl 1996/10/22 00:03:06 1.45
--- Configuration.tmpl 1996/10/22 04:21:43 1.46
***************
*** 1,4 ****
! # $Id: Configuration.tmpl,v 1.45 1996/10/22 00:03:06 jim Exp $
# Config file for the Apache httpd.
# Configuration.tmpl is the template for Configuration. Configuration should
--- 1,4 ----
! # $Id: Configuration.tmpl,v 1.46 1996/10/22 04:21:43 akosut Exp $
# Config file for the Apache httpd.
# Configuration.tmpl is the template for Configuration. Configuration should
***************
*** 53,59 ****
# functions. The format is: Rule RULE=value
#
# At present, only the following RULES are known: WANTHSREGEX, SOCKS4,
! # STATUS, BADMMAP and IRIXNIS.
#
# For all Rules, if set to "yes", then Configure knows we want that
# capability and does what is required to add it in. If set to "default"
--- 53,59 ----
# functions. The format is: Rule RULE=value
#
# At present, only the following RULES are known: WANTHSREGEX, SOCKS4,
! # STATUS and IRIXNIS.
#
# For all Rules, if set to "yes", then Configure knows we want that
# capability and does what is required to add it in. If set to "default"
***************
*** 94,107 ****
# not use this one by setting WANTHSREGEX to 'no' or commenting
# out the Rule. The "default" action is "no" unless overruled
# by OS specifics
- #
- # BADMMAP:
- # If you find that your OS can't cope with mmap (compiles OKAY but refuses
- # to run and moans "httpd: Could not mmap memory" .. or similar) set
- # this to 'yes'.
Rule WANTHSREGEX=default
- Rule BADMMAP=default
################################################################
# Module configuration
--- 94,101 ----
1.29 +3 -23 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.28
retrieving revision 1.29
diff -C3 -r1.28 -r1.29
*** Configure 1996/10/22 00:03:06 1.28
--- Configure 1996/10/22 04:21:44 1.29
***************
*** 1,5 ****
#!/bin/sh
! # $Id: Configure,v 1.28 1996/10/22 00:03:06 jim Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
--- 1,5 ----
#!/bin/sh
! # $Id: Configure,v 1.29 1996/10/22 04:21:44 akosut Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
***************
*** 112,118 ****
RULE_WANTHSREGEX=`./CutRule WANTHSREGEX $file`
RULE_STATUS=`./CutRule STATUS $file`
RULE_SOCKS4=`./CutRule SOCKS4 $file`
- RULE_BADMMAP=`./CutRule BADMMAP $file`
RULE_IRIXNIS=`./CutRule IRIXNIS $file`
#
--- 112,117 ----
***************
*** 123,129 ****
# options) as required. Setting CC and OPTIM here has no effect
# if they were set in Configure.
#
! # Also, we set DEF_WANTHSREGEX and DEF_BADMMAP to the appropriate
# value for each platform.
#
# As more PLATFORMs are added to Configuration.tmpl, be sure to
--- 122,128 ----
# options) as required. Setting CC and OPTIM here has no effect
# if they were set in Configure.
#
! # Also, we set DEF_WANTHSREGEX and to the appropriate
# value for each platform.
#
# As more PLATFORMs are added to Configuration.tmpl, be sure to
***************
*** 143,149 ****
LIBS="$LIBS -lposix -lbsd"
LFLAGS="$LFLAGS -s"
DEF_WANTHSREGEX=no
- DEF_BADMMAP=no
;;
*-ibm-aix*)
OS='IBM AIX'
--- 142,147 ----
***************
*** 172,178 ****
;;
*-sgi-irix*)
DEF_WANTHSREGEX=yes
- DEF_BADMMAP=no
DBM_LIB=""
if [ "$RULE_IRIXNIS" = "yes" ]; then
OS='SGI IRIX w/NIS'
--- 170,175 ----
***************
*** 234,240 ****
LIBS="$LIBS -lsocket -lmalloc -lprot"
OSBPRINTF="-K noinline"
DEF_WANTHSREGEX=no
- DEF_BADMMAP=no
;;
*-solaris2*)
OS='Solaris 2'
--- 231,236 ----
***************
*** 276,282 ****
esac
#
! # See if we need to override WANTHSREGEX or BADMMAP
#
if [ "$RULE_WANTHSREGEX" = "default" ]; then
if [ "x$DEF_WANTHSREGEX" = "x" ]; then
--- 272,278 ----
esac
#
! # See if we need to override WANTHSREGEX
#
if [ "$RULE_WANTHSREGEX" = "default" ]; then
if [ "x$DEF_WANTHSREGEX" = "x" ]; then
***************
*** 286,305 ****
fi
fi
- if [ "$RULE_BADMMAP" = "default" ]; then
- if [ "x$DEF_BADMMAP" = "x" ]; then
- RULE_BADMMAP=no
- else
- RULE_BADMMAP=$DEF_BADMMAP
- fi
- fi
-
# Show the final values of the rules
echo "# Platform: $OS" >> Makefile
echo "# Final Rules:" >> Makefile
echo "# Rule WANTHSREGEX=$RULE_WANTHSREGEX" >> Makefile
- echo "# Rule BADMMAP=$RULE_BADMMAP" >> Makefile
echo "###############" >> Makefile
#
--- 282,292 ----
***************
*** 359,371 ****
if [ "$RULE_WANTHSREGEX" = "yes" ]; then
REGLIB="regex/libregex.a"
INCLUDES="$INCLUDES -Iregex"
- fi
-
- #
- # Broken mmap?
- #
- if [ "$RULE_BADMMAP" = "yes" ]; then
- CFLAGS="$CFLAGS -DNO_MMAP"
fi
#
--- 346,351 ----
1.41 +2 -2 apache/src/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -C3 -r1.40 -r1.41
*** conf.h 1996/10/09 21:33:12 1.40
--- conf.h 1996/10/22 04:21:44 1.41
***************
*** 50,56 ****
*
*/
! /* $Id: conf.h,v 1.40 1996/10/09 21:33:12 chuck Exp $ */
/*
* conf.h: system-dependant #defines and includes...
--- 50,56 ----
*
*/
! /* $Id: conf.h,v 1.41 1996/10/22 04:21:44 akosut Exp $ */
/*
* conf.h: system-dependant #defines and includes...
***************
*** 110,116 ****
#define getwd(d) getcwd(d,MAX_STRING_LEN)
#endif
#define JMP_BUF sigjmp_buf
! #define HAVE_MMAP
typedef int rlim_t;
#elif defined(AIX)
--- 110,116 ----
#define getwd(d) getcwd(d,MAX_STRING_LEN)
#endif
#define JMP_BUF sigjmp_buf
! #define HAVE_SHMGET
typedef int rlim_t;
#elif defined(AIX)
