diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2019-12-17 01:37:59 +0400 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-12-21 10:34:02 +0100 |
| commit | 9dadfdcde5a63a4d67f0f7a3720632bcb1d589d7 (patch) | |
| tree | 5fd6298b3dfe07cc08bd6ffebbe65081818c13ac /storage/mroonga/vendor | |
| parent | ce70573f6255d2720c39309e0d41e181dab2d685 (diff) | |
| download | mariadb-git-9dadfdcde5a63a4d67f0f7a3720632bcb1d589d7.tar.gz | |
MDEV-14024 PCRE2.
Related changes in the server code.
Diffstat (limited to 'storage/mroonga/vendor')
| -rw-r--r-- | storage/mroonga/vendor/groonga/configure.ac | 29 | ||||
| -rwxr-xr-x | storage/mroonga/vendor/groonga/tools/travis-install.sh | 1 |
2 files changed, 0 insertions, 30 deletions
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 \ |