On 01/03/13 22:53, Daniel Shahaf wrote:
BTW, I do 'alias -g \$svn=\$SVN' so that the envvar is called "SVN"
(scripts look for that) but interactively I can type '$svn' in
lowercase.
_create_aliases() {
thank you for that :)
The instructions on building serf were a little outdated, but I got it
all to work in the end.
(see attached patch and log)
Fix the serf install information available throughout the build
system, specifically mentioning that the additional ./configure flags
--with-apr and --with-apr-util flags are needed at the same time as
--with-serf.
* trunk/get-deps.sh (serf): add echo statements to avoid user
pitfalls.
* trunk/build/ac-macros/serf.m4 (AC_ARG_WITH): Remove outdated
statement that the serf compile will occur automatically if serf is
present and improve ./configure flag warning regarding --with-serf
failure.
* trunk/INSTALL (Dependencies in Detail): Modify ./configure flag
advice regarding Serf.
* subversion/libsvn_ra_serf/README: Modifiy./configure flag
advice regarding Serf.
Index: get-deps.sh
===================================================================
--- get-deps.sh (revision 1452302)
+++ get-deps.sh (working copy)
@@ -80,6 +80,8 @@ get_serf() {
bzip2 -dc $TEMPDIR/$SERF.tar.bz2 | tar -xf -
mv $SERF serf
+
+ echo "Serf has been downloaded, but must be manually compiled and installed."
}
get_zlib() {
Index: subversion/libsvn_ra_serf/README
===================================================================
--- subversion/libsvn_ra_serf/README (revision 1452302)
+++ subversion/libsvn_ra_serf/README (working copy)
@@ -12,14 +12,15 @@ The latest serf releases can be fetched at:
The latest serf sources can be fetched via SVN at:
http://serf.googlecode.com/svn/trunk/
-ra_serf can be enabled with the following configure flags:
+ra_serf can be enabled with the following configure flag:
"--with-serf=/path/to/serf/install"
-As Neon is currently Subversion's default RA DAV layer, you also need
-to add "http-library = serf" to your ~/.subversion/servers file to
-choose ra_serf at runtime. Alternately, you can build with only
-support for ra_serf:
- "--without-neon --with-serf=/path/to/serf/install"
+However, to compile serf with Subversion, the following configure
+flags are also required:
+
+ --with-apr=/path/to/apr/install
+ --with-apr-util=/path/to/apr-util/install
+
For more about how ra_serf/ra_neon talk WebDAV, consult notes/webdav-protocol.
Working copies are interchangable between ra_serf and ra_neon. (They both use
Index: build/ac-macros/serf.m4
===================================================================
--- build/ac-macros/serf.m4 (revision 1452302)
+++ build/ac-macros/serf.m4 (working copy)
@@ -51,7 +51,7 @@ AC_DEFUN(SVN_LIB_SERF,
serf_check_version="$1.$2.$3"
AC_ARG_WITH(serf,AS_HELP_STRING([--with-serf=PREFIX],
- [Serf HTTP client library (enabled by default if found)]),
+ [Serf HTTP client library, (req. --with-apr & --with-apr-util flags)]),
[
if test "$withval" = "yes" ; then
serf_required=yes
Index: INSTALL
===================================================================
--- INSTALL (revision 1452302)
+++ INSTALL (working copy)
@@ -314,13 +314,12 @@ I. INTRODUCTION
serf. Though optional, we strongly recommend this.
In order to use ra_serf, you must install serf, and run Subversion's
- ./configure with the argument --with-serf. If serf is installed in a
- non-standard place, you should use
+ ./configure with all of the arguments:
- --with-serf=/path/to/serf/install
+ --with-serf=/path/to/serf/install
+ --with-apr=/path/to/apr/install
+ --with-apr-util=/path/to/apr-util/install
- instead.
-
For more information on serf and Subversion's ra_serf, see the file
subversion/libsvn_ra_serf/README.
