svn commit: r1869543 - /httpd/httpd/trunk/test/travis_run_linux.sh

[jo...@apache.org]

Author: jorton
Date: Fri Nov  8 11:23:19 2019
New Revision: 1869543

URL: http://svn.apache.org/viewvc?rev=1869543&view=rev
Log:
Revert r1869541 and always run httpd's buildconf against the Debian APR,
which does include the *.m4 files.

Modified:
    httpd/httpd/trunk/test/travis_run_linux.sh

Modified: httpd/httpd/trunk/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1869543&r1=1869542&r2=1869543&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_run_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_run_linux.sh Fri Nov  8 11:23:19 2019
@@ -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