apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r374805 - in /apr/apr-util/trunk: CHANGES build/apu-conf.m4 buildconf
Date Sat, 04 Feb 2006 01:15:04 GMT
Author: wrowe
Date: Fri Feb  3 17:14:55 2006
New Revision: 374805

URL: http://svn.apache.org/viewcvs?rev=374805&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.
  
Reviewed by: rooneg, maxb

Modified:
    apr/apr-util/trunk/CHANGES
    apr/apr-util/trunk/build/apu-conf.m4
    apr/apr-util/trunk/buildconf

Modified: apr/apr-util/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/CHANGES?rev=374805&r1=374804&r2=374805&view=diff
==============================================================================
--- apr/apr-util/trunk/CHANGES (original)
+++ apr/apr-util/trunk/CHANGES Fri Feb  3 17:14:55 2006
@@ -1,5 +1,13 @@
 Changes with APR-util 1.3.0
 
+  *) 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.
+     [William Rowe]
+
   *) Fix the escape implementations for the sqlite2 and sqlite3 dbd
      back ends.
      [Ronen Mizrahi <ronen tversity.com>, Garrett Rooney]

Modified: apr/apr-util/trunk/build/apu-conf.m4
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/build/apu-conf.m4?rev=374805&r1=374804&r2=374805&view=diff
==============================================================================
--- apr/apr-util/trunk/build/apu-conf.m4 (original)
+++ apr/apr-util/trunk/build/apu-conf.m4 Fri Feb  3 17:14:55 2006
@@ -147,6 +147,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/trunk/buildconf
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/buildconf?rev=374805&r1=374804&r2=374805&view=diff
==============================================================================
--- apr/apr-util/trunk/buildconf (original)
+++ apr/apr-util/trunk/buildconf Fri Feb  3 17:14:55 2006
@@ -38,8 +38,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
@@ -84,17 +83,9 @@
 $apr_src_dir/build/gen-build.py make
 
 #
-# If apr-iconv, then go and configure it.
-#
-if test -d ../apr-iconv; then
-  echo "Invoking ../apr-iconv/buildconf.sh ..."
-  (cd ../apr-iconv; ./buildconf)
-fi
-
-#
 # 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



Mime
View raw message