Author: wrowe
Date: Fri Feb  3 17:20:52 2006
New Revision: 374808

URL: http://svn.apache.org/viewcvs?rev=374808&view=rev
Log:
  Fix VPATH builds, and symlink builds where apr and apr-util 
  reside in parallel as symlinks to directories with more explicit
  names, e.g. apr-1.x and apr-util-1.x.  This solves various breakage
  on Solaris in particular with ./buildconf and ./configure.  Also
  eliminated the nested ../apr-iconv/buildconf, given that apr-util
  didn't bother with ../apr/buildconf, and this was inconsistant.

Reviewed by: rooneg, Max Bowsher
Backports: 374805

Modified:
    apr/apr-util/branches/0.9.x/CHANGES
    apr/apr-util/branches/0.9.x/build/apu-conf.m4
    apr/apr-util/branches/0.9.x/buildconf
    apr/apr-util/branches/0.9.x/configure.in

Modified: apr/apr-util/branches/0.9.x/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/CHANGES?rev=374808&r1=374807&r2=374808&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/CHANGES (original)
+++ apr/apr-util/branches/0.9.x/CHANGES Fri Feb  3 17:20:52 2006
@@ -1,5 +1,11 @@
 Changes with APR-util 0.9.9
 
+  *) Fix VPATH builds, and symlink builds where apr and apr-util 
+     reside in parallel as symlinks to directories with more explicit
+     names, e.g. apr-1.x and apr-util-1.x.  This solves various breakage
+     on Solaris in particular with ./buildconf and ./configure.
+     [William Rowe]
+
   *) Add support for Berkeley DB 4.4 to the configure scripts.
      [Garrett Rooney]
 

Modified: apr/apr-util/branches/0.9.x/build/apu-conf.m4
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/build/apu-conf.m4?rev=374808&r1=374807&r2=374808&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/build/apu-conf.m4 (original)
+++ apr/apr-util/branches/0.9.x/build/apu-conf.m4 Fri Feb  3 17:20:52 2006
@@ -134,6 +134,12 @@
     AC_MSG_ERROR([a directory must be specified for --with-expat])
   elif test "$withval" = "no"; then
     AC_MSG_ERROR([Expat cannot be disabled (at this time)])
+  elif test "$withval" = "builtin"; then
+    abs_expatdir="`cd $srcdir/xml/expat && pwd`"
+    if test -d $abs_expatdir/. -a ! -d xml/expat/.; then
+      $mkdir_p xml/expat
+    fi
+    APU_TEST_EXPAT($abs_expatdir, xml/expat)
   else
     abs_expatdir="`cd $withval && pwd`"
     APU_TEST_EXPAT($abs_expatdir, $withval)

Modified: apr/apr-util/branches/0.9.x/buildconf
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/buildconf?rev=374808&r1=374807&r2=374808&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/buildconf (original)
+++ apr/apr-util/branches/0.9.x/buildconf Fri Feb  3 17:20:52 2006
@@ -21,8 +21,7 @@
   shift
 done
 
-if test -d "$apr_src_dir"
-then
+if [ -f "$apr_src_dir/build/apr_common.m4" ]; then
   echo ""
   echo "Looking for apr source in $apr_src_dir"
 else
@@ -61,7 +60,7 @@
 #
 # If Expat has been bundled, then go and configure the thing
 #
-if test -d xml/expat; then
+if [ -f xml/expat/buildconf.sh ]; then
   echo "Invoking xml/expat/buildconf.sh ..."
   (cd xml/expat; ./buildconf.sh)
 fi

Modified: apr/apr-util/branches/0.9.x/configure.in
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/configure.in?rev=374808&r1=374807&r2=374808&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/configure.in (original)
+++ apr/apr-util/branches/0.9.x/configure.in Fri Feb  3 17:20:52 2006
@@ -186,8 +186,7 @@
 fi
 
 if test ! -d "$top_builddir/include/private"; then
-    mkdir $top_builddir/include
-    mkdir $top_builddir/include/private
+    $mkdir_p $top_builddir/include/private
 fi
 
 dnl