VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-06 11:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

* build/config_vars.sh.in: Check for the *-config scripts both at the

Browse Source 
DESTDIR-relocated path and at the not-relocated path, to cope with
both builds with and without the bundled APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@330257 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2005-11-02 13:58:08 +00:00
parent 81a4bc28d1
commit a464e95bc9
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build/config_vars.sh.in
View File

@ -21,8 +21,19 @@
# installed. Such a file cannot be generated at configure-time, since it
# requires the output of the *installed* ap*-config scripts.
APR_CONFIG=${DESTDIR}@APR_CONFIG@
APU_CONFIG=${DESTDIR}@APU_CONFIG@
# For a DESTDIR=... installation using the bundled copies of
# apr/apr-util, the installed ap?-config scripts must be found
# in the DESTDIR-relocated install tree. For a DESTDIR=...
# installation when using *external* copies of apr/apr-util,
# the absolute path must be used, not DESTDIR-relocated.
if test -f ${DESTDIR}@APR_CONFIG@; then
APR_CONFIG=${DESTDIR}@APR_CONFIG@
APU_CONFIG=${DESTDIR}@APU_CONFIG@
else
APR_CONFIG=@APR_CONFIG@
APU_CONFIG=@APU_CONFIG@
fi
APR_LIBTOOL="`${APR_CONFIG} --apr-libtool`"
APR_INCLUDEDIR="`${APR_CONFIG} --includedir`"