]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Run buildconf using the specific APR/APR-util versions if configured.
authorJoe Orton <jorton@apache.org>
Fri, 8 Nov 2019 11:02:16 +0000 (11:02 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 8 Nov 2019 11:02:16 +0000 (11:02 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1869541 13f79535-47bb-0310-9956-ffa450edef68

test/travis_run_linux.sh

index 33ffbbdb6997e332fae7fdda9ef66db3eac21a1f..dd89e325aff043cc3911571ac87ac93646366139 100755 (executable)
@@ -1,5 +1,10 @@
 #!/bin/bash -ex
-./buildconf --with-apr=/usr/bin/apr-1-config
+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
 # 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