From commits-return-11579-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Fri Oct 01 18:03:54 2010 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 57192 invoked from network); 1 Oct 2010 18:03:54 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Oct 2010 18:03:54 -0000 Received: (qmail 85791 invoked by uid 500); 1 Oct 2010 18:03:54 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 85679 invoked by uid 500); 1 Oct 2010 18:03:53 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 85671 invoked by uid 99); 1 Oct 2010 18:03:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Oct 2010 18:03:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Oct 2010 18:03:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C787C23888FD; Fri, 1 Oct 2010 18:03:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1003601 - /apr/apr-util/branches/1.5.x/build/apu-conf.m4 Date: Fri, 01 Oct 2010 18:03:32 -0000 To: commits@apr.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101001180332.C787C23888FD@eris.apache.org> Author: rjung Date: Fri Oct 1 18:03:32 2010 New Revision: 1003601 URL: http://svn.apache.org/viewvc?rev=1003601&view=rev Log: Fix out of tree build: Bundled expat header files are in the source directory. No regression. Modified: apr/apr-util/branches/1.5.x/build/apu-conf.m4 Modified: apr/apr-util/branches/1.5.x/build/apu-conf.m4 URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/build/apu-conf.m4?rev=1003601&r1=1003600&r2=1003601&view=diff ============================================================================== --- apr/apr-util/branches/1.5.x/build/apu-conf.m4 (original) +++ apr/apr-util/branches/1.5.x/build/apu-conf.m4 Fri Oct 1 18:03:32 2010 @@ -164,7 +164,7 @@ if test "${apu_has_expat}${apu_try_built 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]) - APR_ADDTO(APRUTIL_INCLUDES, [-I$top_builddir/$bundled_subdir/lib]) + APR_ADDTO(APRUTIL_INCLUDES, [-I$abs_srcdir/$bundled_subdir/lib]) APR_ADDTO(LDFLAGS, [-L$top_builddir/$bundled_subdir/lib]) apu_expat_libs="$top_builddir/$bundled_subdir/libexpat.la" fi