From: Joe Orton <jorton@apache.org>
Date: Wed, 2 Nov 2005 13:58:08 +0000 (+0000)
Subject: * build/config_vars.sh.in: Check for the *-config scripts both at the
X-Git-Tag: 2.3.0~2806
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a464e95bc9da7136acadc9879736460c115cf7c5;p=apache

* 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
---

diff --git a/build/config_vars.sh.in b/build/config_vars.sh.in
index 7b3d6177f0..590803aa0f 100644
--- a/build/config_vars.sh.in
+++ b/build/config_vars.sh.in
@@ -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`"