From c4965acb8b23ccb8dca5dccbfb02ee3324222931 Mon Sep 17 00:00:00 2001
From: Rainer Jung <rjung@apache.org>
Date: Wed, 8 Nov 2017 23:58:16 +0000
Subject: [PATCH] Fix pcre feature detection in configure when using pcre2.
 Follow up to r1773454.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1814662 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES      | 6 ++++--
 configure.in | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index e90afa2b28..563231caac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,9 @@
                                                          -*- coding: utf-8 -*-
-Changes with Apache 2.5.0-alpha
+Changes with Apache 2.5.1
+
+  *) core: fix pcre feature detection in configure when using pcre2.  [Rainer Jung]
 
-Changes with Apache 2.5.0
+Changes with Apache 2.5.0-alpha
 
   *) mod_macro: fix usability of globally defined macros in .htaccess files.
      PR 57525.  [Jose Kahan <jose w3.org>, Yann Ylavic]
diff --git a/configure.in b/configure.in
index 9cda3d86c7..4315aa1cc4 100644
--- a/configure.in
+++ b/configure.in
@@ -284,10 +284,14 @@ save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $PCRE_INCLUDES"
 AC_EGREP_CPP(yes,
 [
+#ifdef HAVE_PCRE2
+yes
+#else
 #include <pcre.h>
 #ifdef PCRE_DUPNAMES
 yes
 #endif
+#endif
 ],pcre_have_dupnames=yes,pcre_have_dupnames=no)
 if test "$pcre_have_dupnames" != "yes"; then
     AC_MSG_ERROR([pcre version does not support PCRE_DUPNAMES])
-- 
2.40.0