svn commit: r388596 - /apr/apr-util/branches/1.2.x/buildconf

[wr...@apache.org]

Author: wrowe
Date: Fri Mar 24 10:24:15 2006
New Revision: 388596

URL: http://svn.apache.org/viewcvs?rev=388596&view=rev
Log:

  Version guard, protect against finding an installed apr-1.1.x
  or earlier version installed.  Also guards the source path
  when these packages are configured within symlinks.

Backports 388595

Modified:
    apr/apr-util/branches/1.2.x/buildconf

Modified: apr/apr-util/branches/1.2.x/buildconf
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/buildconf?rev=388596&r1=388595&r2=388596&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/buildconf (original)
+++ apr/apr-util/branches/1.2.x/buildconf Fri Mar 24 10:24:15 2006
@@ -19,7 +19,15 @@
 
 # Default place to look for apr source.  Can be overridden with 
 #   --with-apr=[directory]
+
 apr_src_dir=../apr
+apr_config=`which apr-1-config`
+if test $? -eq 0; then
+    apr_minorver=`$apr_config --version|cut -d. -s -f2`
+    if test $apr_minorver -ge 2; then
+        apr_src_dir=`$apr_config --srcdir`
+    fi
+fi
 
 while test $# -gt 0 
 do
@@ -39,6 +47,7 @@
 done
 
 if [ -f "$apr_src_dir/build/apr_common.m4" ]; then
+  apr_src_dir=`cd $apr_src_dir; pwd`
   echo ""
   echo "Looking for apr source in $apr_src_dir"
 else