Commit 2350936e authored by Joe Orton's avatar Joe Orton
Browse files

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

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
parent 52a4f356

build/config_vars.sh.in

+11 −0
Changes for build/config_vars.sh.in: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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.



# 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`"