[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] svn build fails if apr, apr-util, serf are bundled(revealed by r22832)

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-01-03 16:01:13 CET

Thanks Dan.
Yesterday over IRC Justin suggested a better solution for this.
The solution was to call APR_FIND_APR and APR_FIND_APU with absolute
source and build dirs.

Attached patch works.

Let me know what do you think.

With regards
Kamesh Jayachandran
Daniel Rall wrote:
> Kamesh, looks good. +1 to commit.
>
> - Dan
>
> On Mon, 01 Jan 2007, Kamesh Jayachandran wrote:
>
>
>> Hi,
>> Just found one more small issue with my clean VPATH build with this patch.
>>
>> The attached patch fixes that too.
>>
>> With regards
>> Kamesh Jayachandran
>>
>>
>> -----Original Message-----
>> From: Kamesh Jayachandran [mailto:kamesh@collab.net]
>> Sent: Sun 12/31/2006 9:11 PM
>> To: dev@subversion.tigris.org
>> Subject: [PATCH] svn build fails if apr, apr-util, serf are bundled(revealed by r22832)
>>
>> Hi All,
>>
>> Post r22832 svn build fails if apr, apu, serf all bundled in the subversion
>> src dir.
>>
>> The cause is bundled apr/apr-util is identified as ./apr/apr-config and
>> ./apr-util/apu-config for other consumers like serf.
>> This causes serf's configure to fail.(serf's configure is done from the
>> directory $SVN_SRC_DIR/serf. so './apr/apr-config and ./apr-util/apu-config
>> does not make sense).
>>
>> The fix is to make apr_config and apu_config as absolute path.
>>
>> While checking in r22832 I tested out only serf being bundled(apr/apr-util detected from the system), and tried other combinations like --without-neon and no --without-neon(I have neon in my system), so did not catch this.
>>
>> Find the attached patch and log.
>>
>>
>> With regards
>> Kamesh Jayachandran
>>
>>
>>
>
> Content-Description: bundled_apr_apu_needs_to_be_known_as_full_path.patch
>
> Content-Description: bundled_apr_apu_needs_to_be_known_as_full_path.log
>
>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: dev-help@subversion.tigris.org
>>

[[[
Follow up to r22832.
Post r22832 svn build fails if apr, apu, serf all bundled in the subversion
src dir.
The cause is bundled apr/apr-util is identified as ./apr/apr-config and
./apr-util/apu-config for other consumers like serf.
This causes serf's configure to fail.(serf's configure is done from the
directory $SVN_SRC_DIR/serf.)
The fix is to make apr_config and apu_config as absolute path.

* build/ac-macros/apr.m4
   (SVN_LIB_APR): invoke APR_FIND_APR with absolute source and build dir.

* build/ac-macros/aprutil.m4
   (SVN_LIB_APRUTIL): invoke APR_FIND_APU with absolute source and build dir.

Patch by: kameshj
Suggested by: jerekrantz
]]]

Index: build/ac-macros/aprutil.m4
===================================================================
--- build/ac-macros/aprutil.m4 (revision 22879)
+++ build/ac-macros/aprutil.m4 (working copy)
@@ -19,7 +19,7 @@
 
   AC_MSG_NOTICE([Apache Portable Runtime Utility (APRUTIL) library configuration])
 
- APR_FIND_APU("$srcdir/apr-util", "./apr-util", 1, [0 1])
+ APR_FIND_APU("$abs_srcdir/apr-util", "$abs_builddir/apr-util", 1, [0 1])
 
   if test $apu_found = "no"; then
     AC_MSG_WARN([APRUTIL not found])
Index: build/ac-macros/apr.m4
===================================================================
--- build/ac-macros/apr.m4 (revision 22879)
+++ build/ac-macros/apr.m4 (working copy)
@@ -14,7 +14,7 @@
 
   AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration])
 
- APR_FIND_APR("$srcdir/apr", "./apr", 1, [0 1])
+ APR_FIND_APR("$abs_srcdir/apr", "$abs_builddir/apr", 1, [0 1])
 
   if test $apr_found = "no"; then
     AC_MSG_WARN([APR not found])

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jan 3 16:00:59 2007

This is an archived mail posted to the Subversion Dev mailing list.