diff options
| author | Joe Orton <jorton@apache.org> | 2005-02-11 12:00:41 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2005-02-11 12:00:41 +0000 |
| commit | a0570c8746d04d82b724932cdb9c96240cf3329d (patch) | |
| tree | 5597985b65498e809de32f0ff3ba710d70936fb2 /configure.in | |
| parent | c2f37c7a4db5fa2018de24c08aa32821e46af03d (diff) | |
| download | httpd-a0570c8746d04d82b724932cdb9c96240cf3329d.tar.gz | |
Move the POSIX reg* implementations into the ap_* namespace;
internalise the ap_reg*<->PCRE wrapper:
* configure.in: Add srclib/pcre to the include path.
* include/ap_regex.h: Renamed from include/pcreposix.h. Prefix all
constants with AP_; prefix all functions and types with ap_. Define
AP_DECLARE to nothing if necessary. Remove regcomp error codes.
* include/httpd.h: Include ap_regex.h not pcreposix.h.
(ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/.
(ap_regexec, ap_regerror): Prototypes moved to ap_regex.h.
* server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree):
Adjust for ap_ prefixed types. (ap_regexec, ap_regerror): Removed.
* server/Makefile.in: Build util_pcre.c.
* server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use
of PCRE-internals to do error mapping; rename types to add AP_/ap_
prefixes as above. Use APR includes. (ap_regerror): Use apr_snprintf.
* srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la.
* modules/*: Update to use new type and constant names.
PR: 27750 (part one)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153384 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.in b/configure.in index d663979b7a..68da73f74f 100644 --- a/configure.in +++ b/configure.in @@ -512,6 +512,7 @@ APACHE_HELP_STRING(--with-suexec-umask,umask for suexec'd process),[ dnl AP_LIBS specifies the actual libraries. note we have some required libs. AP_LIBS="$abs_builddir/srclib/pcre/libpcre.la $AP_LIBS" +APR_ADDTO(CPPFLAGS, [-I$abs_builddir/srclib/pcre]) dnl APR should go after the other libs, so the right symbols can be picked up AP_LIBS="$AP_LIBS `$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`" |