svn commit: r330257 - /httpd/httpd/trunk/build/config_vars.sh.in

[jo...@apache.org]

Author: jorton
Date: Wed Nov  2 05:58:08 2005
New Revision: 330257

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

Modified:
    httpd/httpd/trunk/build/config_vars.sh.in

Modified: httpd/httpd/trunk/build/config_vars.sh.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/build/config_vars.sh.in?rev=330257&r1=330256&r2=330257&view=diff
==============================================================================
--- httpd/httpd/trunk/build/config_vars.sh.in (original)
+++ httpd/httpd/trunk/build/config_vars.sh.in Wed Nov  2 05:58:08 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=${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`"