From: Joe Orton <jorton@apache.org>
Date: Tue, 12 Nov 2019 15:09:03 +0000 (+0000)
Subject: Install PCRE v2 (10.x) by default, add a job testing with PCRE "v1" (8.x).
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1800
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dffe41f44f478703d5b76e1fa15c36f5eb5d98d;p=thirdparty%2Fapache%2Fhttpd.git

Install PCRE v2 (10.x) by default, add a job testing with PCRE "v1" (8.x).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1869703 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.travis.yml b/.travis.yml
index eab49138394..6f1b32f67a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ addons:
       - libsystemd-dev
       - libnghttp2-dev
       - libjansson-dev
+      - libpcre2-dev
 
 matrix:
   include:
@@ -42,6 +43,10 @@ matrix:
       env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
            SKIP_TESTING=1
     # -------------------------------------------------------------------------
+    - name: Linux Ubuntu, PCRE 1, GCC 7 maintainer-mode w/-Werror
+      os: linux
+      env: CONFIG="--enable-mods-shared=reallyall --with-pcre=/usr/bin/pcre-config --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
+    # -------------------------------------------------------------------------
     - name: Linux Ubuntu, GCC 8 maintainer-mode w/-Werror
       env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-8"
            SKIP_TESTING=1
@@ -61,6 +66,7 @@ matrix:
             - libsystemd-dev
             - libnghttp2-dev
             - libjansson-dev
+            - libpcre2-dev
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, Regenerate ap_expr
       os: linux