MDEV-14024 PCRE2.

Related changes in the server code.

4 files changed, 2 insertions, 40 deletions

diff --git a/storage/mroonga/CMakeLists.txt b/storage/mroonga/CMakeLists.txt
index 35e0783595f..6ea264ce84c 100644
--- a/storage/mroonga/CMakeLists.txt
+++ b/storage/mroonga/CMakeLists.txt
@@ -189,11 +189,7 @@ else()
   set(MYSQL_VARIANT "MySQL")
 endif()
 
-if(EXISTS "${MYSQL_SOURCE_DIR}/pcre")
-  set(MYSQL_REGEX_INCLUDE_DIR "${MYSQL_SOURCE_DIR}/pcre")
-else()
-  set(MYSQL_REGEX_INCLUDE_DIR "${MYSQL_SOURCE_DIR}/regex")
-endif()
+set(MYSQL_REGEX_INCLUDE_DIR "${MYSQL_SOURCE_DIR}/regex")
 
 if(EXISTS "${MYSQL_SOURCE_DIR}/extra/rapidjson")
   set(MYSQL_RAPIDJSON_INCLUDE_DIR "${MYSQL_SOURCE_DIR}/extra/rapidjson/include")
diff --git a/storage/mroonga/configure.ac b/storage/mroonga/configure.ac
index b1e66904f75..3ef31bdc32e 100644
--- a/storage/mroonga/configure.ac
+++ b/storage/mroonga/configure.ac
@@ -186,11 +186,7 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[
     mysql_regex_include_dir="$ac_mysql_source_dir/extra/regex"
     MYSQL_INCLUDES="$MYSQL_INCLUDES -I$mysql_regex_include_dir"
   else
-    if test -d "$ac_mysql_source_dir/pcre"; then
-      mysql_regex_include_dir="$ac_mysql_source_dir/pcre"
-    else
-      mysql_regex_include_dir="$ac_mysql_source_dir/regex"
-    fi
+    mysql_regex_include_dir="$ac_mysql_source_dir/regex"
     MYSQL_INCLUDES="$MYSQL_INCLUDES -I$mysql_regex_include_dir"
   fi
   if test -d "$ac_mysql_source_dir/libbinlogevents"; then
diff --git a/storage/mroonga/vendor/groonga/configure.ac b/storage/mroonga/vendor/groonga/configure.ac
index 414876c6a26..cab122ad3a5 100644
--- a/storage/mroonga/vendor/groonga/configure.ac
+++ b/storage/mroonga/vendor/groonga/configure.ac
@@ -1613,30 +1613,6 @@ AC_SUBST(ONIGMO_CFLAGS)
 AC_SUBST(ONIGMO_LIBS)
 AM_CONDITIONAL(WITH_BUNDLED_ONIGMO, test "$with_onigmo" != "no" -a "x$have_onigmo" != "xyes")
 
-# PCRE
-GRN_WITH_PCRE=no
-AC_ARG_WITH(pcre,
-  [AS_HELP_STRING([--without-pcre],
-    [Don't use PCRE for groonga-httpd. [default=auto-detect]])],
-  [with_pcre="$withval"],
-  [with_pcre="auto"])
-if test "x$with_pcre" != "xno"; then
-  m4_ifdef([PKG_CHECK_MODULES], [
-    PKG_CHECK_MODULES([PCRE], [libpcre],
-      [_PKG_CONFIG(PCRE_LIBS_ONLY_L, [libs-only-L], [libpcre])
-       PCRE_LIBS_ONLY_L="$pkg_cv_PCRE_LIBS_ONLY_L"
-       GRN_WITH_PCRE=yes],
-      [GRN_WITH_PCRE=no])
-    ],
-    [GRN_WITH_PCRE=no])
-  if test "x$with_pcre" = "xyes" -a "$GRN_WITH_PCRE" != "yes"; then
-    AC_MSG_ERROR("No PCRE found")
-  fi
-fi
-AC_SUBST(GRN_WITH_PCRE)
-AC_SUBST(PCRE_CFLAGS)
-AC_SUBST(PCRE_LIBS_ONLY_L)
-
 # SSL
 GRN_WITH_SSL=no
 AC_ARG_WITH(ssl,
@@ -1788,11 +1764,6 @@ echo "groonga-httpd:"
 echo "  enable:                $enable_groonga_httpd"
 if test "$enable_groonga_httpd" = "yes"; then
   echo "  default database path: $GROONGA_HTTPD_DEFAULT_DATABASE_PATH"
-  echo "  PCRE:                  $GRN_WITH_PCRE"
-  if test "$GRN_WITH_PCRE" = "yes"; then
-    echo "    CFLAGS:              $PCRE_CFLAGS"
-    echo "    LIBS only -L:        $PCRE_LIBS_ONLY_L"
-  fi
   echo "   SSL:                  $GRN_WITH_SSL"
   if test "$GRN_WITH_SSL" = "yes"; then
     echo "    CFLAGS:              $SSL_CFLAGS"
diff --git a/storage/mroonga/vendor/groonga/tools/travis-install.sh b/storage/mroonga/vendor/groonga/tools/travis-install.sh
index 72240ec1580..d7ac400c1a9 100755
--- a/storage/mroonga/vendor/groonga/tools/travis-install.sh
+++ b/storage/mroonga/vendor/groonga/tools/travis-install.sh
@@ -23,7 +23,6 @@ case "${TRAVIS_OS_NAME}" in
     brew outdated pkg-config || brew upgrade pkg-config
     brew reinstall libtool
     brew outdated libevent || brew upgrade libevent
-    brew outdated pcre || brew upgrade pcre
     brew install \
          autoconf-archive \
          msgpack \