jim 96/07/30 11:24:53
Modified: src Configuration.tmpl README conf.h Log: more cleanup for regex selection Revision Changes Path 1.24 +3 -1 apache/src/Configuration.tmpl Index: Configuration.tmpl =================================================================== RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.23 retrieving revision 1.24 diff -C3 -r1.23 -r1.24 *** Configuration.tmpl 1996/07/29 22:52:00 1.23 --- Configuration.tmpl 1996/07/30 18:24:50 1.24 *************** *** 80,86 **** # convenience, a regex implementation. The regex code is NOT official # 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) #REGLIBS=regex/libregex.a # Default to using ranlib on libraries (for regex). Set this to something else --- 80,88 ---- # convenience, a regex implementation. The regex code is NOT official # 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 1.12 +10 -0 apache/src/README Index: README =================================================================== RCS file: /export/home/cvs/apache/src/README,v retrieving revision 1.11 retrieving revision 1.12 diff -C3 -r1.11 -r1.12 *** README 1996/07/29 23:26:44 1.11 --- README 1996/07/30 18:24:51 1.12 *************** *** 186,191 **** --- 186,196 ---- HAVE_SYS_SELECT_H: Define if the OS has the <sys/select.h> header file. + + HAVE_SYS_RESOURCE_H: + Define if the OS has and supports the getrlimit/setrlimit + family. Apache uses this to determine if RLIMIT_CPU|VMEM|DATA|RLIMIT + is found and used. -- USE_*: *************** *** 203,208 **** --- 208,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_*: 1.29 +5 -0 apache/src/conf.h Index: conf.h =================================================================== RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C3 -r1.28 -r1.29 *** conf.h 1996/07/27 21:39:45 1.28 --- conf.h 1996/07/30 18:24:51 1.29 *************** *** 396,402 **** --- 396,407 ---- #ifndef QNX #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>