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

[PATCH]use the bundled(if available) serf

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2006-12-28 13:40:29 CET

Hi All,
Find the attached patch and log.

With regards
Kamesh Jayachandran

[[[

Use bundled serf if user has not specified where to look for serf and
neon is not available or configured for '--without-neon'.

* build/ac-macros/serf.m4
  (SVN_LIB_SERF):
   If not configured with --with-serf, see the availablity of bundled serf.
   If bundled serf is available, set 'serf_found=reconfig'.
   If you use bundled serf, don't assume apr and apr-util also would be
   bundled, they may not. So build the bundled serf with detected apr and apu.
   For bundled serf set SVN_SERF_INCLUDES as serf source dir(bundle),
   set SVN_SERF_LIBS to be builddir/serf/libserf-0.la.

Patch by: kameshj
]]]

Index: build/ac-macros/serf.m4
===================================================================
--- build/ac-macros/serf.m4 (revision 22823)
+++ build/ac-macros/serf.m4 (working copy)
@@ -29,12 +29,20 @@
         LDFLAGS="$save_ldflags"])
       CPPFLAGS="$save_cppflags"
     fi
- ])
+ ], [
+ if test -d "$srcdir/serf" -a "$svn_lib_neon" = "no"; then
+ serf_found=reconfig
+ fi
+ ])
 
- svn_lib_serf=$serf_found
 
   if test $serf_found = "reconfig"; then
- SVN_EXTERNAL_PROJECT([serf], [--with-apr=../apr --with-apr-util=../apr-util])
+ SVN_EXTERNAL_PROJECT([serf], [--with-apr=$apr_config --with-apr-util=$apu_config])
+ serf_prefix=$prefix
+ SVN_SERF_PREFIX="$serf_prefix"
+ SVN_SERF_INCLUDES="-I$srcdir/serf"
+ SVN_SERF_LIBS="$abs_builddir/serf/libserf-0.la"
+ SVN_SERF_EXPORT_LIBS="-L$serf_prefix/lib -lserf-0"
   fi
 
   if test $serf_found = "yes"; then
@@ -42,8 +50,12 @@
     SVN_SERF_INCLUDES="-I$serf_prefix/include/serf-0"
     SVN_SERF_LIBS="$serf_prefix/lib/libserf-0.la"
     SVN_SERF_EXPORT_LIBS="-L$serf_prefix/lib -lserf-0"
+ elif test $serf_found = "reconfig"; then
+ serf_found=yes
   fi
 
+ svn_lib_serf=$serf_found
+
   AC_SUBST(SVN_SERF_PREFIX)
   AC_SUBST(SVN_SERF_INCLUDES)
   AC_SUBST(SVN_SERF_LIBS)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Dec 28 13:40:09 2006

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