diff options
| author | Rainer Jung <rjung@apache.org> | 2014-07-23 19:01:45 +0000 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2014-07-23 19:01:45 +0000 |
| commit | 165f9ffcdd09426da19a57e1d8566452e8731462 (patch) | |
| tree | acd7158bff2799783555d9fbe6e2dcfe8effbf4c | |
| parent | 0d2710e0d513b87e9d26f379db16250470fcf6e0 (diff) | |
| download | httpd-165f9ffcdd09426da19a57e1d8566452e8731462.tar.gz | |
Check for correct minimum PCRE version in configure,
do not check in source code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1612921 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | server/util_pcre.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/configure.in b/configure.in index e0d1094e3d..c28d5311b9 100644 --- a/configure.in +++ b/configure.in @@ -236,7 +236,9 @@ if test "$PCRE_CONFIG" != "false"; then fi case `$PCRE_CONFIG --version` in [[1-5].*]) - AC_MSG_ERROR([Need at least pcre version 6.0]) + AC_MSG_ERROR([Need at least pcre version 6.7]) + [6.[0-6]*]) + AC_MSG_ERROR([Need at least pcre version 6.7]) ;; esac AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG]) diff --git a/server/util_pcre.c b/server/util_pcre.c index de7bdb3311..4d2adef25b 100644 --- a/server/util_pcre.c +++ b/server/util_pcre.c @@ -125,12 +125,7 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t * preg, const char *pattern, int cflags) const char *errorptr; int erroffset; int errcode = 0; - /* PCRE_DUPNAMES is only present since version 6.7 of PCRE */ -#ifdef PCRE_DUPNAMES int options = PCRE_DUPNAMES; -#else -#error PCRE_DUPNAMES does not exist in this PCRE implementation; too old. -#endif if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS; |