Index: Makefile.in
===================================================================
--- Makefile.in	(revision 19865)
+++ Makefile.in	(working copy)
@@ -43,6 +43,7 @@
 SVN_DB_LIBS =
 SVN_KEYCHAIN_LIBS = @SVN_KEYCHAIN_LIBS@
 SVN_SERF_LIBS = @SVN_SERF_LIBS@
+SVN_SASL_LIBS = @SVN_SASL_LIBS@
 
 LIBS = @LIBS@
 
@@ -99,7 +100,8 @@
 
 INCLUDES = -I$(top_srcdir)/subversion/include -I$(top_builddir)/subversion \
            @SVN_NEON_INCLUDES@ @SVN_KEYCHAIN_INCLUDES@ \
-           @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@ @SVN_SERF_INCLUDES@
+           @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@ @SVN_SERF_INCLUDES@ \
+           @SVN_SASL_INCLUDES@
 
 APACHE_INCLUDES = @APACHE_INCLUDES@
 APACHE_TARGET = @APACHE_TARGET@
Index: build.conf
===================================================================
--- build.conf	(revision 19865)
+++ build.conf	(working copy)
@@ -231,7 +231,7 @@
 type = ra-module
 path = subversion/libsvn_ra_svn
 install = ramod-lib
-libs = libsvn_delta libsvn_subr aprutil apriconv apr
+libs = libsvn_delta libsvn_subr aprutil apriconv apr sasl
 msvc-static = yes
 
 # Accessing repositories via direct libsvn_fs
@@ -293,7 +293,7 @@
 install = bin
 manpages = subversion/svnserve/svnserve.8 subversion/svnserve/svnserve.conf.5
 libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr libsvn_ra_svn
-       aprutil apriconv apr
+       aprutil apriconv apr sasl
 msvc-libs = ws2_32.lib
 
 [svnversion]
@@ -797,6 +797,10 @@
 type = lib
 external-lib = $(SVN_DB_LIBS)
 
+[sasl]
+type = lib
+external-lib = $(SVN_SASL_LIBS)
+
 [zlib]
 type = lib
 external-project = build/win32/zlib
Index: configure.in
===================================================================
--- configure.in	(revision 19865)
+++ configure.in	(working copy)
@@ -253,6 +253,8 @@
 AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_PATCH, $SVN_FS_WANT_DB_PATCH,
                    [The desired patch version for the Berkeley DB])
 
+SVN_LIB_SASL
+
 dnl Mac OS KeyChain -------------------
 
 AC_ARG_ENABLE(keychain,
Index: aclocal.m4
===================================================================
--- aclocal.m4	(revision 19865)
+++ aclocal.m4	(working copy)
@@ -18,6 +18,7 @@
 sinclude(build/ac-macros/svn-apache.m4)
 sinclude(build/ac-macros/java.m4)
 sinclude(build/ac-macros/swig.m4)
+sinclude(build/ac-macros/sasl.m4)
 
 # Include the libtool macros
 sinclude(build/libtool.m4)