Index: subversion/svn_private_config.hw
===================================================================
--- subversion/svn_private_config.hw	(revision 20353)
+++ subversion/svn_private_config.hw	(working copy)
@@ -51,6 +51,8 @@
 /* Defined to be the path to the installed binaries */
 #define SVN_BINDIR "/usr/local/bin"
 
+/* APR always defines iovec for Win32 */
+#define STRUCT_IOVEC_DEFINED
 
 
 /* The default FS back-end type */
Index: build/generator/gen_win.py
===================================================================
--- build/generator/gen_win.py	(revision 20353)
+++ build/generator/gen_win.py	(working copy)
@@ -59,6 +59,7 @@
     self.instrument_purify_quantify = None
     self.configure_apr_util = None
     self.have_gen_uri = None
+    self.sasl_path = None
 
     # NLS options
     self.enable_nls = None
@@ -90,6 +91,8 @@
         self.zlib_path = val
       elif opt == '--with-swig':
         self.swig_path = val
+      elif opt == '--with-sasl':
+        self.sasl_path = val
       elif opt == '--with-openssl':
         self.openssl_path = val
       elif opt == '--enable-purify':
@@ -607,6 +610,10 @@
     if self.neon_ver >= 25000:
       fakedefines.append("SVN_NEON_0_25=1")
 
+    # check we have sasl
+    if self.sasl_path:
+      fakedefines.append("SVN_HAVE_SASL")
+
     return fakedefines
 
   def get_win_includes(self, target):
@@ -655,6 +662,10 @@
       fakeincludes.append(self.swig_libdir)
 
     fakeincludes.append(self.apath(self.zlib_path))
+
+    if self.sasl_path:
+      include_path = os.path.join(self.sasl_path, 'include')
+      fakeincludes.append(self.apath(include_path))
     
     return fakeincludes
 
@@ -667,6 +678,8 @@
     fakelibdirs = [ self.apath(self.bdb_path, "lib"),
                     self.apath(self.neon_path),
                     self.apath(self.zlib_path) ]
+    if self.sasl_path:
+      fakelibdirs.append(self.apath(self.sasl_path, "lib"))
     if isinstance(target, gen_base.TargetApacheMod):
       fakelibdirs.append(self.apath(self.httpd_path, cfg))
       if target.name == 'mod_dav_svn':
@@ -683,6 +696,9 @@
       dblib = self.bdb_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
     neonlib = self.neon_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
     zlib = (cfg == 'Debug' and 'zlibstatD.lib' or 'zlibstat.lib')
+    sasllib = None
+    if self.sasl_path:
+      sasllib = 'libsasl.lib'
 
     if not isinstance(target, gen_base.TargetLinked):
       return []
@@ -716,6 +732,9 @@
       if dep.external_lib == '$(NEON_LIBS)':
         nondeplibs.append(neonlib)
         
+      if dep.external_lib == '$(SVN_SASL_LIBS)':
+        nondeplibs.append(sasllib)
+        
     return gen_base.unique(nondeplibs)
 
   def get_win_sources(self, target, reldir_prefix=''):
Index: gen-make.py
===================================================================
--- gen-make.py	(revision 20353)
+++ gen-make.py	(working copy)
@@ -140,6 +140,9 @@
   print "  --with-swig=DIR"
   print "           look for the swig program in DIR"
   print
+  print "  --with-sasl=DIR"
+  print "           look for the sasl headers and libs in DIR"
+  print
   print "  --enable-pool-debug"
   print "           turn on APR pool debugging"
   print
@@ -193,6 +196,7 @@
                             'with-zlib=',
                             'with-junit=',
                             'with-swig=',
+                            'with-sasl=',
                             'enable-pool-debug',
                             'enable-purify',
                             'enable-quantify',