Index: build/generator/gen_win.py =================================================================== --- build/generator/gen_win.py (revision 21068) +++ build/generator/gen_win.py (working copy) @@ -46,6 +46,7 @@ self.httpd_path = None self.libintl_path = None self.zlib_path = 'zlib' + self.sasl_path = None self.openssl_path = None self.junit_path = None self.swig_path = 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': @@ -618,6 +621,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): @@ -650,15 +657,18 @@ fakeincludes.append(self.apath(self.libintl_path, 'inc')) if self.serf_path: - fakeincludes.append(self.apath(self.serf_path, "")) + fakeincludes.append(self.apath(self.serf_path, "")) + if self.sasl_path: + fakeincludes.append(self.apath(self.sasl_path, 'include')) + if self.swig_libdir \ and (isinstance(target, gen_base.TargetSWIG) or isinstance(target, gen_base.TargetSWIGLib)): @@ -670,6 +680,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': @@ -686,6 +698,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 [] @@ -719,6 +734,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 21068) +++ 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',