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

diff --git a/configure.in b/configure.in
index e0d1094e3dce4e526920884576b6482f81057234..c28d5311b9c0c20e459e56a84be07343c681c594 100644 (file)
--- 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 de7bdb33110497a5dfb724ed6d01ce10f7020699..4d2adef25b67d20f430a568808d2d5eca5ccbd5c 100644 (file)
--- 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;