Permit --with-apr=/path/to/apr alone, where the default path will

be handled by replacing all /apr path segments with /apr-util
(or /aprutil) to handle nearly any developer's path scheme.  One
rare exception would be /asf/srcs/aprutil/trunk/apr-util or similar
where both /aprutil and /apr-util path segments exist.

So for example --with-apr=../apr-1.3 would find either ../apr-util-1.3
or ../aprutil-1.3 before looking for srclib/apr-util or ../apr-util.

These refer to source trees.  httpd ./configure deserves a similar
feature to use --with-apr= for an installed apr-util lib tree.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@687939 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/buildconf b/buildconf
index 6a50c16985d9db90bb4ad88da353f02319c988ba..706751ca1548f2c799ae3517d358b19b6f87a09e 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -23,7 +23,7 @@
 # can be overridden with --with-apr=[dir] and --with-apr-util=[dir]
 
 apr_src_dir="srclib/apr ../apr"
-apu_src_dir="srclib/apr-util ../apr-util"
+apu_src_dir=""
 
 while test $# -gt 0 
 do
@@ -78,6 +78,12 @@ if [ $apr_found -lt 1 ]; then
     should_exit=1
 fi
 
+if test -z "$apu_src_dir"; then
+    apu_src_dir=`echo $apr_src_dir | sed -e 's#/apr#/apr-util#g;'`
+    apu_src_dir="$apu_src_dir `echo $apr_src_dir | sed -e 's#/apr#/aprutil#;g'`"
+    apu_src_dir="$apu_src_dir srclib/apr-util ../apr-util"
+fi
+
 for dir in $apu_src_dir
 do
     if [ -f "${dir}/Makefile.in" ]; then