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

diff --git a/CHANGES b/CHANGES
index e90afa2b28c29df747f2688e6547d382cc0c2691..563231caac2123791dd17f7f8bfd948da55e3e38 100644 (file)
--- 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 9cda3d86c70c1f80d66332311fd1fd63f3f93644..4315aa1cc4474bf665fe65f25916777a9495e78c 100644 (file)
--- 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])