Index: build/generator/gen_vcnet_vcproj.py
===================================================================
--- build/generator/gen_vcnet_vcproj.py	(revision 109)
+++ build/generator/gen_vcnet_vcproj.py	(working copy)
@@ -104,7 +104,13 @@
                         'libapriconv_ccs_modules.vcproj')
     self.move_proj_file(os.path.join(self.apr_iconv_path,'ces'),
                         'libapriconv_ces_modules.vcproj')
-    self.move_proj_file(self.apr_util_path, 'libaprutil.vcproj')
+
+    # if we're configuring apr-util with bdb, pass the appropriate path to the template
+    if self.configure_apr_util:
+      self.move_proj_file(self.apr_util_path, 'libaprutil.vcproj', (('bdbpath', os.path.abspath(self.bdb_path)),) )
+    else:
+      self.move_proj_file(self.apr_util_path, 'libaprutil.vcproj', (('bdbpath', ''),) )
+
     self.move_proj_file(os.path.join(self.apr_util_path,'uri'),
                         'gen_uri_delims.vcproj')
     self.move_proj_file(os.path.join(self.apr_util_path,'xml', 'expat',
Index: build/generator/libaprutil.vcproj.ezt
===================================================================
--- build/generator/libaprutil.vcproj.ezt	(revision 109)
+++ build/generator/libaprutil.vcproj.ezt	(working copy)
@@ -20,8 +20,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="./include,../apr/include,./include/private,../apr-iconv/include,./dbm/sdbm,./xml/expat/lib"
-				PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
+                                AdditionalIncludeDirectories="./include,../apr/include,./include/private,../apr-iconv/include,./dbm/sdbm,./xml/expat/lib[if-any bdbpath],[bdbpath]/include[end]"
+                                PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;[if-any bdbpath]APU_USE_DB[else]APU_USE_SDBM[end];WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/libaprutil.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib mswsock.lib"
+                                AdditionalDependencies="ws2_32.lib mswsock.lib[if-any bdbpath] [bdbpath]/lib/libdb42d.lib[end]"
 				OutputFile=".\Debug/libaprutil.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -77,8 +77,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="./include,../apr/include,./include/private,../apr-iconv/include,./dbm/sdbm,./xml/expat/lib"
-				PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
+                                AdditionalIncludeDirectories="./include,../apr/include,./include/private,../apr-iconv/include,./dbm/sdbm,./xml/expat/lib[if-any bdbpath],[bdbpath]/include[end]"
+                                PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;[if-any bdbpath]APU_USE_DB[else]APU_USE_SDBM[end];WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -94,7 +94,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib mswsock.lib"
+                                AdditionalDependencies="ws2_32.lib mswsock.lib[if-any bdbpath] [bdbpath]/lib/libdb42.lib[end]"
 				OutputFile=".\Release/libaprutil.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"