Merge r330246, r330257 from trunk:

* build/config_vars.sh.in: Prepend DESTDIR to paths to installed
apr/apu-config scripts.

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

Submitted by: Torsten Foertsch <torsten.foertsch gmx.net>, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@331604 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 2b182e5f136c1a251552207991b3aaf465d315a9..a2aa04d4801772d3c724273bfaa7bd4328bb1994 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.1.10
 
+  *) Fix DESTDIR=... installation when using bundled copy of APR.
+     [Torsten Foertsch <torsten.foertsch gmx.net>]
+
   *) mod_dav: Fix handling of unknown state tokens in If: headers.
      PR: 37288.  [Joe Orton]
 

diff --git a/build/config_vars.sh.in b/build/config_vars.sh.in
index 9c002f71b4432afaf94ed5e375488337d91b59e0..590803aa0f765a49022542665e458560e2d63652 100644 (file)
--- 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=@APR_CONFIG@
-APU_CONFIG=@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`"