httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@hyperreal.com>
Subject cvs commit: apache/src Configuration.tmpl Makefile.tmpl README conf.h
Date Tue, 30 Jul 1996 19:37:03 GMT
jim         96/07/30 12:37:02

  Modified:    src       Configuration.tmpl Makefile.tmpl README conf.h
  Log:
  Allow for more logical (yeah, sure) way to add flags
  
  Revision  Changes    Path
  1.25      +27 -17    apache/src/Configuration.tmpl
  
  Index: Configuration.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -C3 -r1.24 -r1.25
  *** Configuration.tmpl	1996/07/30 18:24:50	1.24
  --- Configuration.tmpl	1996/07/30 19:36:57	1.25
  ***************
  *** 39,59 ****
    # 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) try
    # disabling use of shared memory for process management (scoreboard with
  ! # -DNO_MMAP
    
    # Status Instrumentation
    # In order for the status module to obtain full statistics Apache must
    # be modified to keep track of various information.  This is not
  ! # turned on by default. In order to enable full status details add -DSTATUS 
  ! # to the end of the CFLAGS line below.
    
    # Using SOCKS
    # Apache can be compiled to work over a SOCKS firewall by 
  ! # adding the following string to your CFLAGS define:
  ! #
  ! #  -Dconnect=Rconnect -Dselect=Rselect -Dgethostbyname=Rgethostbyname
    #
  ! # and by adding the following to the EXTRA_LIBS define:
    #
    #  -L/usr/local/lib -lsocks
    #
  --- 39,61 ----
    # 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) try
    # disabling use of shared memory for process management (scoreboard with
  ! # -DNO_MMAP) by uncommenting the line below:
  ! #NOMMAPCFLAG= -DNO_MMAP
    
    # Status Instrumentation
    # In order for the status module to obtain full statistics Apache must
    # be modified to keep track of various information.  This is not
  ! # turned on by default. In order to enable full status details uncomment
  ! # the line below:
  ! #STATCFLAG= -DSTATUS
    
    # Using SOCKS
    # Apache can be compiled to work over a SOCKS firewall by 
  ! # uncommenting the line below:
  ! #SOCKSCFLAG= -Dconnect=Rconnect -Dselect=Rselect -Dgethostbyname=Rgethostbyname
  ! 
    #
  ! # Also add the following to the EXTRA_LIBS define:
    #
    #  -L/usr/local/lib -lsocks
    #
  ***************
  *** 65,79 ****
    #  defaults in.  Note that this config file does not include DBM auth by
    #  default --- configure it in below if you need it].
    
  ! CFLAGS= -O2
  ! 
  ! # Place here any flags you may need upon linking, such as a flag to
  ! # prevent dynamic linking (if desired)
  ! LFLAGS= 
    
  ! # Place here any extra libraries you may need to link to. 
  ! # -lndbm is commonly required for DBM auth, if that is configured in.
  ! EXTRA_LIBS=
    
    # Apache requires a POSIX regex implementation. Some/most platforms provide
    # this capability, but for those that don't, Apache provides, simply for
  --- 67,77 ----
    #  defaults in.  Note that this config file does not include DBM auth by
    #  default --- configure it in below if you need it].
    
  ! # What level of optimization?
  ! OPTMCFLAG= -O2
    
  ! # Add whatever other flags you'd like here... Like, maybe -Wall
  ! XTRACFLAG=
    
    # Apache requires a POSIX regex implementation. Some/most platforms provide
    # this capability, but for those that don't, Apache provides, simply for
  ***************
  *** 81,95 ****
    # Apache code and the Apache team does not support or guarantee the code.
    # If you want to use the supplied regex package, uncomment the following
    # line (or set it equal to the regex lib on your system). ALSO: If
  ! # using this _regex_ package, be sure to #define USE_HS_POSIX in conf.h
  ! # for your platform.
    #REGLIBS=regex/libregex.a
    
    # Default to using ranlib on libraries (for regex). Set this to something else
    # if ranlib kills your system (usually by setting it again in the OS specific
    # section below)
    RANLIB=ranlib
    
    # AUX_CFLAGS are system-specific control flags.
    # NOTE: IF YOU DO NOT CHOOSE ONE OF THESE, EDIT httpd.h AND CHOOSE
    # SETTINGS FOR THE SYSTEM FLAGS. IF YOU DON'T, BAD THINGS WILL HAPPEN.
  --- 79,105 ----
    # Apache code and the Apache team does not support or guarantee the code.
    # If you want to use the supplied regex package, uncomment the following
    # line (or set it equal to the regex lib on your system). ALSO: If
  ! # using this _regex_ package, be sure to also uncomment REGINC as well
    #REGLIBS=regex/libregex.a
  + #REGINC= -Iregex
    
    # Default to using ranlib on libraries (for regex). Set this to something else
    # if ranlib kills your system (usually by setting it again in the OS specific
    # section below)
    RANLIB=ranlib
    
  + # Place here any flags you may need upon linking, such as a flag to
  + # prevent dynamic linking (if desired)
  + LFLAGS= 
  + 
  + # Place here any extra libraries you may need to link to. 
  + # -lndbm is commonly required for DBM auth, if that is configured in.
  + EXTRA_LIBS=
  + 
  + # Build CFLAGS
  + CFLAGS= $(OPTMCFLAG) $(NOMMAPCFLAG) $(STATCFLAG) $(SOCKSCFLAG) $(XTRACFLAG)
  + 
  + #
    # AUX_CFLAGS are system-specific control flags.
    # NOTE: IF YOU DO NOT CHOOSE ONE OF THESE, EDIT httpd.h AND CHOOSE
    # SETTINGS FOR THE SYSTEM FLAGS. IF YOU DON'T, BAD THINGS WILL HAPPEN.
  
  
  
  1.19      +2 -2      apache/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -C3 -r1.18 -r1.19
  *** Makefile.tmpl	1996/07/29 22:52:01	1.18
  --- Makefile.tmpl	1996/07/30 19:36:58	1.19
  ***************
  *** 8,14 ****
      md5c.o util_md5.o explain.o http_bprintf.o $(MODULES)
    
    .c.o:
  ! 	$(CC) -c $(CFLAGS) $(AUX_CFLAGS) $<
    
    all: Configuration httpd
    
  --- 8,14 ----
      md5c.o util_md5.o explain.o http_bprintf.o $(MODULES)
    
    .c.o:
  ! 	$(CC) -c $(REGINC) $(CFLAGS) $(AUX_CFLAGS) $<
    
    all: Configuration httpd
    
  ***************
  *** 38,44 ****
    
    # Work around broken compilers
    http_bprintf.o: http_bprintf.c
  ! 	$(CC) -c $(CFLAGS) $(AUX_CFLAGS) $(BROKEN_BPRINTF_FLAGS) http_bprintf.c
    
    #Dependencies
    #Core code
  --- 38,44 ----
    
    # Work around broken compilers
    http_bprintf.o: http_bprintf.c
  ! 	$(CC) -c $(REGINC) $(CFLAGS) $(AUX_CFLAGS) $(BROKEN_BPRINTF_FLAGS) http_bprintf.c
    
    #Dependencies
    #Core code
  
  
  
  1.13      +0 -4      apache/src/README
  
  Index: README
  ===================================================================
  RCS file: /export/home/cvs/apache/src/README,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -C3 -r1.12 -r1.13
  *** README	1996/07/30 18:24:51	1.12
  --- README	1996/07/30 19:36:58	1.13
  ***************
  *** 209,218 ****
         USE_LONGJMP:
          use the longjmp() call instead of siglongjmp()
    
  -      USE_HS_REGEX:
  -       Define this (and adjust Configuration as required) if you want
  -       or need to use H. Spencer's POSIX/regex package which is
  -       included.
    --
    
      NO_*:
  --- 209,214 ----
  
  
  
  1.30      +1 -5      apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -C3 -r1.29 -r1.30
  *** conf.h	1996/07/30 18:24:51	1.29
  --- conf.h	1996/07/30 19:36:59	1.30
  ***************
  *** 397,407 ****
    #include <memory.h>
    #endif
    
  ! #ifdef USE_HS_REGEX
  ! #include "regex/regex.h"
  ! #else
  ! #include <regex.h>
  ! #endif
    
    #ifdef HAVE_SYS_RESOURCE_H
    #include <sys/resource.h>
  --- 397,403 ----
    #include <memory.h>
    #endif
    
  ! #include "regex.h"
    
    #ifdef HAVE_SYS_RESOURCE_H
    #include <sys/resource.h>
  
  
  

Mime
View raw message