From: Joe Orton <jorton@apache.org>
Date: Tue, 12 Nov 2019 09:02:31 +0000 (+0000)
Subject: Update APR version requirement to 1.6 or later per rough consensus on
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1802
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7994f495995ebc3ba3d1ceaaee0aa3149d0891ac;p=thirdparty%2Fapache%2Fhttpd.git

Update APR version requirement to 1.6 or later per rough consensus on
dev@ (see list thread from msgid <20191108094020.GA12979@redhat.com>).

* configure.in: Fail with APR < 1.6.

* .travis.yml: Build on Bionic by default, only build w/APR 1.5.x for
  the 2.4.x branch.


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

diff --git a/.travis.yml b/.travis.yml
index 1b1dd8ca7a6..f3551897deb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 language: c
 os:
   - linux
+dist:
+  - bionic
 cache:
   directories:
     - /home/travis/perl5
@@ -35,14 +37,8 @@ matrix:
     - name: Linux Ubuntu, Shared MPMs, all-modules
       env: CONFIG="--enable-mods-shared=reallyall --enable-mpms-shared=all"
     # -------------------------------------------------------------------------
-    - name: Linux Ubuntu Bionic, all-modules
+    - name: Linux Ubuntu, GCC 7 maintainer-mode w/-Werror
       os: linux
-      dist: bionic
-      env: CONFIG="--enable-mods-shared=reallyall"
-    # -------------------------------------------------------------------------
-    - name: Linux Ubuntu Bionic, GCC 7 maintainer-mode w/-Werror
-      os: linux
-      dist: bionic
       env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
            SKIP_TESTING=1
     # -------------------------------------------------------------------------
@@ -66,11 +62,17 @@ matrix:
             - libnghttp2-dev
             - libjansson-dev
     # -------------------------------------------------------------------------
-    - if: branch = trunk
+    - if: branch != 2.4.x
       name: Linux Ubuntu, APR trunk
       env: APR_VERSION=trunk APR_CONFIG="--with-crypto"
            CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
+    - if: branch = 2.4.x
+      name: Linux Ubuntu Xenial, all-modules
+      os: linux
+      dist: xenial
+      env: CONFIG="--enable-mods-shared=reallyall"
+    # -------------------------------------------------------------------------
     - name: Linux Ubuntu, APR 1.7.0, APR-util 1.6.1
       env: APR_VERSION=1.7.0 APU_VERSION=1.6.1
            CONFIG="--enable-mods-shared=reallyall"
@@ -82,7 +84,8 @@ matrix:
            APU_CONFIG="--with-crypto"
            CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
-    - name: Linux Ubuntu, APR 1.5.1, APR-util 1.5.4
+    - if: branch = 2.4.x
+      name: Linux Ubuntu, APR 1.5.1, APR-util 1.5.4
       env: APR_VERSION=1.5.1 APU_VERSION=1.5.4
            CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index 6199f6daf71..3974f3327ec 100644
--- a/configure.in
+++ b/configure.in
@@ -96,8 +96,8 @@ else
   APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1 2, [
     version=`$apr_config --version`
     case x${version} in
-    x1.[[0-3]].*) 
-      AC_MSG_WARN([APR version 1.4.0 or later is required, found $version])
+    x1.[[0-5]].*)
+      AC_MSG_WARN([APR version 1.6.0 or later is required, found $version])
       apr_acceptable=no
       ;;
     esac