svn commit: r331604 - in /httpd/httpd/branches/2.2.x: CHANGES build/config_vars.sh.in

[jo...@apache.org]

Author: jorton
Date: Mon Nov  7 13:47:01 2005
New Revision: 331604

URL: http://svn.apache.org/viewcvs?rev=331604&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/build/config_vars.sh.in

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=331604&r1=331603&r2=331604&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Nov  7 13:47:01 2005
@@ -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]
 

Modified: httpd/httpd/branches/2.2.x/build/config_vars.sh.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/build/config_vars.sh.in?rev=331604&r1=331603&r2=331604&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/config_vars.sh.in (original)
+++ httpd/httpd/branches/2.2.x/build/config_vars.sh.in Mon Nov  7 13:47:01 2005
@@ -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`"