Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1006001 - /apr/apr-util/branches/0.9.x/build/apu-conf.m4
Date: Fri, 08 Oct 2010 20:09:33 -0000
To: commits@apr.apache.org
From: rjung@apache.org
Message-Id: <20101008200933.D108223889BB@eris.apache.org>

Author: rjung
Date: Fri Oct  8 20:09:33 2010
New Revision: 1006001

URL: http://svn.apache.org/viewvc?rev=1006001&view=rev
Log:
Fix out of tree build:

Bundled expat header files are in the source
directory.

This is needed for out of tree builds, but maybe
0.9.x needs some more changes to support that.

Backport of r1003602 from 1.3.x.

Modified:
    apr/apr-util/branches/0.9.x/build/apu-conf.m4

Modified: apr/apr-util/branches/0.9.x/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/build/apu-conf.m4?rev=1006001&r1=1006000&r2=1006001&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 Oct  8 20:09:33 2010
@@ -187,7 +187,7 @@ if test "$expat_include_dir" = "$abs_src
   dnl we are working with the bundled version of the software.
   bundled_subdir="xml/expat"
   APR_SUBDIR_CONFIG($bundled_subdir, [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir])
-  expat_include_dir=$top_builddir/$bundled_subdir/lib
+  expat_include_dir=$abs_srcdir/$bundled_subdir/lib
   expat_ldflags="-L$top_builddir/$bundled_subdir/lib"
   expat_libs="-lexpat"
   expat_libtool=$top_builddir/$bundled_subdir/libexpat.la