Checkout Tools
  • last updated 1 hour ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 867044 is being indexed.

* (AC_PREREQ): Require autoconf >= 2.58.


* build/ac-macros/apache.m4:

* build/ac-macros/java.m4:

* build/ac-macros/neon.m4:

* build/ac-macros/serf.m4:

* build/ac-macros/sqlite.m4:

* build/ac-macros/svn-macros.m4:

* build/ac-macros/swig.m4:

* build/ac-macros/zlib.m4:


  1. … 8 more files in changeset.
Add in LDFLAGS before looking for the serf library in case APR or APR-util

need some dependencies.

* build/ac-macros/serf.m4

(SVN_LIB_SERF): Add in pre-existing $LDFLAGS to our link check.

Followup to r25384 - allow Serf to be found implicitly even when Neon is


* build/ac-macros/serf.m4

(SVN_LIB_SERF): Don't allow an enabled Neon to inhibit the search for Serf.

Support building both ra_dav and ra_serf, allowing the user to choose

which one to use in their servers config file.

Note: unlike everything else in the servers config file, the new

http-library is *only* supported in the [global] section, not the

host-specific section. We should fix this before 1.5, but this

probably requires moving some code from libsvn_ra_dav into libsvn_ra.

* build/ac-macros/serf.m4:

Remove check that prevents building both ra_dav and ra_serf.

* subversion/include/svn_config.h

(SVN_CONFIG_OPTION_HTTP_LIBRARY): New config option "http-library".

* subversion/libsvn_subr/config_file.c

(svn_config_ensure): Document SVN_CONFIG_OPTION_HTTP_LIBRARY in the

generated servers file.

* subversion/libsvn_ra/ra_loader.c

(): Change comment about conflicting RA libraries to mention the

assumptions that svn_ra_open2 is making.

(MUST_CHOOSE_DAV): Define this symbol if we are linking both DAV


(svn_ra_open2): If MUST_CHOOSE_DAV is defined, look up the

http-library value in the servers config file global section,

validate that it is "dav" or "serf", and skip the other library.

* subversion/libsvn_ra_serf/README:

Mention that you don't need to disable Neon if you set the

http-library option.


(I.B Dependency Overview): Mention that you can use both Neon and


(I.C Dependencies in Detail): Provide more detail about using both.

  1. … 5 more files in changeset.
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


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/

Approved by: jerenkrantz

Add in initial stubs for libsvn_ra_serf.

ra_serf is mutually exclusive with ra_dav (neon). Therefore, it requires neon

to be disabled. (Pass "--with-serf=<serf install path> --without-neon".)

* subversion/libsvn_ra_serf/serf.c: Add stub file that implements bare minimum

required to build new ra layer library.

* subversion/libsvn_ra/ra_loader.c

(ra_libraries): Add define for serf

* subversion/libsvn_ra/ra_loader.h, subversion/include/svn_ra.h

(svn_ra_serf__init, svn_ra_serf_init): Add stub loader prototypes.

* build.conf

(libsvn_ra_dav): Update comment to mention that this ra module uses neon

(libsvn_ra_serf): Add in entries for libsvn_ra_serf

* build/ac-macros/serf.m4

(SVN_LIB_SERF): Add in m4 macro to find a serf install.

* aclocal.m4: Include build/ac-macros/serf.m4

* Call SVN_LIB_SERF and set the right defines to enable ra_serf.

* Add in necessary values to let the build system know where

serf is and be able to install libsvn_ra_serf.

  1. … 9 more files in changeset.