From: Joe Orton <jorton@apache.org>
Date: Fri, 8 Nov 2019 11:23:19 +0000 (+0000)
Subject: Revert r1869541 and always run httpd's buildconf against the Debian APR,
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1810
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a55a801e7489a0b0d8785117857b065509ad226;p=thirdparty%2Fapache%2Fhttpd.git

Revert r1869541 and always run httpd's buildconf against the Debian APR,
which does include the *.m4 files.


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

diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index dd89e325aff..37b74877fe8 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -1,10 +1,7 @@
 #!/bin/bash -ex
-if test -v APR_VERSION -a -v APU_VERSION; then
-    ./buildconf --with-apr=$HOME/root/apr-${APR_VERSION}/bin/apr-1-config \
-                --with-apr-util=$HOME/root/apu-${APU_VERSION}/bin/apu-1-config
-else
-    ./buildconf --with-apr=/usr/bin/apr-1-config
-fi
+### Installed apr/apr-util don't include the *.m4 files but the
+### Debian packages helpfully install them, so use the system APR to buildconf
+./buildconf --with-apr=/usr/bin/apr-1-config
 # For trunk, "make check" is sufficient to run the test suite.
 # For 2.4.x, the test suite must be run manually
 if test ! -v SKIP_TESTING; then