summaryrefslogtreecommitdiffstats
path: root/buildconf
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2011-11-10 23:22:01 +0100
committerJoe Orton <jorton@apache.org>2011-11-10 23:22:01 +0100
commit0513255be6a7a2a769bebaf292bedec5082c1c3a (patch)
treee5c938f43cbc3769d195ae0eb6276c113b28d34f /buildconf
parenthave libapreq install honor the top level layout options (diff)
downloadapache2-0513255be6a7a2a769bebaf292bedec5082c1c3a.tar.xz
apache2-0513255be6a7a2a769bebaf292bedec5082c1c3a.zip
* buildconf: Pass through APR source dir to apreq's buildconf.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200600 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'buildconf')
-rwxr-xr-xbuildconf6
1 files changed, 3 insertions, 3 deletions
diff --git a/buildconf b/buildconf
index c2e425bdcc..56c375d9ba 100755
--- a/buildconf
+++ b/buildconf
@@ -161,16 +161,16 @@ if [ "$apr_src_dir" = "srclib/apr" ]; then
rm -f srclib/apr/apr.spec
fi
+apr_src_dir=`cd $apr_src_dir && pwd`
+
apreq_configure="srclib/libapreq"
echo
echo rebuilding $apreq_configure
-(cd srclib/libapreq && ./buildconf) || {
+(cd srclib/libapreq && ./buildconf --with-apr="$apr_src_dir") || {
echo "./buildconf failed for apreq"
exit 1
}
-apr_src_dir=`cd $apr_src_dir && pwd`
-
if [ $apr_major_version -lt 2 ] ; then
if [ "$apu_src_dir" = "srclib/apr-util" ]; then
echo rebuilding $aprutil_configure