[apr-util] 01/04: Upstream tarball 1.6.1

Stefan Fritsch sf at moszumanska.debian.org
Mon Nov 6 19:10:00 UTC 2017


This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apr-util.

commit 66c204233c7bc20b8f6b0d8d1edce6fedfab2982
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Nov 6 19:40:53 2017 +0100

    Upstream tarball 1.6.1
---
 CHANGES                             |   21 +
 CMakeLists.txt                      |   33 +-
 Makefile.win                        |   33 +-
 README                              |    2 +-
 apr-util.spec                       |    2 +-
 aprutil.dep                         |  863 +++++-----
 aprutil.dsw                         |   36 -
 aprutil.mak                         | 2986 +++++++++++++++++-----------------
 build/config.guess                  |   70 +-
 build/config.sub                    |   32 +-
 crypto/apr_crypto.c                 |    6 +-
 crypto/apr_crypto_nss.dep           |   30 +-
 crypto/apr_crypto_nss.mak           | 1188 +++++++-------
 crypto/apr_crypto_openssl.c         |   25 +-
 crypto/apr_crypto_openssl.dep       |   28 +-
 crypto/apr_crypto_openssl.mak       | 1212 +++++++-------
 crypto/apr_siphash.c                |   12 +-
 dbd/apr_dbd_mysql.dep               |   30 +-
 dbd/apr_dbd_mysql.mak               | 1188 +++++++-------
 dbd/apr_dbd_odbc.dep                |   22 +-
 dbd/apr_dbd_odbc.mak                | 1100 ++++++-------
 dbd/apr_dbd_oracle.dep              |   26 +-
 dbd/apr_dbd_oracle.mak              | 1188 +++++++-------
 dbd/apr_dbd_pgsql.dep               |   28 +-
 dbd/apr_dbd_pgsql.mak               | 1188 +++++++-------
 dbd/apr_dbd_sqlite2.dep             |   26 +-
 dbd/apr_dbd_sqlite2.mak             | 1188 +++++++-------
 dbd/apr_dbd_sqlite3.dep             |   26 +-
 dbd/apr_dbd_sqlite3.mak             | 1188 +++++++-------
 dbd/unsupported/apr_dbd_freetds.dep |   26 +-
 dbd/unsupported/apr_dbd_freetds.mak | 1188 +++++++-------
 dbm/apr_dbm_db.dep                  |   30 +-
 dbm/apr_dbm_db.mak                  | 1188 +++++++-------
 dbm/apr_dbm_gdbm.dep                |   28 +-
 dbm/apr_dbm_gdbm.mak                | 1188 +++++++-------
 dbm/sdbm/sdbm.c                     |   78 +-
 dbm/sdbm/sdbm_pair.c                |    3 +-
 include/apr_crypto.h                |    6 +-
 include/apr_siphash.h               |   13 +-
 include/apu_version.h               |    4 +-
 ldap/apr_ldap.dep                   |   74 +-
 ldap/apr_ldap.mak                   | 1240 +++++++--------
 libaprutil.dep                      |  679 ++++----
 libaprutil.dsp                      |   16 +-
 libaprutil.mak                      | 2998 +++++++++++++++++------------------
 test/Makefile.win                   |    3 +-
 xml/xml.dep                         |    2 -
 xml/xml.dsp                         |  210 ---
 xml/xml.mak                         |  353 -----
 49 files changed, 11210 insertions(+), 11894 deletions(-)

diff --git a/CHANGES b/CHANGES
index 37fd55f..1b2333b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,27 @@
                                                      -*- coding: utf-8 -*-
+Changes with APR-util 1.6.1
+
+  *) Win32: Add function exports from new apr_crypto API's missing in 1.6.0.
+
+  *) Win32: Introduce XML_PARSER build-time variable to select the expat
+     library name to be linked to libaprutil-1.dll. See Makefile.win
+
+  *) Win32: Removed lingering xml/xml.dsp project forked from the expat
+     Project in the 1.9x era. Use expat's maintained build schema instead,
+     prior to building apr-util.
+
+  *) apr_crypto: Fix compatibility with LibreSSL.  PR 61596.
+     [Bernard Spil <brnrd freebsd.org>, Yann Ylavic]
+
+  *) sdbm: better database/page validation to fail cleanly when corrupted.
+     [Yann Ylavic]
+
 Changes with APR-util 1.6.0
 
+  *) The expat dependency of apr-util is no longer built with apr-util.
+     Install expat (including development headers and libraries) first
+     before building apr-util. [https://libexpat.github.io/]
+
   *) Mark apr_dbd_freetds as unsupported, and remove it from all builds
      [Nick Kew]
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43fdf49..9ae90b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 FIND_PACKAGE(OpenSSL)
 
+FIND_PACKAGE(expat)
+
 OPTION(APU_HAVE_CRYPTO      "Crypto support"                            OFF)
 OPTION(APU_HAVE_ODBC        "Build ODBC DBD driver"                     ON)
 OPTION(APR_HAS_LDAP         "LDAP support"                              ON)
@@ -59,6 +61,18 @@ IF(APR_HAS_LDAP)
   SET(apr_has_ldap_10 1)
 ENDIF()
 
+IF(NOT EXPAT_FOUND)
+  MESSAGE(FATAL_ERROR "Expat is required, and it wasn't found!")
+ENDIF()
+
+SET(XMLLIB_INCLUDE_DIR   ${EXPAT_INCLUDE_DIRS})
+SET(XMLLIB_LIBRARIES     ${EXPAT_LIBRARIES})
+
+SET(LDAP_LIBRARIES)
+IF(APR_HAS_LDAP)
+  SET(LDAP_LIBRARIES wldap32)
+ENDIF()
+
 CONFIGURE_FILE(include/apu.hwc
               ${PROJECT_BINARY_DIR}/apu.h)
 CONFIGURE_FILE(include/apr_ldap.hwc
@@ -74,15 +88,6 @@ CONFIGURE_FILE(include/apu_want.hw
                ${PROJECT_BINARY_DIR}/apu_want.h
                COPYONLY)
 
-# TBD:
-# SET(XMLLIB_INCLUDE_DIR   ${CMAKE_CURRENT_SOURCE_DIR}/xml/expat/lib)
-SET(XMLLIB_LIBRARIES     libexpat)
-
-SET(LDAP_LIBRARIES)
-IF(APR_HAS_LDAP)
-  SET(LDAP_LIBRARIES wldap32)
-ENDIF()
-
 # Generated .h files are stored in PROJECT_BINARY_DIR, not the
 # source tree.
 #
@@ -217,22 +222,12 @@ SET(APR_TEST_SOURCES
   test/testxml.c
 )
 
-SET(EXPAT_SOURCES
-  xml/expat/lib/xmlrole.c
-  xml/expat/lib/xmltok.c
-  xml/expat/lib/xmlparse.c
-)
-
 SET(install_targets)
 SET(install_bin_pdb)
 SET(dbd_drivers)
 
 # Note: The WINNT definition on some targets is used only by libaprutil.rc.
 
-# static expat (not installed)
-ADD_LIBRARY(libexpat STATIC ${EXPAT_SOURCES})
-SET_TARGET_PROPERTIES(libexpat PROPERTIES COMPILE_DEFINITIONS "XML_STATIC;COMPILED_FROM_DSP")
-
 # libaprutil-1 is shared, aprutil-1 is static
 ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc)
 SET(install_targets ${install_targets} libaprutil-1)
diff --git a/Makefile.win b/Makefile.win
index e30ec14..454b4fe 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -51,21 +51,18 @@
 #
 #     CRYPTO_LIST="nss openssl"
 #
+# Provide the XML_PARSER argument after configuring LIB and INCLUDE with
+# the expat path of the corresponding xml parser, e.g. libexpatMT to choose
+# static, or libexpat (default) to choose the dynamic library for aprutil-1.dll
+# (Static libaprutil-1.lib always presumes libexpatMT with XML_STATIC flag.)
+#
+#     XML_PARSER="libexpat"
+#
 # For example;
 #
 #   nmake -f Makefile.win PREFIX=C:\APR buildall checkall installall clean
 #
 
-!IF !EXIST("xml\expat\lib\expat.h")
-!MESSAGE Please obtain the latest expat source from http://expat.sourceforge.net/
-!MESSAGE and place it in the xml folder of apr-util so that expat.h is located in
-!MESSAGE apr-util/xml/expat/lib/expat.h and include all the other files in expat's
-!MESSAGE "lib" folder.
-!MESSAGE 
-!ERROR Need expat sources to build!
-!ENDIF
-
-
 !IF EXIST("aprutil.sln") && ([devenv /help > NUL 2>&1] == 0) \
     && !defined(USEMAK) && !defined(USEDSW)
 USESLN=1
@@ -89,6 +86,14 @@ SSLOPT=_HAVE_OSSL110=1
 !ENDIF
 !ENDIF
 
+# Legacy default (and unwise alternative) for libapr-1.dll is libexpatMT
+XML_PARSER="libexpat"
+!IF "$(XML_PARSER)" == "libexpat"
+XMLOPT=XML_PARSER=$(XML_PARSER)
+!ELSE
+XMLOPT=XML_PARSER=$(XML_PARSER) XML_OPTIONS="/D XML_STATIC"
+!ENDIF
+
 !IF [$(COMSPEC) /c cl /nologo /? \
 	| $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
 ARCH=x64 Release
@@ -213,11 +218,9 @@ buildall:
 		BUILD_MODE="$(ARCH)" BIND_MODE=shared
 	 cd ..
 !ENDIF
-	cd $(APU_PATH)\xml
-	 $(MAKE) $(MAKEOPT) -f xml.mak         CFG="xml - $(ARCH)" RECURSE=0 $(CTARGET)
-	cd ..
-	 $(MAKE) $(MAKEOPT) $(SSLOPT) -f aprutil.mak     CFG="aprutil - $(ARCH)" RECURSE=0 $(CTARGET)
-	 $(MAKE) $(MAKEOPT) $(SSLOPT) -f libaprutil.mak  CFG="libaprutil - $(ARCH)" RECURSE=0 $(CTARGET)
+	cd $(APU_PATH)
+	 $(MAKE) $(MAKEOPT) $(SSLOPT) $(XMLOPT) -f aprutil.mak CFG="aprutil - $(ARCH)" RECURSE=0 $(CTARGET)
+	 $(MAKE) $(MAKEOPT) $(SSLOPT) $(XMLOPT) -f libaprutil.mak CFG="libaprutil - $(ARCH)" RECURSE=0 $(CTARGET)
 	cd ldap
 	 $(MAKE) $(MAKEOPT) -f apr_ldap.mak    CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
 	cd ..
diff --git a/README b/README
index 329f514..9ea474d 100644
--- a/README
+++ b/README
@@ -34,7 +34,7 @@ Apache Portable Runtime Utility Library README
      String filename-style pattern matching
      URI Parsing
      Charset translation (iconv based)
-     XML parsing (expat based)
+     XML parsing (expat)
 
    For a more complete list, please refer to the following URLs:
 
diff --git a/apr-util.spec b/apr-util.spec
index 16d9f28..18fdea1 100644
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -3,7 +3,7 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.6.0
+Version: 1.6.1
 Release: 1
 License: Apache Software License
 Group: System Environment/Libraries
diff --git a/aprutil.dep b/aprutil.dep
index bd9af99..53098d8 100644
--- a/aprutil.dep
+++ b/aprutil.dep
@@ -1,432 +1,431 @@
-# Microsoft Developer Studio Generated Dependency File, included by aprutil.mak
-
-.\buckets\apr_brigade.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_alloc.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_eos.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_file.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_flush.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_heap.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_mmap.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_pipe.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_pool.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_refcount.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_simple.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_socket.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\crypto\apr_crypto.c : \
-	".\include\apr_crypto.h"\
-	".\include\apu.h"\
-	".\include\apu_errno.h"\
-	".\include\apu_version.h"\
-	".\include\private\apr_crypto_internal.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_internal.h"\
-	
-
-.\crypto\apr_md4.c : \
-	".\include\apr_md4.h"\
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	
-
-.\crypto\apr_md5.c : \
-	".\include\apr_md5.h"\
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	".\include\private\apu_config.h"\
-	
-
-.\crypto\apr_passwd.c : \
-	".\crypto\crypt_blowfish.h"\
-	".\include\apr_md5.h"\
-	".\include\apr_sha1.h"\
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	".\include\private\apu_config.h"\
-	
-
-.\crypto\apr_sha1.c : \
-	".\include\apr_base64.h"\
-	".\include\apr_sha1.h"\
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	
-
-.\crypto\apr_siphash.c : \
-	".\include\apr_siphash.h"\
-	
-
-.\crypto\crypt_blowfish.c : \
-	".\crypto\crypt_blowfish.h"\
-	
-
-.\crypto\getuuid.c : \
-	".\include\apr_md5.h"\
-	".\include\apr_uuid.h"\
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	
-
-.\crypto\uuid.c : \
-	".\include\apr_uuid.h"\
-	".\include\apu.h"\
-	
-
-.\dbd\apr_dbd.c : \
-	".\include\apr_dbd.h"\
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	".\include\private\apr_dbd_internal.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_internal.h"\
-	
-
-.\dbd\apr_dbd_mysql.c : \
-	".\include\apr_buckets.h"\
-	".\include\apr_dbd.h"\
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	".\include\private\apr_dbd_internal.h"\
-	".\include\private\apu_config.h"\
-	
-
-.\dbd\apr_dbd_odbc.c : \
-	".\include\apr_buckets.h"\
-	".\include\apr_dbd.h"\
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	".\include\private\apr_dbd_internal.h"\
-	".\include\private\apr_dbd_odbc_v2.h"\
-	".\include\private\apu_config.h"\
-	
-
-.\dbd\apr_dbd_oracle.c : \
-	".\include\apr_buckets.h"\
-	".\include\apr_dbd.h"\
-	".\include\apu.h"\
-	".\include\private\apr_dbd_internal.h"\
-	
-
-.\dbd\apr_dbd_pgsql.c : \
-	".\include\apr_buckets.h"\
-	".\include\apr_dbd.h"\
-	".\include\apu.h"\
-	".\include\private\apr_dbd_internal.h"\
-	".\include\private\apu_config.h"\
-	
-
-.\dbd\apr_dbd_sqlite2.c : \
-	".\include\apr_buckets.h"\
-	".\include\apr_dbd.h"\
-	".\include\apu.h"\
-	".\include\private\apr_dbd_internal.h"\
-	
-
-.\dbd\apr_dbd_sqlite3.c : \
-	".\include\apr_buckets.h"\
-	".\include\apr_dbd.h"\
-	".\include\apu.h"\
-	".\include\private\apr_dbd_internal.h"\
-	
-
-.\dbm\apr_dbm.c : \
-	".\include\apr_dbm.h"\
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	".\include\private\apr_dbm_private.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_internal.h"\
-	".\include\private\apu_select_dbm.h"\
-	
-
-.\dbm\apr_dbm_berkeleydb.c : \
-	".\include\apr_dbm.h"\
-	".\include\apu.h"\
-	".\include\apu_want.h"\
-	".\include\private\apr_dbm_private.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_select_dbm.h"\
-	
-
-.\dbm\apr_dbm_gdbm.c : \
-	".\include\apr_dbm.h"\
-	".\include\apu.h"\
-	".\include\private\apr_dbm_private.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_select_dbm.h"\
-	
-
-.\dbm\apr_dbm_sdbm.c : \
-	".\include\apr_dbm.h"\
-	".\include\apr_sdbm.h"\
-	".\include\apu.h"\
-	".\include\private\apr_dbm_private.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_select_dbm.h"\
-	
-
-.\encoding\apr_base64.c : \
-	".\include\apr_base64.h"\
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	
-
-.\hooks\apr_hooks.c : \
-	".\include\apr_hooks.h"\
-	".\include\apr_optional.h"\
-	".\include\apr_optional_hooks.h"\
-	".\include\apu.h"\
-	
-
-.\ldap\apr_ldap_init.c : \
-	".\include\apr_ldap.h"\
-	".\include\apr_ldap_init.h"\
-	".\include\apr_ldap_option.h"\
-	".\include\apr_ldap_rebind.h"\
-	".\include\apr_ldap_url.h"\
-	".\include\apu.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_internal.h"\
-	
-
-.\ldap\apr_ldap_option.c : \
-	".\include\apr_ldap.h"\
-	".\include\apr_ldap_init.h"\
-	".\include\apr_ldap_option.h"\
-	".\include\apr_ldap_rebind.h"\
-	".\include\apr_ldap_url.h"\
-	".\include\apu.h"\
-	".\include\private\apu_config.h"\
-	
-
-.\ldap\apr_ldap_rebind.c : \
-	".\include\apr_ldap.h"\
-	".\include\apr_ldap_init.h"\
-	".\include\apr_ldap_option.h"\
-	".\include\apr_ldap_rebind.h"\
-	".\include\apr_ldap_url.h"\
-	".\include\apu.h"\
-	".\include\private\apu_config.h"\
-	
-
-.\ldap\apr_ldap_stub.c : \
-	".\include\apr_ldap.h"\
-	".\include\apr_ldap_init.h"\
-	".\include\apr_ldap_option.h"\
-	".\include\apr_ldap_rebind.h"\
-	".\include\apr_ldap_url.h"\
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_internal.h"\
-	
-
-.\ldap\apr_ldap_url.c : \
-	".\include\apr_ldap.h"\
-	".\include\apr_ldap_init.h"\
-	".\include\apr_ldap_option.h"\
-	".\include\apr_ldap_rebind.h"\
-	".\include\apr_ldap_url.h"\
-	".\include\apu.h"\
-	
-
-.\memcache\apr_memcache.c : \
-	".\include\apr_buckets.h"\
-	".\include\apr_memcache.h"\
-	".\include\apr_reslist.h"\
-	".\include\apu.h"\
-	
-
-.\misc\apr_date.c : \
-	".\include\apr_date.h"\
-	".\include\apu.h"\
-	
-
-.\misc\apr_queue.c : \
-	".\include\apr_queue.h"\
-	".\include\apu.h"\
-	
-
-.\misc\apr_reslist.c : \
-	".\include\apr_reslist.h"\
-	".\include\apu.h"\
-	
-
-.\misc\apr_rmm.c : \
-	".\include\apr_anylock.h"\
-	".\include\apr_rmm.h"\
-	".\include\apu.h"\
-	
-
-.\misc\apr_thread_pool.c : \
-	".\include\apr_thread_pool.h"\
-	".\include\apu.h"\
-	
-
-.\misc\apu_dso.c : \
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_internal.h"\
-	
-
-.\misc\apu_version.c : \
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	
-
-.\dbm\sdbm\sdbm.c : \
-	".\dbm\sdbm\sdbm_pair.h"\
-	".\dbm\sdbm\sdbm_private.h"\
-	".\dbm\sdbm\sdbm_tune.h"\
-	".\include\apr_sdbm.h"\
-	".\include\apu.h"\
-	
-
-.\dbm\sdbm\sdbm_hash.c : \
-	".\dbm\sdbm\sdbm_private.h"\
-	".\include\apr_sdbm.h"\
-	".\include\apu.h"\
-	
-
-.\dbm\sdbm\sdbm_lock.c : \
-	".\dbm\sdbm\sdbm_private.h"\
-	".\dbm\sdbm\sdbm_tune.h"\
-	".\include\apr_sdbm.h"\
-	".\include\apu.h"\
-	
-
-.\dbm\sdbm\sdbm_pair.c : \
-	".\dbm\sdbm\sdbm_pair.h"\
-	".\dbm\sdbm\sdbm_private.h"\
-	".\dbm\sdbm\sdbm_tune.h"\
-	".\include\apr_sdbm.h"\
-	".\include\apu.h"\
-	
-
-.\strmatch\apr_strmatch.c : \
-	".\include\apr_strmatch.h"\
-	".\include\apu.h"\
-	
-
-.\uri\apr_uri.c : \
-	".\include\apr_uri.h"\
-	".\include\apu.h"\
-	
-
-.\xlate\xlate.c : \
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	".\include\private\apu_config.h"\
-	
-
-.\xml\apr_xml.c : \
-	".\include\apr_xlate.h"\
-	".\include\apr_xml.h"\
-	".\include\apu.h"\
-	".\include\private\apu_config.h"\
-	".\xml\expat\lib\expat.h"\
-	
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated Dependency File, included by aprutil.mak
+
+.\buckets\apr_brigade.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_alloc.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_eos.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_file.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_flush.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_heap.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_mmap.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_pipe.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_pool.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_refcount.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_simple.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_socket.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\crypto\apr_crypto.c : \
+	".\include\apr_crypto.h"\
+	".\include\apu.h"\
+	".\include\apu_errno.h"\
+	".\include\apu_version.h"\
+	".\include\private\apr_crypto_internal.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_internal.h"\
+	
+
+.\crypto\apr_md4.c : \
+	".\include\apr_md4.h"\
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	
+
+.\crypto\apr_md5.c : \
+	".\include\apr_md5.h"\
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	".\include\private\apu_config.h"\
+	
+
+.\crypto\apr_passwd.c : \
+	".\crypto\crypt_blowfish.h"\
+	".\include\apr_md5.h"\
+	".\include\apr_sha1.h"\
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	".\include\private\apu_config.h"\
+	
+
+.\crypto\apr_sha1.c : \
+	".\include\apr_base64.h"\
+	".\include\apr_sha1.h"\
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	
+
+.\crypto\apr_siphash.c : \
+	".\include\apr_siphash.h"\
+	
+
+.\crypto\crypt_blowfish.c : \
+	".\crypto\crypt_blowfish.h"\
+	
+
+.\crypto\getuuid.c : \
+	".\include\apr_md5.h"\
+	".\include\apr_uuid.h"\
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	
+
+.\crypto\uuid.c : \
+	".\include\apr_uuid.h"\
+	".\include\apu.h"\
+	
+
+.\dbd\apr_dbd.c : \
+	".\include\apr_dbd.h"\
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	".\include\private\apr_dbd_internal.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_internal.h"\
+	
+
+.\dbd\apr_dbd_mysql.c : \
+	".\include\apr_buckets.h"\
+	".\include\apr_dbd.h"\
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	".\include\private\apr_dbd_internal.h"\
+	".\include\private\apu_config.h"\
+	
+
+.\dbd\apr_dbd_odbc.c : \
+	".\include\apr_buckets.h"\
+	".\include\apr_dbd.h"\
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	".\include\private\apr_dbd_internal.h"\
+	".\include\private\apr_dbd_odbc_v2.h"\
+	".\include\private\apu_config.h"\
+	
+
+.\dbd\apr_dbd_oracle.c : \
+	".\include\apr_buckets.h"\
+	".\include\apr_dbd.h"\
+	".\include\apu.h"\
+	".\include\private\apr_dbd_internal.h"\
+	
+
+.\dbd\apr_dbd_pgsql.c : \
+	".\include\apr_buckets.h"\
+	".\include\apr_dbd.h"\
+	".\include\apu.h"\
+	".\include\private\apr_dbd_internal.h"\
+	".\include\private\apu_config.h"\
+	
+
+.\dbd\apr_dbd_sqlite2.c : \
+	".\include\apr_buckets.h"\
+	".\include\apr_dbd.h"\
+	".\include\apu.h"\
+	".\include\private\apr_dbd_internal.h"\
+	
+
+.\dbd\apr_dbd_sqlite3.c : \
+	".\include\apr_buckets.h"\
+	".\include\apr_dbd.h"\
+	".\include\apu.h"\
+	".\include\private\apr_dbd_internal.h"\
+	
+
+.\dbm\apr_dbm.c : \
+	".\include\apr_dbm.h"\
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	".\include\private\apr_dbm_private.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_internal.h"\
+	".\include\private\apu_select_dbm.h"\
+	
+
+.\dbm\apr_dbm_berkeleydb.c : \
+	".\include\apr_dbm.h"\
+	".\include\apu.h"\
+	".\include\apu_want.h"\
+	".\include\private\apr_dbm_private.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_select_dbm.h"\
+	
+
+.\dbm\apr_dbm_gdbm.c : \
+	".\include\apr_dbm.h"\
+	".\include\apu.h"\
+	".\include\private\apr_dbm_private.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_select_dbm.h"\
+	
+
+.\dbm\apr_dbm_sdbm.c : \
+	".\include\apr_dbm.h"\
+	".\include\apr_sdbm.h"\
+	".\include\apu.h"\
+	".\include\private\apr_dbm_private.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_select_dbm.h"\
+	
+
+.\encoding\apr_base64.c : \
+	".\include\apr_base64.h"\
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	
+
+.\hooks\apr_hooks.c : \
+	".\include\apr_hooks.h"\
+	".\include\apr_optional.h"\
+	".\include\apr_optional_hooks.h"\
+	".\include\apu.h"\
+	
+
+.\ldap\apr_ldap_init.c : \
+	".\include\apr_ldap.h"\
+	".\include\apr_ldap_init.h"\
+	".\include\apr_ldap_option.h"\
+	".\include\apr_ldap_rebind.h"\
+	".\include\apr_ldap_url.h"\
+	".\include\apu.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_internal.h"\
+	
+
+.\ldap\apr_ldap_option.c : \
+	".\include\apr_ldap.h"\
+	".\include\apr_ldap_init.h"\
+	".\include\apr_ldap_option.h"\
+	".\include\apr_ldap_rebind.h"\
+	".\include\apr_ldap_url.h"\
+	".\include\apu.h"\
+	".\include\private\apu_config.h"\
+	
+
+.\ldap\apr_ldap_rebind.c : \
+	".\include\apr_ldap.h"\
+	".\include\apr_ldap_init.h"\
+	".\include\apr_ldap_option.h"\
+	".\include\apr_ldap_rebind.h"\
+	".\include\apr_ldap_url.h"\
+	".\include\apu.h"\
+	".\include\private\apu_config.h"\
+	
+
+.\ldap\apr_ldap_stub.c : \
+	".\include\apr_ldap.h"\
+	".\include\apr_ldap_init.h"\
+	".\include\apr_ldap_option.h"\
+	".\include\apr_ldap_rebind.h"\
+	".\include\apr_ldap_url.h"\
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_internal.h"\
+	
+
+.\ldap\apr_ldap_url.c : \
+	".\include\apr_ldap.h"\
+	".\include\apr_ldap_init.h"\
+	".\include\apr_ldap_option.h"\
+	".\include\apr_ldap_rebind.h"\
+	".\include\apr_ldap_url.h"\
+	".\include\apu.h"\
+	
+
+.\memcache\apr_memcache.c : \
+	".\include\apr_buckets.h"\
+	".\include\apr_memcache.h"\
+	".\include\apr_reslist.h"\
+	".\include\apu.h"\
+	
+
+.\misc\apr_date.c : \
+	".\include\apr_date.h"\
+	".\include\apu.h"\
+	
+
+.\misc\apr_queue.c : \
+	".\include\apr_queue.h"\
+	".\include\apu.h"\
+	
+
+.\misc\apr_reslist.c : \
+	".\include\apr_reslist.h"\
+	".\include\apu.h"\
+	
+
+.\misc\apr_rmm.c : \
+	".\include\apr_anylock.h"\
+	".\include\apr_rmm.h"\
+	".\include\apu.h"\
+	
+
+.\misc\apr_thread_pool.c : \
+	".\include\apr_thread_pool.h"\
+	".\include\apu.h"\
+	
+
+.\misc\apu_dso.c : \
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_internal.h"\
+	
+
+.\misc\apu_version.c : \
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	
+
+.\dbm\sdbm\sdbm.c : \
+	".\dbm\sdbm\sdbm_pair.h"\
+	".\dbm\sdbm\sdbm_private.h"\
+	".\dbm\sdbm\sdbm_tune.h"\
+	".\include\apr_sdbm.h"\
+	".\include\apu.h"\
+	
+
+.\dbm\sdbm\sdbm_hash.c : \
+	".\dbm\sdbm\sdbm_private.h"\
+	".\include\apr_sdbm.h"\
+	".\include\apu.h"\
+	
+
+.\dbm\sdbm\sdbm_lock.c : \
+	".\dbm\sdbm\sdbm_private.h"\
+	".\dbm\sdbm\sdbm_tune.h"\
+	".\include\apr_sdbm.h"\
+	".\include\apu.h"\
+	
+
+.\dbm\sdbm\sdbm_pair.c : \
+	".\dbm\sdbm\sdbm_pair.h"\
+	".\dbm\sdbm\sdbm_private.h"\
+	".\dbm\sdbm\sdbm_tune.h"\
+	".\include\apr_sdbm.h"\
+	".\include\apu.h"\
+	
+
+.\strmatch\apr_strmatch.c : \
+	".\include\apr_strmatch.h"\
+	".\include\apu.h"\
+	
+
+.\uri\apr_uri.c : \
+	".\include\apr_uri.h"\
+	".\include\apu.h"\
+	
+
+.\xlate\xlate.c : \
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	".\include\private\apu_config.h"\
+	
+
+.\xml\apr_xml.c : \
+	".\include\apr_xlate.h"\
+	".\include\apr_xml.h"\
+	".\include\apu.h"\
+	".\include\private\apu_config.h"\
+	
+
+!IF  "$(CFG)" == "aprutil - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "aprutil - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "aprutil - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "aprutil - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "aprutil - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
+
+!ENDIF 
+
diff --git a/aprutil.dsw b/aprutil.dsw
index 1499bc7..a2976cc 100644
--- a/aprutil.dsw
+++ b/aprutil.dsw
@@ -51,24 +51,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "apr_dbd_freetds"=".\dbd\apr_dbd_freetds.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libapr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "apr_dbd_mysql"=".\dbd\apr_dbd_mysql.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -275,9 +257,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name apriconv
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name xml
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -383,9 +362,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libapriconv_ces_modules
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name xml
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -453,18 +429,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "xml"=".\xml\xml.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Global:
 
 Package=<5>
diff --git a/aprutil.mak b/aprutil.mak
index 5ff6f99..fd54159 100644
--- a/aprutil.mak
+++ b/aprutil.mak
@@ -1,1520 +1,1466 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on aprutil.dsp
-!IF "$(CFG)" == ""
-CFG=aprutil - Win32 Release
-!MESSAGE No configuration specified. Defaulting to aprutil - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "aprutil - Win32 Release" && "$(CFG)" != "aprutil - Win32 Debug" && "$(CFG)" != "aprutil - x64 Release" && "$(CFG)" != "aprutil - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "aprutil.mak" CFG="aprutil - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "aprutil - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "aprutil - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "aprutil - x64 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "aprutil - x64 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF "$(_HAVE_OSSL110)" == "1"
-SSLINC=/I ../openssl/include
-!ELSE 
-SSLINC=/I ../openssl/inc32
-!ENDIF 
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-OUTDIR=.\LibR
-INTDIR=.\LibR
-# Begin Custom Macros
-OutDir=.\LibR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\aprutil-1.lib"
-
-!ELSE 
-
-ALL : "xml - Win32 Release" "apriconv - Win32 Release" "$(OUTDIR)\aprutil-1.lib"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"apriconv - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_base64.obj"
-	- at erase "$(INTDIR)\apr_brigade.obj"
-	- at erase "$(INTDIR)\apr_buckets.obj"
-	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
-	- at erase "$(INTDIR)\apr_buckets_eos.obj"
-	- at erase "$(INTDIR)\apr_buckets_file.obj"
-	- at erase "$(INTDIR)\apr_buckets_flush.obj"
-	- at erase "$(INTDIR)\apr_buckets_heap.obj"
-	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
-	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
-	- at erase "$(INTDIR)\apr_buckets_pool.obj"
-	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
-	- at erase "$(INTDIR)\apr_buckets_simple.obj"
-	- at erase "$(INTDIR)\apr_buckets_socket.obj"
-	- at erase "$(INTDIR)\apr_crypto.obj"
-	- at erase "$(INTDIR)\apr_date.obj"
-	- at erase "$(INTDIR)\apr_dbd.obj"
-	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
-	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
-	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
-	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
-	- at erase "$(INTDIR)\apr_dbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
-	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
-	- at erase "$(INTDIR)\apr_hooks.obj"
-	- at erase "$(INTDIR)\apr_ldap_init.obj"
-	- at erase "$(INTDIR)\apr_ldap_option.obj"
-	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
-	- at erase "$(INTDIR)\apr_ldap_stub.obj"
-	- at erase "$(INTDIR)\apr_ldap_url.obj"
-	- at erase "$(INTDIR)\apr_md4.obj"
-	- at erase "$(INTDIR)\apr_md5.obj"
-	- at erase "$(INTDIR)\apr_memcache.obj"
-	- at erase "$(INTDIR)\apr_passwd.obj"
-	- at erase "$(INTDIR)\apr_queue.obj"
-	- at erase "$(INTDIR)\apr_redis.obj"
-	- at erase "$(INTDIR)\apr_reslist.obj"
-	- at erase "$(INTDIR)\apr_rmm.obj"
-	- at erase "$(INTDIR)\apr_sha1.obj"
-	- at erase "$(INTDIR)\apr_siphash.obj"
-	- at erase "$(INTDIR)\apr_strmatch.obj"
-	- at erase "$(INTDIR)\apr_thread_pool.obj"
-	- at erase "$(INTDIR)\apr_uri.obj"
-	- at erase "$(INTDIR)\apr_xml.obj"
-	- at erase "$(INTDIR)\aprutil-1.idb"
-	- at erase "$(INTDIR)\aprutil-1.pdb"
-	- at erase "$(INTDIR)\apu_dso.obj"
-	- at erase "$(INTDIR)\apu_version.obj"
-	- at erase "$(INTDIR)\crypt_blowfish.obj"
-	- at erase "$(INTDIR)\getuuid.obj"
-	- at erase "$(INTDIR)\sdbm.obj"
-	- at erase "$(INTDIR)\sdbm_hash.obj"
-	- at erase "$(INTDIR)\sdbm_lock.obj"
-	- at erase "$(INTDIR)\sdbm_pair.obj"
-	- at erase "$(INTDIR)\uuid.obj"
-	- at erase "$(INTDIR)\xlate.obj"
-	- at erase "$(OUTDIR)\aprutil-1.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\aprutil-1" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprutil.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aprutil-1.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\apr_brigade.obj" \
-	"$(INTDIR)\apr_buckets.obj" \
-	"$(INTDIR)\apr_buckets_alloc.obj" \
-	"$(INTDIR)\apr_buckets_eos.obj" \
-	"$(INTDIR)\apr_buckets_file.obj" \
-	"$(INTDIR)\apr_buckets_flush.obj" \
-	"$(INTDIR)\apr_buckets_heap.obj" \
-	"$(INTDIR)\apr_buckets_mmap.obj" \
-	"$(INTDIR)\apr_buckets_pipe.obj" \
-	"$(INTDIR)\apr_buckets_pool.obj" \
-	"$(INTDIR)\apr_buckets_refcount.obj" \
-	"$(INTDIR)\apr_buckets_simple.obj" \
-	"$(INTDIR)\apr_buckets_socket.obj" \
-	"$(INTDIR)\apr_crypto.obj" \
-	"$(INTDIR)\apr_md4.obj" \
-	"$(INTDIR)\apr_md5.obj" \
-	"$(INTDIR)\apr_passwd.obj" \
-	"$(INTDIR)\apr_sha1.obj" \
-	"$(INTDIR)\apr_siphash.obj" \
-	"$(INTDIR)\crypt_blowfish.obj" \
-	"$(INTDIR)\getuuid.obj" \
-	"$(INTDIR)\uuid.obj" \
-	"$(INTDIR)\apr_dbd.obj" \
-	"$(INTDIR)\apr_dbd_mysql.obj" \
-	"$(INTDIR)\apr_dbd_odbc.obj" \
-	"$(INTDIR)\apr_dbd_oracle.obj" \
-	"$(INTDIR)\apr_dbd_pgsql.obj" \
-	"$(INTDIR)\apr_dbd_sqlite2.obj" \
-	"$(INTDIR)\apr_dbd_sqlite3.obj" \
-	"$(INTDIR)\apr_dbm.obj" \
-	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
-	"$(INTDIR)\apr_dbm_gdbm.obj" \
-	"$(INTDIR)\apr_dbm_sdbm.obj" \
-	"$(INTDIR)\apr_base64.obj" \
-	"$(INTDIR)\apr_hooks.obj" \
-	"$(INTDIR)\apr_ldap_init.obj" \
-	"$(INTDIR)\apr_ldap_option.obj" \
-	"$(INTDIR)\apr_ldap_rebind.obj" \
-	"$(INTDIR)\apr_ldap_stub.obj" \
-	"$(INTDIR)\apr_ldap_url.obj" \
-	"$(INTDIR)\apr_memcache.obj" \
-	"$(INTDIR)\apr_date.obj" \
-	"$(INTDIR)\apu_dso.obj" \
-	"$(INTDIR)\apr_queue.obj" \
-	"$(INTDIR)\apr_redis.obj" \
-	"$(INTDIR)\apr_reslist.obj" \
-	"$(INTDIR)\apr_rmm.obj" \
-	"$(INTDIR)\apr_thread_pool.obj" \
-	"$(INTDIR)\apu_version.obj" \
-	"$(INTDIR)\sdbm.obj" \
-	"$(INTDIR)\sdbm_hash.obj" \
-	"$(INTDIR)\sdbm_lock.obj" \
-	"$(INTDIR)\sdbm_pair.obj" \
-	"$(INTDIR)\apr_strmatch.obj" \
-	"$(INTDIR)\apr_uri.obj" \
-	"$(INTDIR)\xlate.obj" \
-	"$(INTDIR)\apr_xml.obj" \
-	"..\apr-iconv\LibR\apriconv-1.lib" \
-	".\xml\LibR\xml.lib"
-
-"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-OUTDIR=.\LibD
-INTDIR=.\LibD
-# Begin Custom Macros
-OutDir=.\LibD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
-
-!ELSE 
-
-ALL : "xml - Win32 Debug" "apriconv - Win32 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"apriconv - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_base64.obj"
-	- at erase "$(INTDIR)\apr_brigade.obj"
-	- at erase "$(INTDIR)\apr_buckets.obj"
-	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
-	- at erase "$(INTDIR)\apr_buckets_eos.obj"
-	- at erase "$(INTDIR)\apr_buckets_file.obj"
-	- at erase "$(INTDIR)\apr_buckets_flush.obj"
-	- at erase "$(INTDIR)\apr_buckets_heap.obj"
-	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
-	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
-	- at erase "$(INTDIR)\apr_buckets_pool.obj"
-	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
-	- at erase "$(INTDIR)\apr_buckets_simple.obj"
-	- at erase "$(INTDIR)\apr_buckets_socket.obj"
-	- at erase "$(INTDIR)\apr_crypto.obj"
-	- at erase "$(INTDIR)\apr_date.obj"
-	- at erase "$(INTDIR)\apr_dbd.obj"
-	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
-	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
-	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
-	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
-	- at erase "$(INTDIR)\apr_dbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
-	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
-	- at erase "$(INTDIR)\apr_hooks.obj"
-	- at erase "$(INTDIR)\apr_ldap_init.obj"
-	- at erase "$(INTDIR)\apr_ldap_option.obj"
-	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
-	- at erase "$(INTDIR)\apr_ldap_stub.obj"
-	- at erase "$(INTDIR)\apr_ldap_url.obj"
-	- at erase "$(INTDIR)\apr_md4.obj"
-	- at erase "$(INTDIR)\apr_md5.obj"
-	- at erase "$(INTDIR)\apr_memcache.obj"
-	- at erase "$(INTDIR)\apr_passwd.obj"
-	- at erase "$(INTDIR)\apr_queue.obj"
-	- at erase "$(INTDIR)\apr_redis.obj"
-	- at erase "$(INTDIR)\apr_reslist.obj"
-	- at erase "$(INTDIR)\apr_rmm.obj"
-	- at erase "$(INTDIR)\apr_sha1.obj"
-	- at erase "$(INTDIR)\apr_siphash.obj"
-	- at erase "$(INTDIR)\apr_strmatch.obj"
-	- at erase "$(INTDIR)\apr_thread_pool.obj"
-	- at erase "$(INTDIR)\apr_uri.obj"
-	- at erase "$(INTDIR)\apr_xml.obj"
-	- at erase "$(INTDIR)\aprutil-1.idb"
-	- at erase "$(INTDIR)\aprutil-1.pdb"
-	- at erase "$(INTDIR)\apu_dso.obj"
-	- at erase "$(INTDIR)\apu_version.obj"
-	- at erase "$(INTDIR)\crypt_blowfish.obj"
-	- at erase "$(INTDIR)\getuuid.obj"
-	- at erase "$(INTDIR)\sdbm.obj"
-	- at erase "$(INTDIR)\sdbm_hash.obj"
-	- at erase "$(INTDIR)\sdbm_lock.obj"
-	- at erase "$(INTDIR)\sdbm_pair.obj"
-	- at erase "$(INTDIR)\uuid.obj"
-	- at erase "$(INTDIR)\xlate.obj"
-	- at erase "$(OUTDIR)\aprutil-1.lib"
-	- at erase ".\include\apr_ldap.h"
-	- at erase ".\include\apu.h"
-	- at erase ".\include\apu_want.h"
-	- at erase ".\include\private\apu_config.h"
-	- at erase ".\include\private\apu_select_dbm.h"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib"  $(SSLINC)/D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\aprutil-1" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprutil.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aprutil-1.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\apr_brigade.obj" \
-	"$(INTDIR)\apr_buckets.obj" \
-	"$(INTDIR)\apr_buckets_alloc.obj" \
-	"$(INTDIR)\apr_buckets_eos.obj" \
-	"$(INTDIR)\apr_buckets_file.obj" \
-	"$(INTDIR)\apr_buckets_flush.obj" \
-	"$(INTDIR)\apr_buckets_heap.obj" \
-	"$(INTDIR)\apr_buckets_mmap.obj" \
-	"$(INTDIR)\apr_buckets_pipe.obj" \
-	"$(INTDIR)\apr_buckets_pool.obj" \
-	"$(INTDIR)\apr_buckets_refcount.obj" \
-	"$(INTDIR)\apr_buckets_simple.obj" \
-	"$(INTDIR)\apr_buckets_socket.obj" \
-	"$(INTDIR)\apr_crypto.obj" \
-	"$(INTDIR)\apr_md4.obj" \
-	"$(INTDIR)\apr_md5.obj" \
-	"$(INTDIR)\apr_passwd.obj" \
-	"$(INTDIR)\apr_sha1.obj" \
-	"$(INTDIR)\apr_siphash.obj" \
-	"$(INTDIR)\crypt_blowfish.obj" \
-	"$(INTDIR)\getuuid.obj" \
-	"$(INTDIR)\uuid.obj" \
-	"$(INTDIR)\apr_dbd.obj" \
-	"$(INTDIR)\apr_dbd_mysql.obj" \
-	"$(INTDIR)\apr_dbd_odbc.obj" \
-	"$(INTDIR)\apr_dbd_oracle.obj" \
-	"$(INTDIR)\apr_dbd_pgsql.obj" \
-	"$(INTDIR)\apr_dbd_sqlite2.obj" \
-	"$(INTDIR)\apr_dbd_sqlite3.obj" \
-	"$(INTDIR)\apr_dbm.obj" \
-	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
-	"$(INTDIR)\apr_dbm_gdbm.obj" \
-	"$(INTDIR)\apr_dbm_sdbm.obj" \
-	"$(INTDIR)\apr_base64.obj" \
-	"$(INTDIR)\apr_hooks.obj" \
-	"$(INTDIR)\apr_ldap_init.obj" \
-	"$(INTDIR)\apr_ldap_option.obj" \
-	"$(INTDIR)\apr_ldap_rebind.obj" \
-	"$(INTDIR)\apr_ldap_stub.obj" \
-	"$(INTDIR)\apr_ldap_url.obj" \
-	"$(INTDIR)\apr_memcache.obj" \
-	"$(INTDIR)\apr_date.obj" \
-	"$(INTDIR)\apu_dso.obj" \
-	"$(INTDIR)\apr_queue.obj" \
-	"$(INTDIR)\apr_redis.obj" \
-	"$(INTDIR)\apr_reslist.obj" \
-	"$(INTDIR)\apr_rmm.obj" \
-	"$(INTDIR)\apr_thread_pool.obj" \
-	"$(INTDIR)\apu_version.obj" \
-	"$(INTDIR)\sdbm.obj" \
-	"$(INTDIR)\sdbm_hash.obj" \
-	"$(INTDIR)\sdbm_lock.obj" \
-	"$(INTDIR)\sdbm_pair.obj" \
-	"$(INTDIR)\apr_strmatch.obj" \
-	"$(INTDIR)\apr_uri.obj" \
-	"$(INTDIR)\xlate.obj" \
-	"$(INTDIR)\apr_xml.obj" \
-	"..\apr-iconv\LibD\apriconv-1.lib" \
-	".\xml\LibD\xml.lib"
-
-"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-OUTDIR=.\x64\LibR
-INTDIR=.\x64\LibR
-# Begin Custom Macros
-OutDir=.\x64\LibR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
-
-!ELSE 
-
-ALL : "xml - x64 Release" "apriconv - x64 Release" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"apriconv - x64 ReleaseCLEAN" "xml - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_base64.obj"
-	- at erase "$(INTDIR)\apr_brigade.obj"
-	- at erase "$(INTDIR)\apr_buckets.obj"
-	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
-	- at erase "$(INTDIR)\apr_buckets_eos.obj"
-	- at erase "$(INTDIR)\apr_buckets_file.obj"
-	- at erase "$(INTDIR)\apr_buckets_flush.obj"
-	- at erase "$(INTDIR)\apr_buckets_heap.obj"
-	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
-	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
-	- at erase "$(INTDIR)\apr_buckets_pool.obj"
-	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
-	- at erase "$(INTDIR)\apr_buckets_simple.obj"
-	- at erase "$(INTDIR)\apr_buckets_socket.obj"
-	- at erase "$(INTDIR)\apr_crypto.obj"
-	- at erase "$(INTDIR)\apr_date.obj"
-	- at erase "$(INTDIR)\apr_dbd.obj"
-	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
-	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
-	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
-	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
-	- at erase "$(INTDIR)\apr_dbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
-	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
-	- at erase "$(INTDIR)\apr_hooks.obj"
-	- at erase "$(INTDIR)\apr_ldap_init.obj"
-	- at erase "$(INTDIR)\apr_ldap_option.obj"
-	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
-	- at erase "$(INTDIR)\apr_ldap_stub.obj"
-	- at erase "$(INTDIR)\apr_ldap_url.obj"
-	- at erase "$(INTDIR)\apr_md4.obj"
-	- at erase "$(INTDIR)\apr_md5.obj"
-	- at erase "$(INTDIR)\apr_memcache.obj"
-	- at erase "$(INTDIR)\apr_passwd.obj"
-	- at erase "$(INTDIR)\apr_queue.obj"
-	- at erase "$(INTDIR)\apr_redis.obj"
-	- at erase "$(INTDIR)\apr_reslist.obj"
-	- at erase "$(INTDIR)\apr_rmm.obj"
-	- at erase "$(INTDIR)\apr_sha1.obj"
-	- at erase "$(INTDIR)\apr_siphash.obj"
-	- at erase "$(INTDIR)\apr_strmatch.obj"
-	- at erase "$(INTDIR)\apr_thread_pool.obj"
-	- at erase "$(INTDIR)\apr_uri.obj"
-	- at erase "$(INTDIR)\apr_xml.obj"
-	- at erase "$(INTDIR)\aprutil-1.idb"
-	- at erase "$(INTDIR)\aprutil-1.pdb"
-	- at erase "$(INTDIR)\apu_dso.obj"
-	- at erase "$(INTDIR)\apu_version.obj"
-	- at erase "$(INTDIR)\crypt_blowfish.obj"
-	- at erase "$(INTDIR)\getuuid.obj"
-	- at erase "$(INTDIR)\sdbm.obj"
-	- at erase "$(INTDIR)\sdbm_hash.obj"
-	- at erase "$(INTDIR)\sdbm_lock.obj"
-	- at erase "$(INTDIR)\sdbm_pair.obj"
-	- at erase "$(INTDIR)\uuid.obj"
-	- at erase "$(INTDIR)\xlate.obj"
-	- at erase "$(OUTDIR)\aprutil-1.lib"
-	- at erase ".\include\apr_ldap.h"
-	- at erase ".\include\apu.h"
-	- at erase ".\include\apu_want.h"
-	- at erase ".\include\private\apu_config.h"
-	- at erase ".\include\private\apu_select_dbm.h"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\aprutil-1" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprutil.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aprutil-1.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\apr_brigade.obj" \
-	"$(INTDIR)\apr_buckets.obj" \
-	"$(INTDIR)\apr_buckets_alloc.obj" \
-	"$(INTDIR)\apr_buckets_eos.obj" \
-	"$(INTDIR)\apr_buckets_file.obj" \
-	"$(INTDIR)\apr_buckets_flush.obj" \
-	"$(INTDIR)\apr_buckets_heap.obj" \
-	"$(INTDIR)\apr_buckets_mmap.obj" \
-	"$(INTDIR)\apr_buckets_pipe.obj" \
-	"$(INTDIR)\apr_buckets_pool.obj" \
-	"$(INTDIR)\apr_buckets_refcount.obj" \
-	"$(INTDIR)\apr_buckets_simple.obj" \
-	"$(INTDIR)\apr_buckets_socket.obj" \
-	"$(INTDIR)\apr_crypto.obj" \
-	"$(INTDIR)\apr_md4.obj" \
-	"$(INTDIR)\apr_md5.obj" \
-	"$(INTDIR)\apr_passwd.obj" \
-	"$(INTDIR)\apr_sha1.obj" \
-	"$(INTDIR)\apr_siphash.obj" \
-	"$(INTDIR)\crypt_blowfish.obj" \
-	"$(INTDIR)\getuuid.obj" \
-	"$(INTDIR)\uuid.obj" \
-	"$(INTDIR)\apr_dbd.obj" \
-	"$(INTDIR)\apr_dbd_mysql.obj" \
-	"$(INTDIR)\apr_dbd_odbc.obj" \
-	"$(INTDIR)\apr_dbd_oracle.obj" \
-	"$(INTDIR)\apr_dbd_pgsql.obj" \
-	"$(INTDIR)\apr_dbd_sqlite2.obj" \
-	"$(INTDIR)\apr_dbd_sqlite3.obj" \
-	"$(INTDIR)\apr_dbm.obj" \
-	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
-	"$(INTDIR)\apr_dbm_gdbm.obj" \
-	"$(INTDIR)\apr_dbm_sdbm.obj" \
-	"$(INTDIR)\apr_base64.obj" \
-	"$(INTDIR)\apr_hooks.obj" \
-	"$(INTDIR)\apr_ldap_init.obj" \
-	"$(INTDIR)\apr_ldap_option.obj" \
-	"$(INTDIR)\apr_ldap_rebind.obj" \
-	"$(INTDIR)\apr_ldap_stub.obj" \
-	"$(INTDIR)\apr_ldap_url.obj" \
-	"$(INTDIR)\apr_memcache.obj" \
-	"$(INTDIR)\apr_date.obj" \
-	"$(INTDIR)\apu_dso.obj" \
-	"$(INTDIR)\apr_queue.obj" \
-	"$(INTDIR)\apr_redis.obj" \
-	"$(INTDIR)\apr_reslist.obj" \
-	"$(INTDIR)\apr_rmm.obj" \
-	"$(INTDIR)\apr_thread_pool.obj" \
-	"$(INTDIR)\apu_version.obj" \
-	"$(INTDIR)\sdbm.obj" \
-	"$(INTDIR)\sdbm_hash.obj" \
-	"$(INTDIR)\sdbm_lock.obj" \
-	"$(INTDIR)\sdbm_pair.obj" \
-	"$(INTDIR)\apr_strmatch.obj" \
-	"$(INTDIR)\apr_uri.obj" \
-	"$(INTDIR)\xlate.obj" \
-	"$(INTDIR)\apr_xml.obj" \
-	"..\apr-iconv\x64\LibR\apriconv-1.lib" \
-	".\xml\x64\LibR\xml.lib"
-
-"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-OUTDIR=.\x64\LibD
-INTDIR=.\x64\LibD
-# Begin Custom Macros
-OutDir=.\x64\LibD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
-
-!ELSE 
-
-ALL : "xml - x64 Debug" "apriconv - x64 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"apriconv - x64 DebugCLEAN" "xml - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_base64.obj"
-	- at erase "$(INTDIR)\apr_brigade.obj"
-	- at erase "$(INTDIR)\apr_buckets.obj"
-	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
-	- at erase "$(INTDIR)\apr_buckets_eos.obj"
-	- at erase "$(INTDIR)\apr_buckets_file.obj"
-	- at erase "$(INTDIR)\apr_buckets_flush.obj"
-	- at erase "$(INTDIR)\apr_buckets_heap.obj"
-	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
-	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
-	- at erase "$(INTDIR)\apr_buckets_pool.obj"
-	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
-	- at erase "$(INTDIR)\apr_buckets_simple.obj"
-	- at erase "$(INTDIR)\apr_buckets_socket.obj"
-	- at erase "$(INTDIR)\apr_crypto.obj"
-	- at erase "$(INTDIR)\apr_date.obj"
-	- at erase "$(INTDIR)\apr_dbd.obj"
-	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
-	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
-	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
-	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
-	- at erase "$(INTDIR)\apr_dbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
-	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
-	- at erase "$(INTDIR)\apr_hooks.obj"
-	- at erase "$(INTDIR)\apr_ldap_init.obj"
-	- at erase "$(INTDIR)\apr_ldap_option.obj"
-	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
-	- at erase "$(INTDIR)\apr_ldap_stub.obj"
-	- at erase "$(INTDIR)\apr_ldap_url.obj"
-	- at erase "$(INTDIR)\apr_md4.obj"
-	- at erase "$(INTDIR)\apr_md5.obj"
-	- at erase "$(INTDIR)\apr_memcache.obj"
-	- at erase "$(INTDIR)\apr_passwd.obj"
-	- at erase "$(INTDIR)\apr_queue.obj"
-	- at erase "$(INTDIR)\apr_redis.obj"
-	- at erase "$(INTDIR)\apr_reslist.obj"
-	- at erase "$(INTDIR)\apr_rmm.obj"
-	- at erase "$(INTDIR)\apr_sha1.obj"
-	- at erase "$(INTDIR)\apr_siphash.obj"
-	- at erase "$(INTDIR)\apr_strmatch.obj"
-	- at erase "$(INTDIR)\apr_thread_pool.obj"
-	- at erase "$(INTDIR)\apr_uri.obj"
-	- at erase "$(INTDIR)\apr_xml.obj"
-	- at erase "$(INTDIR)\aprutil-1.idb"
-	- at erase "$(INTDIR)\aprutil-1.pdb"
-	- at erase "$(INTDIR)\apu_dso.obj"
-	- at erase "$(INTDIR)\apu_version.obj"
-	- at erase "$(INTDIR)\crypt_blowfish.obj"
-	- at erase "$(INTDIR)\getuuid.obj"
-	- at erase "$(INTDIR)\sdbm.obj"
-	- at erase "$(INTDIR)\sdbm_hash.obj"
-	- at erase "$(INTDIR)\sdbm_lock.obj"
-	- at erase "$(INTDIR)\sdbm_pair.obj"
-	- at erase "$(INTDIR)\uuid.obj"
-	- at erase "$(INTDIR)\xlate.obj"
-	- at erase "$(OUTDIR)\aprutil-1.lib"
-	- at erase ".\include\apr_ldap.h"
-	- at erase ".\include\apu.h"
-	- at erase ".\include\apu_want.h"
-	- at erase ".\include\private\apu_config.h"
-	- at erase ".\include\private\apu_select_dbm.h"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\aprutil-1" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprutil.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aprutil-1.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\apr_brigade.obj" \
-	"$(INTDIR)\apr_buckets.obj" \
-	"$(INTDIR)\apr_buckets_alloc.obj" \
-	"$(INTDIR)\apr_buckets_eos.obj" \
-	"$(INTDIR)\apr_buckets_file.obj" \
-	"$(INTDIR)\apr_buckets_flush.obj" \
-	"$(INTDIR)\apr_buckets_heap.obj" \
-	"$(INTDIR)\apr_buckets_mmap.obj" \
-	"$(INTDIR)\apr_buckets_pipe.obj" \
-	"$(INTDIR)\apr_buckets_pool.obj" \
-	"$(INTDIR)\apr_buckets_refcount.obj" \
-	"$(INTDIR)\apr_buckets_simple.obj" \
-	"$(INTDIR)\apr_buckets_socket.obj" \
-	"$(INTDIR)\apr_crypto.obj" \
-	"$(INTDIR)\apr_md4.obj" \
-	"$(INTDIR)\apr_md5.obj" \
-	"$(INTDIR)\apr_passwd.obj" \
-	"$(INTDIR)\apr_sha1.obj" \
-	"$(INTDIR)\apr_siphash.obj" \
-	"$(INTDIR)\crypt_blowfish.obj" \
-	"$(INTDIR)\getuuid.obj" \
-	"$(INTDIR)\uuid.obj" \
-	"$(INTDIR)\apr_dbd.obj" \
-	"$(INTDIR)\apr_dbd_mysql.obj" \
-	"$(INTDIR)\apr_dbd_odbc.obj" \
-	"$(INTDIR)\apr_dbd_oracle.obj" \
-	"$(INTDIR)\apr_dbd_pgsql.obj" \
-	"$(INTDIR)\apr_dbd_sqlite2.obj" \
-	"$(INTDIR)\apr_dbd_sqlite3.obj" \
-	"$(INTDIR)\apr_dbm.obj" \
-	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
-	"$(INTDIR)\apr_dbm_gdbm.obj" \
-	"$(INTDIR)\apr_dbm_sdbm.obj" \
-	"$(INTDIR)\apr_base64.obj" \
-	"$(INTDIR)\apr_hooks.obj" \
-	"$(INTDIR)\apr_ldap_init.obj" \
-	"$(INTDIR)\apr_ldap_option.obj" \
-	"$(INTDIR)\apr_ldap_rebind.obj" \
-	"$(INTDIR)\apr_ldap_stub.obj" \
-	"$(INTDIR)\apr_ldap_url.obj" \
-	"$(INTDIR)\apr_memcache.obj" \
-	"$(INTDIR)\apr_date.obj" \
-	"$(INTDIR)\apu_dso.obj" \
-	"$(INTDIR)\apr_queue.obj" \
-	"$(INTDIR)\apr_redis.obj" \
-	"$(INTDIR)\apr_reslist.obj" \
-	"$(INTDIR)\apr_rmm.obj" \
-	"$(INTDIR)\apr_thread_pool.obj" \
-	"$(INTDIR)\apu_version.obj" \
-	"$(INTDIR)\sdbm.obj" \
-	"$(INTDIR)\sdbm_hash.obj" \
-	"$(INTDIR)\sdbm_lock.obj" \
-	"$(INTDIR)\sdbm_pair.obj" \
-	"$(INTDIR)\apr_strmatch.obj" \
-	"$(INTDIR)\apr_uri.obj" \
-	"$(INTDIR)\xlate.obj" \
-	"$(INTDIR)\apr_xml.obj" \
-	"..\apr-iconv\x64\LibD\apriconv-1.lib" \
-	".\xml\x64\LibD\xml.lib"
-
-"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("aprutil.dep")
-!INCLUDE "aprutil.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "aprutil.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "aprutil - Win32 Release" || "$(CFG)" == "aprutil - Win32 Debug" || "$(CFG)" == "aprutil - x64 Release" || "$(CFG)" == "aprutil - x64 Debug"
-SOURCE=.\buckets\apr_brigade.c
-
-"$(INTDIR)\apr_brigade.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets.c
-
-"$(INTDIR)\apr_buckets.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_alloc.c
-
-"$(INTDIR)\apr_buckets_alloc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_eos.c
-
-"$(INTDIR)\apr_buckets_eos.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_file.c
-
-"$(INTDIR)\apr_buckets_file.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_flush.c
-
-"$(INTDIR)\apr_buckets_flush.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_heap.c
-
-"$(INTDIR)\apr_buckets_heap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_mmap.c
-
-"$(INTDIR)\apr_buckets_mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_pipe.c
-
-"$(INTDIR)\apr_buckets_pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_pool.c
-
-"$(INTDIR)\apr_buckets_pool.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_refcount.c
-
-"$(INTDIR)\apr_buckets_refcount.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_simple.c
-
-"$(INTDIR)\apr_buckets_simple.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_socket.c
-
-"$(INTDIR)\apr_buckets_socket.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\apr_crypto.c
-
-"$(INTDIR)\apr_crypto.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\apr_md4.c
-
-"$(INTDIR)\apr_md4.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\apr_md5.c
-
-"$(INTDIR)\apr_md5.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\apr_passwd.c
-
-"$(INTDIR)\apr_passwd.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\apr_sha1.c
-
-"$(INTDIR)\apr_sha1.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\apr_siphash.c
-
-"$(INTDIR)\apr_siphash.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\crypt_blowfish.c
-
-"$(INTDIR)\crypt_blowfish.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\getuuid.c
-
-"$(INTDIR)\getuuid.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\uuid.c
-
-"$(INTDIR)\uuid.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbd\apr_dbd.c
-
-"$(INTDIR)\apr_dbd.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbd\apr_dbd_mysql.c
-
-"$(INTDIR)\apr_dbd_mysql.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbd\apr_dbd_odbc.c
-
-"$(INTDIR)\apr_dbd_odbc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbd\apr_dbd_oracle.c
-
-"$(INTDIR)\apr_dbd_oracle.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbd\apr_dbd_pgsql.c
-
-"$(INTDIR)\apr_dbd_pgsql.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbd\apr_dbd_sqlite2.c
-
-"$(INTDIR)\apr_dbd_sqlite2.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbd\apr_dbd_sqlite3.c
-
-"$(INTDIR)\apr_dbd_sqlite3.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\apr_dbm.c
-
-"$(INTDIR)\apr_dbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\apr_dbm_berkeleydb.c
-
-"$(INTDIR)\apr_dbm_berkeleydb.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu_want.h" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\apr_dbm_gdbm.c
-
-"$(INTDIR)\apr_dbm_gdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\apr_dbm_sdbm.c
-
-"$(INTDIR)\apr_dbm_sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\encoding\apr_base64.c
-
-"$(INTDIR)\apr_base64.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\hooks\apr_hooks.c
-
-"$(INTDIR)\apr_hooks.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\ldap\apr_ldap_init.c
-
-"$(INTDIR)\apr_ldap_init.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\ldap\apr_ldap_option.c
-
-"$(INTDIR)\apr_ldap_option.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\ldap\apr_ldap_rebind.c
-
-"$(INTDIR)\apr_ldap_rebind.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\ldap\apr_ldap_stub.c
-
-"$(INTDIR)\apr_ldap_stub.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\ldap\apr_ldap_url.c
-
-"$(INTDIR)\apr_ldap_url.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\apr_ldap.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\memcache\apr_memcache.c
-
-"$(INTDIR)\apr_memcache.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apr_date.c
-
-"$(INTDIR)\apr_date.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apr_queue.c
-
-"$(INTDIR)\apr_queue.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apr_reslist.c
-
-"$(INTDIR)\apr_reslist.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apr_rmm.c
-
-"$(INTDIR)\apr_rmm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apr_thread_pool.c
-
-"$(INTDIR)\apr_thread_pool.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apu_dso.c
-
-"$(INTDIR)\apu_dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apu_version.c
-
-"$(INTDIR)\apu_version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\redis\apr_redis.c
-
-"$(INTDIR)\apr_redis.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_redis.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\sdbm\sdbm.c
-
-"$(INTDIR)\sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\sdbm\sdbm_hash.c
-
-"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\sdbm\sdbm_lock.c
-
-"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\sdbm\sdbm_pair.c
-
-"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\strmatch\apr_strmatch.c
-
-"$(INTDIR)\apr_strmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\uri\apr_uri.c
-
-"$(INTDIR)\apr_uri.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\xlate\xlate.c
-
-"$(INTDIR)\xlate.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\xml\apr_xml.c
-
-"$(INTDIR)\apr_xml.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\include\apr_ldap.hw
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr_ldap.hw > .\include\apr_ldap.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr_ldap.hw > .\include\apr_ldap.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr_ldap.hw > .\include\apr_ldap.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr_ldap.hw > .\include\apr_ldap.h
-<< 
-	
-
-!ENDIF 
-
-SOURCE=.\include\apu.hw
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-InputPath=.\include\apu.hw
-
-".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu.hw > .\include\apu.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-InputPath=.\include\apu.hw
-
-".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu.hw > .\include\apu.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-InputPath=.\include\apu.hw
-
-".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu.hw > .\include\apu.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-InputPath=.\include\apu.hw
-
-".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu.hw > .\include\apu.h
-<< 
-	
-
-!ENDIF 
-
-SOURCE=.\include\private\apu_config.hw
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-InputPath=.\include\private\apu_config.hw
-
-".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_config.hw > .\include\private\apu_config.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-InputPath=.\include\private\apu_config.hw
-
-".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_config.hw > .\include\private\apu_config.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-InputPath=.\include\private\apu_config.hw
-
-".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_config.hw > .\include\private\apu_config.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-InputPath=.\include\private\apu_config.hw
-
-".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_config.hw > .\include\private\apu_config.h
-<< 
-	
-
-!ENDIF 
-
-SOURCE=.\include\private\apu_select_dbm.hw
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-InputPath=.\include\private\apu_select_dbm.hw
-
-".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-InputPath=.\include\private\apu_select_dbm.hw
-
-".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-InputPath=.\include\private\apu_select_dbm.hw
-
-".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-InputPath=.\include\private\apu_select_dbm.hw
-
-".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
-<< 
-	
-
-!ENDIF 
-
-SOURCE=.\include\apu_want.hw
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-InputPath=.\include\apu_want.hw
-
-".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu_want.hw > .\include\apu_want.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-InputPath=.\include\apu_want.hw
-
-".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu_want.hw > .\include\apu_want.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-InputPath=.\include\apu_want.hw
-
-".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu_want.hw > .\include\apu_want.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-InputPath=.\include\apu_want.hw
-
-".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu_want.hw > .\include\apu_want.h
-<< 
-	
-
-!ENDIF 
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-"apriconv - Win32 Release" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - Win32 Release" 
-   cd "..\apr-util"
-
-"apriconv - Win32 ReleaseCLEAN" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util"
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-"apriconv - Win32 Debug" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - Win32 Debug" 
-   cd "..\apr-util"
-
-"apriconv - Win32 DebugCLEAN" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util"
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-"apriconv - x64 Release" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - x64 Release" 
-   cd "..\apr-util"
-
-"apriconv - x64 ReleaseCLEAN" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util"
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-"apriconv - x64 Debug" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - x64 Debug" 
-   cd "..\apr-util"
-
-"apriconv - x64 DebugCLEAN" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "aprutil - Win32 Release"
-
-"xml - Win32 Release" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" 
-   cd "..\..\.."
-
-"xml - Win32 ReleaseCLEAN" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\..\.."
-
-!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
-
-"xml - Win32 Debug" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" 
-   cd "..\..\.."
-
-"xml - Win32 DebugCLEAN" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\..\.."
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
-
-"xml - x64 Release" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" 
-   cd "..\..\.."
-
-"xml - x64 ReleaseCLEAN" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" RECURSE=1 CLEAN 
-   cd "..\..\.."
-
-!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
-
-"xml - x64 Debug" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" 
-   cd "..\..\.."
-
-"xml - x64 DebugCLEAN" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\..\.."
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on aprutil.dsp
+!IF "$(CFG)" == ""
+CFG=aprutil - Win32 Release
+!MESSAGE No configuration specified. Defaulting to aprutil - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "aprutil - Win32 Release" && "$(CFG)" != "aprutil - Win32 Debug" && "$(CFG)" != "aprutil - x64 Release" && "$(CFG)" != "aprutil - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "aprutil.mak" CFG="aprutil - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "aprutil - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "aprutil - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "aprutil - x64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "aprutil - x64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF "$(_HAVE_OSSL110)" == "1"
+SSLINC=/I ../openssl/include
+!ELSE 
+SSLINC=/I ../openssl/inc32
+!ENDIF 
+
+!IF  "$(CFG)" == "aprutil - Win32 Release"
+
+OUTDIR=.\LibR
+INTDIR=.\LibR
+# Begin Custom Macros
+OutDir=.\LibR
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\aprutil-1.lib"
+
+!ELSE 
+
+ALL : "apriconv - Win32 Release" "$(OUTDIR)\aprutil-1.lib"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"apriconv - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_base64.obj"
+	- at erase "$(INTDIR)\apr_brigade.obj"
+	- at erase "$(INTDIR)\apr_buckets.obj"
+	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
+	- at erase "$(INTDIR)\apr_buckets_eos.obj"
+	- at erase "$(INTDIR)\apr_buckets_file.obj"
+	- at erase "$(INTDIR)\apr_buckets_flush.obj"
+	- at erase "$(INTDIR)\apr_buckets_heap.obj"
+	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
+	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
+	- at erase "$(INTDIR)\apr_buckets_pool.obj"
+	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
+	- at erase "$(INTDIR)\apr_buckets_simple.obj"
+	- at erase "$(INTDIR)\apr_buckets_socket.obj"
+	- at erase "$(INTDIR)\apr_crypto.obj"
+	- at erase "$(INTDIR)\apr_date.obj"
+	- at erase "$(INTDIR)\apr_dbd.obj"
+	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
+	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
+	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
+	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
+	- at erase "$(INTDIR)\apr_dbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
+	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
+	- at erase "$(INTDIR)\apr_hooks.obj"
+	- at erase "$(INTDIR)\apr_ldap_init.obj"
+	- at erase "$(INTDIR)\apr_ldap_option.obj"
+	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
+	- at erase "$(INTDIR)\apr_ldap_stub.obj"
+	- at erase "$(INTDIR)\apr_ldap_url.obj"
+	- at erase "$(INTDIR)\apr_md4.obj"
+	- at erase "$(INTDIR)\apr_md5.obj"
+	- at erase "$(INTDIR)\apr_memcache.obj"
+	- at erase "$(INTDIR)\apr_passwd.obj"
+	- at erase "$(INTDIR)\apr_queue.obj"
+	- at erase "$(INTDIR)\apr_redis.obj"
+	- at erase "$(INTDIR)\apr_reslist.obj"
+	- at erase "$(INTDIR)\apr_rmm.obj"
+	- at erase "$(INTDIR)\apr_sha1.obj"
+	- at erase "$(INTDIR)\apr_siphash.obj"
+	- at erase "$(INTDIR)\apr_strmatch.obj"
+	- at erase "$(INTDIR)\apr_thread_pool.obj"
+	- at erase "$(INTDIR)\apr_uri.obj"
+	- at erase "$(INTDIR)\apr_xml.obj"
+	- at erase "$(INTDIR)\aprutil-1.idb"
+	- at erase "$(INTDIR)\aprutil-1.pdb"
+	- at erase "$(INTDIR)\apu_dso.obj"
+	- at erase "$(INTDIR)\apu_version.obj"
+	- at erase "$(INTDIR)\crypt_blowfish.obj"
+	- at erase "$(INTDIR)\getuuid.obj"
+	- at erase "$(INTDIR)\sdbm.obj"
+	- at erase "$(INTDIR)\sdbm_hash.obj"
+	- at erase "$(INTDIR)\sdbm_lock.obj"
+	- at erase "$(INTDIR)\sdbm_pair.obj"
+	- at erase "$(INTDIR)\uuid.obj"
+	- at erase "$(INTDIR)\xlate.obj"
+	- at erase "$(OUTDIR)\aprutil-1.lib"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\aprutil-1" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprutil.bsc" 
+BSC32_SBRS= \
+	
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aprutil-1.lib" 
+LIB32_OBJS= \
+	"$(INTDIR)\apr_brigade.obj" \
+	"$(INTDIR)\apr_buckets.obj" \
+	"$(INTDIR)\apr_buckets_alloc.obj" \
+	"$(INTDIR)\apr_buckets_eos.obj" \
+	"$(INTDIR)\apr_buckets_file.obj" \
+	"$(INTDIR)\apr_buckets_flush.obj" \
+	"$(INTDIR)\apr_buckets_heap.obj" \
+	"$(INTDIR)\apr_buckets_mmap.obj" \
+	"$(INTDIR)\apr_buckets_pipe.obj" \
+	"$(INTDIR)\apr_buckets_pool.obj" \
+	"$(INTDIR)\apr_buckets_refcount.obj" \
+	"$(INTDIR)\apr_buckets_simple.obj" \
+	"$(INTDIR)\apr_buckets_socket.obj" \
+	"$(INTDIR)\apr_crypto.obj" \
+	"$(INTDIR)\apr_md4.obj" \
+	"$(INTDIR)\apr_md5.obj" \
+	"$(INTDIR)\apr_passwd.obj" \
+	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
+	"$(INTDIR)\crypt_blowfish.obj" \
+	"$(INTDIR)\getuuid.obj" \
+	"$(INTDIR)\uuid.obj" \
+	"$(INTDIR)\apr_dbd.obj" \
+	"$(INTDIR)\apr_dbd_mysql.obj" \
+	"$(INTDIR)\apr_dbd_odbc.obj" \
+	"$(INTDIR)\apr_dbd_oracle.obj" \
+	"$(INTDIR)\apr_dbd_pgsql.obj" \
+	"$(INTDIR)\apr_dbd_sqlite2.obj" \
+	"$(INTDIR)\apr_dbd_sqlite3.obj" \
+	"$(INTDIR)\apr_dbm.obj" \
+	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
+	"$(INTDIR)\apr_dbm_gdbm.obj" \
+	"$(INTDIR)\apr_dbm_sdbm.obj" \
+	"$(INTDIR)\apr_base64.obj" \
+	"$(INTDIR)\apr_hooks.obj" \
+	"$(INTDIR)\apr_ldap_init.obj" \
+	"$(INTDIR)\apr_ldap_option.obj" \
+	"$(INTDIR)\apr_ldap_rebind.obj" \
+	"$(INTDIR)\apr_ldap_stub.obj" \
+	"$(INTDIR)\apr_ldap_url.obj" \
+	"$(INTDIR)\apr_memcache.obj" \
+	"$(INTDIR)\apr_date.obj" \
+	"$(INTDIR)\apu_dso.obj" \
+	"$(INTDIR)\apr_queue.obj" \
+	"$(INTDIR)\apr_redis.obj" \
+	"$(INTDIR)\apr_reslist.obj" \
+	"$(INTDIR)\apr_rmm.obj" \
+	"$(INTDIR)\apr_thread_pool.obj" \
+	"$(INTDIR)\apu_version.obj" \
+	"$(INTDIR)\sdbm.obj" \
+	"$(INTDIR)\sdbm_hash.obj" \
+	"$(INTDIR)\sdbm_lock.obj" \
+	"$(INTDIR)\sdbm_pair.obj" \
+	"$(INTDIR)\apr_strmatch.obj" \
+	"$(INTDIR)\apr_uri.obj" \
+	"$(INTDIR)\xlate.obj" \
+	"$(INTDIR)\apr_xml.obj" \
+	"..\apr-iconv\LibR\apriconv-1.lib"
+
+"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+    $(LIB32) @<<
+  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
+
+OUTDIR=.\LibD
+INTDIR=.\LibD
+# Begin Custom Macros
+OutDir=.\LibD
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
+
+!ELSE 
+
+ALL : "apriconv - Win32 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"apriconv - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_base64.obj"
+	- at erase "$(INTDIR)\apr_brigade.obj"
+	- at erase "$(INTDIR)\apr_buckets.obj"
+	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
+	- at erase "$(INTDIR)\apr_buckets_eos.obj"
+	- at erase "$(INTDIR)\apr_buckets_file.obj"
+	- at erase "$(INTDIR)\apr_buckets_flush.obj"
+	- at erase "$(INTDIR)\apr_buckets_heap.obj"
+	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
+	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
+	- at erase "$(INTDIR)\apr_buckets_pool.obj"
+	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
+	- at erase "$(INTDIR)\apr_buckets_simple.obj"
+	- at erase "$(INTDIR)\apr_buckets_socket.obj"
+	- at erase "$(INTDIR)\apr_crypto.obj"
+	- at erase "$(INTDIR)\apr_date.obj"
+	- at erase "$(INTDIR)\apr_dbd.obj"
+	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
+	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
+	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
+	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
+	- at erase "$(INTDIR)\apr_dbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
+	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
+	- at erase "$(INTDIR)\apr_hooks.obj"
+	- at erase "$(INTDIR)\apr_ldap_init.obj"
+	- at erase "$(INTDIR)\apr_ldap_option.obj"
+	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
+	- at erase "$(INTDIR)\apr_ldap_stub.obj"
+	- at erase "$(INTDIR)\apr_ldap_url.obj"
+	- at erase "$(INTDIR)\apr_md4.obj"
+	- at erase "$(INTDIR)\apr_md5.obj"
+	- at erase "$(INTDIR)\apr_memcache.obj"
+	- at erase "$(INTDIR)\apr_passwd.obj"
+	- at erase "$(INTDIR)\apr_queue.obj"
+	- at erase "$(INTDIR)\apr_redis.obj"
+	- at erase "$(INTDIR)\apr_reslist.obj"
+	- at erase "$(INTDIR)\apr_rmm.obj"
+	- at erase "$(INTDIR)\apr_sha1.obj"
+	- at erase "$(INTDIR)\apr_siphash.obj"
+	- at erase "$(INTDIR)\apr_strmatch.obj"
+	- at erase "$(INTDIR)\apr_thread_pool.obj"
+	- at erase "$(INTDIR)\apr_uri.obj"
+	- at erase "$(INTDIR)\apr_xml.obj"
+	- at erase "$(INTDIR)\aprutil-1.idb"
+	- at erase "$(INTDIR)\aprutil-1.pdb"
+	- at erase "$(INTDIR)\apu_dso.obj"
+	- at erase "$(INTDIR)\apu_version.obj"
+	- at erase "$(INTDIR)\crypt_blowfish.obj"
+	- at erase "$(INTDIR)\getuuid.obj"
+	- at erase "$(INTDIR)\sdbm.obj"
+	- at erase "$(INTDIR)\sdbm_hash.obj"
+	- at erase "$(INTDIR)\sdbm_lock.obj"
+	- at erase "$(INTDIR)\sdbm_pair.obj"
+	- at erase "$(INTDIR)\uuid.obj"
+	- at erase "$(INTDIR)\xlate.obj"
+	- at erase "$(OUTDIR)\aprutil-1.lib"
+	- at erase ".\include\apr_ldap.h"
+	- at erase ".\include\apu.h"
+	- at erase ".\include\apu_want.h"
+	- at erase ".\include\private\apu_config.h"
+	- at erase ".\include\private\apu_select_dbm.h"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib"  $(SSLINC)/D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\aprutil-1" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprutil.bsc" 
+BSC32_SBRS= \
+	
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aprutil-1.lib" 
+LIB32_OBJS= \
+	"$(INTDIR)\apr_brigade.obj" \
+	"$(INTDIR)\apr_buckets.obj" \
+	"$(INTDIR)\apr_buckets_alloc.obj" \
+	"$(INTDIR)\apr_buckets_eos.obj" \
+	"$(INTDIR)\apr_buckets_file.obj" \
+	"$(INTDIR)\apr_buckets_flush.obj" \
+	"$(INTDIR)\apr_buckets_heap.obj" \
+	"$(INTDIR)\apr_buckets_mmap.obj" \
+	"$(INTDIR)\apr_buckets_pipe.obj" \
+	"$(INTDIR)\apr_buckets_pool.obj" \
+	"$(INTDIR)\apr_buckets_refcount.obj" \
+	"$(INTDIR)\apr_buckets_simple.obj" \
+	"$(INTDIR)\apr_buckets_socket.obj" \
+	"$(INTDIR)\apr_crypto.obj" \
+	"$(INTDIR)\apr_md4.obj" \
+	"$(INTDIR)\apr_md5.obj" \
+	"$(INTDIR)\apr_passwd.obj" \
+	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
+	"$(INTDIR)\crypt_blowfish.obj" \
+	"$(INTDIR)\getuuid.obj" \
+	"$(INTDIR)\uuid.obj" \
+	"$(INTDIR)\apr_dbd.obj" \
+	"$(INTDIR)\apr_dbd_mysql.obj" \
+	"$(INTDIR)\apr_dbd_odbc.obj" \
+	"$(INTDIR)\apr_dbd_oracle.obj" \
+	"$(INTDIR)\apr_dbd_pgsql.obj" \
+	"$(INTDIR)\apr_dbd_sqlite2.obj" \
+	"$(INTDIR)\apr_dbd_sqlite3.obj" \
+	"$(INTDIR)\apr_dbm.obj" \
+	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
+	"$(INTDIR)\apr_dbm_gdbm.obj" \
+	"$(INTDIR)\apr_dbm_sdbm.obj" \
+	"$(INTDIR)\apr_base64.obj" \
+	"$(INTDIR)\apr_hooks.obj" \
+	"$(INTDIR)\apr_ldap_init.obj" \
+	"$(INTDIR)\apr_ldap_option.obj" \
+	"$(INTDIR)\apr_ldap_rebind.obj" \
+	"$(INTDIR)\apr_ldap_stub.obj" \
+	"$(INTDIR)\apr_ldap_url.obj" \
+	"$(INTDIR)\apr_memcache.obj" \
+	"$(INTDIR)\apr_date.obj" \
+	"$(INTDIR)\apu_dso.obj" \
+	"$(INTDIR)\apr_queue.obj" \
+	"$(INTDIR)\apr_redis.obj" \
+	"$(INTDIR)\apr_reslist.obj" \
+	"$(INTDIR)\apr_rmm.obj" \
+	"$(INTDIR)\apr_thread_pool.obj" \
+	"$(INTDIR)\apu_version.obj" \
+	"$(INTDIR)\sdbm.obj" \
+	"$(INTDIR)\sdbm_hash.obj" \
+	"$(INTDIR)\sdbm_lock.obj" \
+	"$(INTDIR)\sdbm_pair.obj" \
+	"$(INTDIR)\apr_strmatch.obj" \
+	"$(INTDIR)\apr_uri.obj" \
+	"$(INTDIR)\xlate.obj" \
+	"$(INTDIR)\apr_xml.obj" \
+	"..\apr-iconv\LibD\apriconv-1.lib"
+
+"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+    $(LIB32) @<<
+  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
+
+OUTDIR=.\x64\LibR
+INTDIR=.\x64\LibR
+# Begin Custom Macros
+OutDir=.\x64\LibR
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
+
+!ELSE 
+
+ALL : "apriconv - x64 Release" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"apriconv - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_base64.obj"
+	- at erase "$(INTDIR)\apr_brigade.obj"
+	- at erase "$(INTDIR)\apr_buckets.obj"
+	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
+	- at erase "$(INTDIR)\apr_buckets_eos.obj"
+	- at erase "$(INTDIR)\apr_buckets_file.obj"
+	- at erase "$(INTDIR)\apr_buckets_flush.obj"
+	- at erase "$(INTDIR)\apr_buckets_heap.obj"
+	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
+	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
+	- at erase "$(INTDIR)\apr_buckets_pool.obj"
+	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
+	- at erase "$(INTDIR)\apr_buckets_simple.obj"
+	- at erase "$(INTDIR)\apr_buckets_socket.obj"
+	- at erase "$(INTDIR)\apr_crypto.obj"
+	- at erase "$(INTDIR)\apr_date.obj"
+	- at erase "$(INTDIR)\apr_dbd.obj"
+	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
+	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
+	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
+	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
+	- at erase "$(INTDIR)\apr_dbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
+	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
+	- at erase "$(INTDIR)\apr_hooks.obj"
+	- at erase "$(INTDIR)\apr_ldap_init.obj"
+	- at erase "$(INTDIR)\apr_ldap_option.obj"
+	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
+	- at erase "$(INTDIR)\apr_ldap_stub.obj"
+	- at erase "$(INTDIR)\apr_ldap_url.obj"
+	- at erase "$(INTDIR)\apr_md4.obj"
+	- at erase "$(INTDIR)\apr_md5.obj"
+	- at erase "$(INTDIR)\apr_memcache.obj"
+	- at erase "$(INTDIR)\apr_passwd.obj"
+	- at erase "$(INTDIR)\apr_queue.obj"
+	- at erase "$(INTDIR)\apr_redis.obj"
+	- at erase "$(INTDIR)\apr_reslist.obj"
+	- at erase "$(INTDIR)\apr_rmm.obj"
+	- at erase "$(INTDIR)\apr_sha1.obj"
+	- at erase "$(INTDIR)\apr_siphash.obj"
+	- at erase "$(INTDIR)\apr_strmatch.obj"
+	- at erase "$(INTDIR)\apr_thread_pool.obj"
+	- at erase "$(INTDIR)\apr_uri.obj"
+	- at erase "$(INTDIR)\apr_xml.obj"
+	- at erase "$(INTDIR)\aprutil-1.idb"
+	- at erase "$(INTDIR)\aprutil-1.pdb"
+	- at erase "$(INTDIR)\apu_dso.obj"
+	- at erase "$(INTDIR)\apu_version.obj"
+	- at erase "$(INTDIR)\crypt_blowfish.obj"
+	- at erase "$(INTDIR)\getuuid.obj"
+	- at erase "$(INTDIR)\sdbm.obj"
+	- at erase "$(INTDIR)\sdbm_hash.obj"
+	- at erase "$(INTDIR)\sdbm_lock.obj"
+	- at erase "$(INTDIR)\sdbm_pair.obj"
+	- at erase "$(INTDIR)\uuid.obj"
+	- at erase "$(INTDIR)\xlate.obj"
+	- at erase "$(OUTDIR)\aprutil-1.lib"
+	- at erase ".\include\apr_ldap.h"
+	- at erase ".\include\apu.h"
+	- at erase ".\include\apu_want.h"
+	- at erase ".\include\private\apu_config.h"
+	- at erase ".\include\private\apu_select_dbm.h"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\aprutil-1" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprutil.bsc" 
+BSC32_SBRS= \
+	
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aprutil-1.lib" 
+LIB32_OBJS= \
+	"$(INTDIR)\apr_brigade.obj" \
+	"$(INTDIR)\apr_buckets.obj" \
+	"$(INTDIR)\apr_buckets_alloc.obj" \
+	"$(INTDIR)\apr_buckets_eos.obj" \
+	"$(INTDIR)\apr_buckets_file.obj" \
+	"$(INTDIR)\apr_buckets_flush.obj" \
+	"$(INTDIR)\apr_buckets_heap.obj" \
+	"$(INTDIR)\apr_buckets_mmap.obj" \
+	"$(INTDIR)\apr_buckets_pipe.obj" \
+	"$(INTDIR)\apr_buckets_pool.obj" \
+	"$(INTDIR)\apr_buckets_refcount.obj" \
+	"$(INTDIR)\apr_buckets_simple.obj" \
+	"$(INTDIR)\apr_buckets_socket.obj" \
+	"$(INTDIR)\apr_crypto.obj" \
+	"$(INTDIR)\apr_md4.obj" \
+	"$(INTDIR)\apr_md5.obj" \
+	"$(INTDIR)\apr_passwd.obj" \
+	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
+	"$(INTDIR)\crypt_blowfish.obj" \
+	"$(INTDIR)\getuuid.obj" \
+	"$(INTDIR)\uuid.obj" \
+	"$(INTDIR)\apr_dbd.obj" \
+	"$(INTDIR)\apr_dbd_mysql.obj" \
+	"$(INTDIR)\apr_dbd_odbc.obj" \
+	"$(INTDIR)\apr_dbd_oracle.obj" \
+	"$(INTDIR)\apr_dbd_pgsql.obj" \
+	"$(INTDIR)\apr_dbd_sqlite2.obj" \
+	"$(INTDIR)\apr_dbd_sqlite3.obj" \
+	"$(INTDIR)\apr_dbm.obj" \
+	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
+	"$(INTDIR)\apr_dbm_gdbm.obj" \
+	"$(INTDIR)\apr_dbm_sdbm.obj" \
+	"$(INTDIR)\apr_base64.obj" \
+	"$(INTDIR)\apr_hooks.obj" \
+	"$(INTDIR)\apr_ldap_init.obj" \
+	"$(INTDIR)\apr_ldap_option.obj" \
+	"$(INTDIR)\apr_ldap_rebind.obj" \
+	"$(INTDIR)\apr_ldap_stub.obj" \
+	"$(INTDIR)\apr_ldap_url.obj" \
+	"$(INTDIR)\apr_memcache.obj" \
+	"$(INTDIR)\apr_date.obj" \
+	"$(INTDIR)\apu_dso.obj" \
+	"$(INTDIR)\apr_queue.obj" \
+	"$(INTDIR)\apr_redis.obj" \
+	"$(INTDIR)\apr_reslist.obj" \
+	"$(INTDIR)\apr_rmm.obj" \
+	"$(INTDIR)\apr_thread_pool.obj" \
+	"$(INTDIR)\apu_version.obj" \
+	"$(INTDIR)\sdbm.obj" \
+	"$(INTDIR)\sdbm_hash.obj" \
+	"$(INTDIR)\sdbm_lock.obj" \
+	"$(INTDIR)\sdbm_pair.obj" \
+	"$(INTDIR)\apr_strmatch.obj" \
+	"$(INTDIR)\apr_uri.obj" \
+	"$(INTDIR)\xlate.obj" \
+	"$(INTDIR)\apr_xml.obj" \
+	"..\apr-iconv\x64\LibR\apriconv-1.lib"
+
+"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+    $(LIB32) @<<
+  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
+
+OUTDIR=.\x64\LibD
+INTDIR=.\x64\LibD
+# Begin Custom Macros
+OutDir=.\x64\LibD
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
+
+!ELSE 
+
+ALL : "apriconv - x64 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"apriconv - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_base64.obj"
+	- at erase "$(INTDIR)\apr_brigade.obj"
+	- at erase "$(INTDIR)\apr_buckets.obj"
+	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
+	- at erase "$(INTDIR)\apr_buckets_eos.obj"
+	- at erase "$(INTDIR)\apr_buckets_file.obj"
+	- at erase "$(INTDIR)\apr_buckets_flush.obj"
+	- at erase "$(INTDIR)\apr_buckets_heap.obj"
+	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
+	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
+	- at erase "$(INTDIR)\apr_buckets_pool.obj"
+	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
+	- at erase "$(INTDIR)\apr_buckets_simple.obj"
+	- at erase "$(INTDIR)\apr_buckets_socket.obj"
+	- at erase "$(INTDIR)\apr_crypto.obj"
+	- at erase "$(INTDIR)\apr_date.obj"
+	- at erase "$(INTDIR)\apr_dbd.obj"
+	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
+	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
+	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
+	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
+	- at erase "$(INTDIR)\apr_dbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
+	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
+	- at erase "$(INTDIR)\apr_hooks.obj"
+	- at erase "$(INTDIR)\apr_ldap_init.obj"
+	- at erase "$(INTDIR)\apr_ldap_option.obj"
+	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
+	- at erase "$(INTDIR)\apr_ldap_stub.obj"
+	- at erase "$(INTDIR)\apr_ldap_url.obj"
+	- at erase "$(INTDIR)\apr_md4.obj"
+	- at erase "$(INTDIR)\apr_md5.obj"
+	- at erase "$(INTDIR)\apr_memcache.obj"
+	- at erase "$(INTDIR)\apr_passwd.obj"
+	- at erase "$(INTDIR)\apr_queue.obj"
+	- at erase "$(INTDIR)\apr_redis.obj"
+	- at erase "$(INTDIR)\apr_reslist.obj"
+	- at erase "$(INTDIR)\apr_rmm.obj"
+	- at erase "$(INTDIR)\apr_sha1.obj"
+	- at erase "$(INTDIR)\apr_siphash.obj"
+	- at erase "$(INTDIR)\apr_strmatch.obj"
+	- at erase "$(INTDIR)\apr_thread_pool.obj"
+	- at erase "$(INTDIR)\apr_uri.obj"
+	- at erase "$(INTDIR)\apr_xml.obj"
+	- at erase "$(INTDIR)\aprutil-1.idb"
+	- at erase "$(INTDIR)\aprutil-1.pdb"
+	- at erase "$(INTDIR)\apu_dso.obj"
+	- at erase "$(INTDIR)\apu_version.obj"
+	- at erase "$(INTDIR)\crypt_blowfish.obj"
+	- at erase "$(INTDIR)\getuuid.obj"
+	- at erase "$(INTDIR)\sdbm.obj"
+	- at erase "$(INTDIR)\sdbm_hash.obj"
+	- at erase "$(INTDIR)\sdbm_lock.obj"
+	- at erase "$(INTDIR)\sdbm_pair.obj"
+	- at erase "$(INTDIR)\uuid.obj"
+	- at erase "$(INTDIR)\xlate.obj"
+	- at erase "$(OUTDIR)\aprutil-1.lib"
+	- at erase ".\include\apr_ldap.h"
+	- at erase ".\include\apu.h"
+	- at erase ".\include\apu_want.h"
+	- at erase ".\include\private\apu_config.h"
+	- at erase ".\include\private\apu_select_dbm.h"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\aprutil-1" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprutil.bsc" 
+BSC32_SBRS= \
+	
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aprutil-1.lib" 
+LIB32_OBJS= \
+	"$(INTDIR)\apr_brigade.obj" \
+	"$(INTDIR)\apr_buckets.obj" \
+	"$(INTDIR)\apr_buckets_alloc.obj" \
+	"$(INTDIR)\apr_buckets_eos.obj" \
+	"$(INTDIR)\apr_buckets_file.obj" \
+	"$(INTDIR)\apr_buckets_flush.obj" \
+	"$(INTDIR)\apr_buckets_heap.obj" \
+	"$(INTDIR)\apr_buckets_mmap.obj" \
+	"$(INTDIR)\apr_buckets_pipe.obj" \
+	"$(INTDIR)\apr_buckets_pool.obj" \
+	"$(INTDIR)\apr_buckets_refcount.obj" \
+	"$(INTDIR)\apr_buckets_simple.obj" \
+	"$(INTDIR)\apr_buckets_socket.obj" \
+	"$(INTDIR)\apr_crypto.obj" \
+	"$(INTDIR)\apr_md4.obj" \
+	"$(INTDIR)\apr_md5.obj" \
+	"$(INTDIR)\apr_passwd.obj" \
+	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
+	"$(INTDIR)\crypt_blowfish.obj" \
+	"$(INTDIR)\getuuid.obj" \
+	"$(INTDIR)\uuid.obj" \
+	"$(INTDIR)\apr_dbd.obj" \
+	"$(INTDIR)\apr_dbd_mysql.obj" \
+	"$(INTDIR)\apr_dbd_odbc.obj" \
+	"$(INTDIR)\apr_dbd_oracle.obj" \
+	"$(INTDIR)\apr_dbd_pgsql.obj" \
+	"$(INTDIR)\apr_dbd_sqlite2.obj" \
+	"$(INTDIR)\apr_dbd_sqlite3.obj" \
+	"$(INTDIR)\apr_dbm.obj" \
+	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
+	"$(INTDIR)\apr_dbm_gdbm.obj" \
+	"$(INTDIR)\apr_dbm_sdbm.obj" \
+	"$(INTDIR)\apr_base64.obj" \
+	"$(INTDIR)\apr_hooks.obj" \
+	"$(INTDIR)\apr_ldap_init.obj" \
+	"$(INTDIR)\apr_ldap_option.obj" \
+	"$(INTDIR)\apr_ldap_rebind.obj" \
+	"$(INTDIR)\apr_ldap_stub.obj" \
+	"$(INTDIR)\apr_ldap_url.obj" \
+	"$(INTDIR)\apr_memcache.obj" \
+	"$(INTDIR)\apr_date.obj" \
+	"$(INTDIR)\apu_dso.obj" \
+	"$(INTDIR)\apr_queue.obj" \
+	"$(INTDIR)\apr_redis.obj" \
+	"$(INTDIR)\apr_reslist.obj" \
+	"$(INTDIR)\apr_rmm.obj" \
+	"$(INTDIR)\apr_thread_pool.obj" \
+	"$(INTDIR)\apu_version.obj" \
+	"$(INTDIR)\sdbm.obj" \
+	"$(INTDIR)\sdbm_hash.obj" \
+	"$(INTDIR)\sdbm_lock.obj" \
+	"$(INTDIR)\sdbm_pair.obj" \
+	"$(INTDIR)\apr_strmatch.obj" \
+	"$(INTDIR)\apr_uri.obj" \
+	"$(INTDIR)\xlate.obj" \
+	"$(INTDIR)\apr_xml.obj" \
+	"..\apr-iconv\x64\LibD\apriconv-1.lib"
+
+"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+    $(LIB32) @<<
+  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("aprutil.dep")
+!INCLUDE "aprutil.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "aprutil.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "aprutil - Win32 Release" || "$(CFG)" == "aprutil - Win32 Debug" || "$(CFG)" == "aprutil - x64 Release" || "$(CFG)" == "aprutil - x64 Debug"
+SOURCE=.\buckets\apr_brigade.c
+
+"$(INTDIR)\apr_brigade.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets.c
+
+"$(INTDIR)\apr_buckets.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_alloc.c
+
+"$(INTDIR)\apr_buckets_alloc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_eos.c
+
+"$(INTDIR)\apr_buckets_eos.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_file.c
+
+"$(INTDIR)\apr_buckets_file.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_flush.c
+
+"$(INTDIR)\apr_buckets_flush.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_heap.c
+
+"$(INTDIR)\apr_buckets_heap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_mmap.c
+
+"$(INTDIR)\apr_buckets_mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_pipe.c
+
+"$(INTDIR)\apr_buckets_pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_pool.c
+
+"$(INTDIR)\apr_buckets_pool.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_refcount.c
+
+"$(INTDIR)\apr_buckets_refcount.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_simple.c
+
+"$(INTDIR)\apr_buckets_simple.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_socket.c
+
+"$(INTDIR)\apr_buckets_socket.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\apr_crypto.c
+
+"$(INTDIR)\apr_crypto.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\apr_md4.c
+
+"$(INTDIR)\apr_md4.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\apr_md5.c
+
+"$(INTDIR)\apr_md5.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\apr_passwd.c
+
+"$(INTDIR)\apr_passwd.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\apr_sha1.c
+
+"$(INTDIR)\apr_sha1.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\apr_siphash.c
+
+"$(INTDIR)\apr_siphash.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\crypt_blowfish.c
+
+"$(INTDIR)\crypt_blowfish.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\getuuid.c
+
+"$(INTDIR)\getuuid.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\uuid.c
+
+"$(INTDIR)\uuid.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbd\apr_dbd.c
+
+"$(INTDIR)\apr_dbd.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbd\apr_dbd_mysql.c
+
+"$(INTDIR)\apr_dbd_mysql.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbd\apr_dbd_odbc.c
+
+"$(INTDIR)\apr_dbd_odbc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbd\apr_dbd_oracle.c
+
+"$(INTDIR)\apr_dbd_oracle.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbd\apr_dbd_pgsql.c
+
+"$(INTDIR)\apr_dbd_pgsql.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbd\apr_dbd_sqlite2.c
+
+"$(INTDIR)\apr_dbd_sqlite2.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbd\apr_dbd_sqlite3.c
+
+"$(INTDIR)\apr_dbd_sqlite3.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\apr_dbm.c
+
+"$(INTDIR)\apr_dbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\apr_dbm_berkeleydb.c
+
+"$(INTDIR)\apr_dbm_berkeleydb.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu_want.h" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\apr_dbm_gdbm.c
+
+"$(INTDIR)\apr_dbm_gdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\apr_dbm_sdbm.c
+
+"$(INTDIR)\apr_dbm_sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\encoding\apr_base64.c
+
+"$(INTDIR)\apr_base64.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\hooks\apr_hooks.c
+
+"$(INTDIR)\apr_hooks.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\ldap\apr_ldap_init.c
+
+"$(INTDIR)\apr_ldap_init.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\ldap\apr_ldap_option.c
+
+"$(INTDIR)\apr_ldap_option.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\ldap\apr_ldap_rebind.c
+
+"$(INTDIR)\apr_ldap_rebind.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\ldap\apr_ldap_stub.c
+
+"$(INTDIR)\apr_ldap_stub.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\ldap\apr_ldap_url.c
+
+"$(INTDIR)\apr_ldap_url.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\apr_ldap.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\memcache\apr_memcache.c
+
+"$(INTDIR)\apr_memcache.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apr_date.c
+
+"$(INTDIR)\apr_date.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apr_queue.c
+
+"$(INTDIR)\apr_queue.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apr_reslist.c
+
+"$(INTDIR)\apr_reslist.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apr_rmm.c
+
+"$(INTDIR)\apr_rmm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apr_thread_pool.c
+
+"$(INTDIR)\apr_thread_pool.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apu_dso.c
+
+"$(INTDIR)\apu_dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apu_version.c
+
+"$(INTDIR)\apu_version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\redis\apr_redis.c
+
+"$(INTDIR)\apr_redis.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_redis.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\sdbm\sdbm.c
+
+"$(INTDIR)\sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\sdbm\sdbm_hash.c
+
+"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\sdbm\sdbm_lock.c
+
+"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\sdbm\sdbm_pair.c
+
+"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\strmatch\apr_strmatch.c
+
+"$(INTDIR)\apr_strmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\uri\apr_uri.c
+
+"$(INTDIR)\apr_uri.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\xlate\xlate.c
+
+"$(INTDIR)\xlate.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\xml\apr_xml.c
+
+"$(INTDIR)\apr_xml.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\include\apr_ldap.hw
+
+!IF  "$(CFG)" == "aprutil - Win32 Release"
+
+InputPath=.\include\apr_ldap.hw
+
+".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apr_ldap.hw > .\include\apr_ldap.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
+
+InputPath=.\include\apr_ldap.hw
+
+".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apr_ldap.hw > .\include\apr_ldap.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
+
+InputPath=.\include\apr_ldap.hw
+
+".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apr_ldap.hw > .\include\apr_ldap.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
+
+InputPath=.\include\apr_ldap.hw
+
+".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apr_ldap.hw > .\include\apr_ldap.h
+<< 
+	
+
+!ENDIF 
+
+SOURCE=.\include\apu.hw
+
+!IF  "$(CFG)" == "aprutil - Win32 Release"
+
+InputPath=.\include\apu.hw
+
+".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu.hw > .\include\apu.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
+
+InputPath=.\include\apu.hw
+
+".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu.hw > .\include\apu.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
+
+InputPath=.\include\apu.hw
+
+".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu.hw > .\include\apu.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
+
+InputPath=.\include\apu.hw
+
+".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu.hw > .\include\apu.h
+<< 
+	
+
+!ENDIF 
+
+SOURCE=.\include\private\apu_config.hw
+
+!IF  "$(CFG)" == "aprutil - Win32 Release"
+
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_config.hw > .\include\private\apu_config.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
+
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_config.hw > .\include\private\apu_config.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
+
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_config.hw > .\include\private\apu_config.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
+
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_config.hw > .\include\private\apu_config.h
+<< 
+	
+
+!ENDIF 
+
+SOURCE=.\include\private\apu_select_dbm.hw
+
+!IF  "$(CFG)" == "aprutil - Win32 Release"
+
+InputPath=.\include\private\apu_select_dbm.hw
+
+".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
+
+InputPath=.\include\private\apu_select_dbm.hw
+
+".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
+
+InputPath=.\include\private\apu_select_dbm.hw
+
+".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
+
+InputPath=.\include\private\apu_select_dbm.hw
+
+".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
+<< 
+	
+
+!ENDIF 
+
+SOURCE=.\include\apu_want.hw
+
+!IF  "$(CFG)" == "aprutil - Win32 Release"
+
+InputPath=.\include\apu_want.hw
+
+".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu_want.hw > .\include\apu_want.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
+
+InputPath=.\include\apu_want.hw
+
+".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu_want.hw > .\include\apu_want.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
+
+InputPath=.\include\apu_want.hw
+
+".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu_want.hw > .\include\apu_want.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
+
+InputPath=.\include\apu_want.hw
+
+".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu_want.hw > .\include\apu_want.h
+<< 
+	
+
+!ENDIF 
+
+!IF  "$(CFG)" == "aprutil - Win32 Release"
+
+"apriconv - Win32 Release" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - Win32 Release" 
+   cd "..\apr-util"
+
+"apriconv - Win32 ReleaseCLEAN" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util"
+
+!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
+
+"apriconv - Win32 Debug" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - Win32 Debug" 
+   cd "..\apr-util"
+
+"apriconv - Win32 DebugCLEAN" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util"
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Release"
+
+"apriconv - x64 Release" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - x64 Release" 
+   cd "..\apr-util"
+
+"apriconv - x64 ReleaseCLEAN" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util"
+
+!ELSEIF  "$(CFG)" == "aprutil - x64 Debug"
+
+"apriconv - x64 Debug" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - x64 Debug" 
+   cd "..\apr-util"
+
+"apriconv - x64 DebugCLEAN" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/build/config.guess b/build/config.guess
index bbd48b6..8bd1095 100755
--- a/build/config.guess
+++ b/build/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2017-01-01'
+timestamp='2017-09-16'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2017-01-01'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@ timestamp='2017-01-01'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches at gnu.org>.
 
@@ -259,6 +259,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:Sortix:*:*)
 	echo ${UNAME_MACHINE}-unknown-sortix
 	exit ;;
+    *:Redox:*:*)
+	echo ${UNAME_MACHINE}-unknown-redox
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -315,15 +318,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exitcode=$?
 	trap '' 0
 	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
 	exit ;;
@@ -837,10 +831,11 @@ EOF
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case ${UNAME_PROCESSOR} in
 	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
 	esac
+	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -854,10 +849,6 @@ EOF
     *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
@@ -873,27 +864,12 @@ EOF
 		echo ia64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
@@ -1303,14 +1279,21 @@ EOF
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
 	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		       grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
 			i386) UNAME_PROCESSOR=x86_64 ;;
 			powerpc) UNAME_PROCESSOR=powerpc64 ;;
 		    esac
 		fi
+		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		       grep IS_PPC >/dev/null
+		then
+		    UNAME_PROCESSOR=powerpc
+		fi
 	    fi
 	elif test "$UNAME_PROCESSOR" = i386 ; then
 	    # Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1334,15 +1317,18 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
+    NEO-*:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+    NSR-*:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit ;;
+    NSX-*:NONSTOP_KERNEL:*:*)
+	echo nsx-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
 	exit ;;
@@ -1418,12 +1404,12 @@ cat >&2 <<EOF
 $0: unable to guess system type
 
 This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite
-config.guess and config.sub with the latest versions from:
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 If $0 has already been updated, send the following data and any
 information you think might be pertinent to config-patches at gnu.org to
diff --git a/build/config.sub b/build/config.sub
index 7e792b4..95dc3d0 100755
--- a/build/config.sub
+++ b/build/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2017-01-01'
+timestamp='2017-09-16'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2017-01-01'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@ timestamp='2017-01-01'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -229,9 +229,6 @@ case $os in
 	-ptx*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
 		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
 	-psos*)
 		os=-psos
 		;;
@@ -263,7 +260,7 @@ case $basic_machine in
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
-	| i370 | i860 | i960 | ia64 \
+	| i370 | i860 | i960 | ia16 | ia64 \
 	| ip2k | iq2000 \
 	| k1om \
 	| le32 | le64 \
@@ -315,6 +312,7 @@ case $basic_machine in
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| visium \
+	| wasm32 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -388,7 +386,7 @@ case $basic_machine in
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
 	| ip2k-* | iq2000-* \
 	| k1om-* \
 	| le32-* | le64-* \
@@ -446,6 +444,7 @@ case $basic_machine in
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
 	| visium-* \
+	| wasm32-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -948,6 +947,9 @@ case $basic_machine in
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
+	nsx-tandem)
+		basic_machine=nsx-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -1243,6 +1245,9 @@ case $basic_machine in
 		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
+	wasm32)
+		basic_machine=wasm32-unknown
+		;;
 	w65*)
 		basic_machine=w65-wdc
 		os=-none
@@ -1251,6 +1256,9 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	x64)
+		basic_machine=x86_64-pc
+		;;
 	xbox)
 		basic_machine=i686-pc
 		os=-mingw32
@@ -1358,8 +1366,8 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
+	# First match some system type aliases that might get confused
+	# with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-auroraux)
 		os=-auroraux
@@ -1379,9 +1387,9 @@ case $os in
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
-	# First accept the basic system types.
+	# Now accept the basic system types.
 	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
+	# Each alternative MUST end in a * to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
diff --git a/crypto/apr_crypto.c b/crypto/apr_crypto.c
index e1a0320..9e6e0be 100644
--- a/crypto/apr_crypto.c
+++ b/crypto/apr_crypto.c
@@ -151,7 +151,7 @@ void apr__memzero_explicit(void *buffer, apr_size_t size)
 }
 #endif
 
-APR_DECLARE(apr_status_t) apr_crypto_memzero(void *buffer, apr_size_t size)
+APU_DECLARE(apr_status_t) apr_crypto_memzero(void *buffer, apr_size_t size)
 {
 #if defined(WIN32)
     SecureZeroMemory(buffer, size);
@@ -173,7 +173,7 @@ APR_DECLARE(apr_status_t) apr_crypto_memzero(void *buffer, apr_size_t size)
     return APR_SUCCESS;
 }
 
-APR_DECLARE(int) apr_crypto_equals(const void *buf1, const void *buf2,
+APU_DECLARE(int) apr_crypto_equals(const void *buf1, const void *buf2,
                                    apr_size_t size)
 {
     const unsigned char *p1 = buf1;
@@ -386,7 +386,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get_block_key_modes(apr_hash_t **modes,
  *         not known. APR_EPADDING if padding was requested but is not supported.
  *         APR_ENOTIMPL if not implemented.
  */
-APR_DECLARE(apr_status_t) apr_crypto_key(apr_crypto_key_t **key,
+APU_DECLARE(apr_status_t) apr_crypto_key(apr_crypto_key_t **key,
         const apr_crypto_key_rec_t *rec, const apr_crypto_t *f, apr_pool_t *p)
 {
     return f->provider->key(key, rec, f, p);
diff --git a/crypto/apr_crypto_nss.dep b/crypto/apr_crypto_nss.dep
index 90c1041..94fb8bd 100644
--- a/crypto/apr_crypto_nss.dep
+++ b/crypto/apr_crypto_nss.dep
@@ -1,15 +1,15 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_crypto_nss.mak
-
-.\apr_crypto_nss.c : \
-	"..\include\apr_buckets.h"\
-	"..\include\apr_crypto.h"\
-	"..\include\apu.h"\
-	"..\include\apu_errno.h"\
-	"..\include\private\apr_crypto_internal.h"\
-	"..\include\private\apu_config.h"\
-	
-
-..\libaprutil.rc : \
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by apr_crypto_nss.mak
+
+.\apr_crypto_nss.c : \
+	"..\include\apr_buckets.h"\
+	"..\include\apr_crypto.h"\
+	"..\include\apu.h"\
+	"..\include\apu_errno.h"\
+	"..\include\private\apr_crypto_internal.h"\
+	"..\include\private\apu_config.h"\
+	
+
+..\libaprutil.rc : \
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	
diff --git a/crypto/apr_crypto_nss.mak b/crypto/apr_crypto_nss.mak
index 6b3c793..626ee30 100644
--- a/crypto/apr_crypto_nss.mak
+++ b/crypto/apr_crypto_nss.mak
@@ -1,594 +1,594 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_crypto_nss.dsp
-!IF "$(CFG)" == ""
-CFG=apr_crypto_nss - Win32 Release
-!MESSAGE No configuration specified. Defaulting to apr_crypto_nss - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_crypto_nss - Win32 Release" && "$(CFG)" != "apr_crypto_nss - Win32 Debug" && "$(CFG)" != "apr_crypto_nss - x64 Release" && "$(CFG)" != "apr_crypto_nss - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_crypto_nss.mak" CFG="apr_crypto_nss - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_crypto_nss - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_crypto_nss - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_crypto_nss - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_crypto_nss - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_crypto_nss - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_crypto_nss-1.res"
-	- at erase "$(INTDIR)\apr_crypto_nss.obj"
-	- at erase "$(INTDIR)\apr_crypto_nss_src.idb"
-	- at erase "$(INTDIR)\apr_crypto_nss_src.pdb"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.dll"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.exp"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.lib"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../nss/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_NSS=1 /D HAVE_NSS_H=1 /D HAVE_PK11PUB_H=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_nss_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_nss" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_nss.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib libnspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_nss-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_nss-1.dll" /implib:"$(OUTDIR)\apr_crypto_nss-1.lib" /libpath:"..\..\nss\lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_crypto_nss.obj" \
-	"$(INTDIR)\apr_crypto_nss-1.res" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_crypto_nss-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_crypto_nss-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_nss-1.dll"
-   if exist .\Release\apr_crypto_nss-1.dll.manifest mt.exe -manifest .\Release\apr_crypto_nss-1.dll.manifest -outputresource:.\Release\apr_crypto_nss-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_nss - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_crypto_nss-1.res"
-	- at erase "$(INTDIR)\apr_crypto_nss.obj"
-	- at erase "$(INTDIR)\apr_crypto_nss_src.idb"
-	- at erase "$(INTDIR)\apr_crypto_nss_src.pdb"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.dll"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.exp"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.lib"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../nss/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_NSS=1 /D HAVE_NSS_H=1 /D HAVE_PK11PUB_H=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_nss_src" /FD /D /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_nss" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_nss.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib libnspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_nss-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_nss-1.dll" /implib:"$(OUTDIR)\apr_crypto_nss-1.lib" /libpath:"..\..\nss\lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_crypto_nss.obj" \
-	"$(INTDIR)\apr_crypto_nss-1.res" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_crypto_nss-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_crypto_nss-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_nss-1.dll"
-   if exist .\Debug\apr_crypto_nss-1.dll.manifest mt.exe -manifest .\Debug\apr_crypto_nss-1.dll.manifest -outputresource:.\Debug\apr_crypto_nss-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_crypto_nss-1.res"
-	- at erase "$(INTDIR)\apr_crypto_nss.obj"
-	- at erase "$(INTDIR)\apr_crypto_nss_src.idb"
-	- at erase "$(INTDIR)\apr_crypto_nss_src.pdb"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.dll"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.exp"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.lib"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../nss/include" /D "NDEBUG" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_NSS=1 /D HAVE_NSS_H=1 /D HAVE_PK11PUB_H=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_nss_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /x64 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_nss" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_nss.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib libnspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_nss-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_nss-1.dll" /implib:"$(OUTDIR)\apr_crypto_nss-1.lib" /libpath:"..\..\nss\lib" /machine:X64 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_crypto_nss.obj" \
-	"$(INTDIR)\apr_crypto_nss-1.res" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_crypto_nss-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_crypto_nss-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_nss-1.dll"
-   if exist .\x64\Release\apr_crypto_nss-1.dll.manifest mt.exe -manifest .\x64\Release\apr_crypto_nss-1.dll.manifest -outputresource:.\x64\Release\apr_crypto_nss-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_crypto_nss-1.res"
-	- at erase "$(INTDIR)\apr_crypto_nss.obj"
-	- at erase "$(INTDIR)\apr_crypto_nss_src.idb"
-	- at erase "$(INTDIR)\apr_crypto_nss_src.pdb"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.dll"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.exp"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.lib"
-	- at erase "$(OUTDIR)\apr_crypto_nss-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../nss/include" /D "_DEBUG" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_NSS=1 /D HAVE_NSS_H=1 /D HAVE_PK11PUB_H=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_nss_src" /FD /D /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /x64 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_nss" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_nss.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib libnspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_nss-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_nss-1.dll" /implib:"$(OUTDIR)\apr_crypto_nss-1.lib" /libpath:"..\..\nss\lib" /machine:X64 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_crypto_nss.obj" \
-	"$(INTDIR)\apr_crypto_nss-1.res" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_crypto_nss-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_crypto_nss-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_nss-1.dll"
-   if exist .\x64\Debug\apr_crypto_nss-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_crypto_nss-1.dll.manifest -outputresource:.\x64\Debug\apr_crypto_nss-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_crypto_nss.dep")
-!INCLUDE "apr_crypto_nss.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_crypto_nss.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_crypto_nss - Win32 Release" || "$(CFG)" == "apr_crypto_nss - Win32 Debug" || "$(CFG)" == "apr_crypto_nss - x64 Release" || "$(CFG)" == "apr_crypto_nss - x64 Debug"
-SOURCE=.\apr_crypto_nss.c
-
-"$(INTDIR)\apr_crypto_nss.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_crypto_nss - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\crypto"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\crypto"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_nss - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\crypto"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\crypto"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\crypto"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\crypto"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\crypto"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\crypto"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_crypto_nss - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\crypto"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\crypto"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_nss - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\crypto"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\crypto"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\crypto"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\crypto"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\crypto"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\crypto"
-
-!ENDIF 
-
-SOURCE=..\libaprutil.rc
-
-!IF  "$(CFG)" == "apr_crypto_nss - Win32 Release"
-
-
-"$(INTDIR)\apr_crypto_nss-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_nss" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_crypto_nss - Win32 Debug"
-
-
-"$(INTDIR)\apr_crypto_nss-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_nss" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Release"
-
-
-"$(INTDIR)\apr_crypto_nss-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_nss" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Debug"
-
-
-"$(INTDIR)\apr_crypto_nss-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_nss" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on apr_crypto_nss.dsp
+!IF "$(CFG)" == ""
+CFG=apr_crypto_nss - Win32 Release
+!MESSAGE No configuration specified. Defaulting to apr_crypto_nss - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "apr_crypto_nss - Win32 Release" && "$(CFG)" != "apr_crypto_nss - Win32 Debug" && "$(CFG)" != "apr_crypto_nss - x64 Release" && "$(CFG)" != "apr_crypto_nss - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_crypto_nss.mak" CFG="apr_crypto_nss - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_crypto_nss - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_crypto_nss - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_crypto_nss - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_crypto_nss - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_crypto_nss - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_crypto_nss-1.res"
+	- at erase "$(INTDIR)\apr_crypto_nss.obj"
+	- at erase "$(INTDIR)\apr_crypto_nss_src.idb"
+	- at erase "$(INTDIR)\apr_crypto_nss_src.pdb"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.dll"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.exp"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.lib"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../nss/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_NSS=1 /D HAVE_NSS_H=1 /D HAVE_PK11PUB_H=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_nss_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_nss" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_nss.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib libnspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_nss-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_nss-1.dll" /implib:"$(OUTDIR)\apr_crypto_nss-1.lib" /libpath:"..\..\nss\lib" /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_crypto_nss.obj" \
+	"$(INTDIR)\apr_crypto_nss-1.res" \
+	"..\..\apr\Release\libapr-1.lib" \
+	"..\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_crypto_nss-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\apr_crypto_nss-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_nss-1.dll"
+   if exist .\Release\apr_crypto_nss-1.dll.manifest mt.exe -manifest .\Release\apr_crypto_nss-1.dll.manifest -outputresource:.\Release\apr_crypto_nss-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_nss - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_crypto_nss-1.res"
+	- at erase "$(INTDIR)\apr_crypto_nss.obj"
+	- at erase "$(INTDIR)\apr_crypto_nss_src.idb"
+	- at erase "$(INTDIR)\apr_crypto_nss_src.pdb"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.dll"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.exp"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.lib"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../nss/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_NSS=1 /D HAVE_NSS_H=1 /D HAVE_PK11PUB_H=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_nss_src" /FD /D /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_nss" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_nss.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib libnspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_nss-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_nss-1.dll" /implib:"$(OUTDIR)\apr_crypto_nss-1.lib" /libpath:"..\..\nss\lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_crypto_nss.obj" \
+	"$(INTDIR)\apr_crypto_nss-1.res" \
+	"..\..\apr\Debug\libapr-1.lib" \
+	"..\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_crypto_nss-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\apr_crypto_nss-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_nss-1.dll"
+   if exist .\Debug\apr_crypto_nss-1.dll.manifest mt.exe -manifest .\Debug\apr_crypto_nss-1.dll.manifest -outputresource:.\Debug\apr_crypto_nss-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_crypto_nss-1.res"
+	- at erase "$(INTDIR)\apr_crypto_nss.obj"
+	- at erase "$(INTDIR)\apr_crypto_nss_src.idb"
+	- at erase "$(INTDIR)\apr_crypto_nss_src.pdb"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.dll"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.exp"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.lib"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../nss/include" /D "NDEBUG" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_NSS=1 /D HAVE_NSS_H=1 /D HAVE_PK11PUB_H=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_nss_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /x64 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_nss" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_nss.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib libnspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_nss-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_nss-1.dll" /implib:"$(OUTDIR)\apr_crypto_nss-1.lib" /libpath:"..\..\nss\lib" /machine:X64 /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_crypto_nss.obj" \
+	"$(INTDIR)\apr_crypto_nss-1.res" \
+	"..\..\apr\x64\Release\libapr-1.lib" \
+	"..\x64\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_crypto_nss-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\apr_crypto_nss-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_nss-1.dll"
+   if exist .\x64\Release\apr_crypto_nss-1.dll.manifest mt.exe -manifest .\x64\Release\apr_crypto_nss-1.dll.manifest -outputresource:.\x64\Release\apr_crypto_nss-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_crypto_nss-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_crypto_nss-1.res"
+	- at erase "$(INTDIR)\apr_crypto_nss.obj"
+	- at erase "$(INTDIR)\apr_crypto_nss_src.idb"
+	- at erase "$(INTDIR)\apr_crypto_nss_src.pdb"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.dll"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.exp"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.lib"
+	- at erase "$(OUTDIR)\apr_crypto_nss-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../nss/include" /D "_DEBUG" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_NSS=1 /D HAVE_NSS_H=1 /D HAVE_PK11PUB_H=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_nss_src" /FD /D /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /x64 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_nss" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_nss.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib libnspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_nss-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_nss-1.dll" /implib:"$(OUTDIR)\apr_crypto_nss-1.lib" /libpath:"..\..\nss\lib" /machine:X64 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_crypto_nss.obj" \
+	"$(INTDIR)\apr_crypto_nss-1.res" \
+	"..\..\apr\x64\Debug\libapr-1.lib" \
+	"..\x64\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_crypto_nss-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\apr_crypto_nss-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_nss-1.dll"
+   if exist .\x64\Debug\apr_crypto_nss-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_crypto_nss-1.dll.manifest -outputresource:.\x64\Debug\apr_crypto_nss-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("apr_crypto_nss.dep")
+!INCLUDE "apr_crypto_nss.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "apr_crypto_nss.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "apr_crypto_nss - Win32 Release" || "$(CFG)" == "apr_crypto_nss - Win32 Debug" || "$(CFG)" == "apr_crypto_nss - x64 Release" || "$(CFG)" == "apr_crypto_nss - x64 Debug"
+SOURCE=.\apr_crypto_nss.c
+
+"$(INTDIR)\apr_crypto_nss.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "apr_crypto_nss - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util\crypto"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\crypto"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_nss - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util\crypto"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\crypto"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util\crypto"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\crypto"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util\crypto"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\crypto"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_crypto_nss - Win32 Release"
+
+"libaprutil - Win32 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
+   cd ".\crypto"
+
+"libaprutil - Win32 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
+   cd ".\crypto"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_nss - Win32 Debug"
+
+"libaprutil - Win32 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
+   cd ".\crypto"
+
+"libaprutil - Win32 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".\crypto"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Release"
+
+"libaprutil - x64 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
+   cd ".\crypto"
+
+"libaprutil - x64 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
+   cd ".\crypto"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Debug"
+
+"libaprutil - x64 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
+   cd ".\crypto"
+
+"libaprutil - x64 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
+   cd ".\crypto"
+
+!ENDIF 
+
+SOURCE=..\libaprutil.rc
+
+!IF  "$(CFG)" == "apr_crypto_nss - Win32 Release"
+
+
+"$(INTDIR)\apr_crypto_nss-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_nss" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_crypto_nss - Win32 Debug"
+
+
+"$(INTDIR)\apr_crypto_nss-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_nss" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Release"
+
+
+"$(INTDIR)\apr_crypto_nss-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_nss" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_crypto_nss - x64 Debug"
+
+
+"$(INTDIR)\apr_crypto_nss-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_nss-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_nss" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/crypto/apr_crypto_openssl.c b/crypto/apr_crypto_openssl.c
index 8989a2f..310bb2c 100644
--- a/crypto/apr_crypto_openssl.c
+++ b/crypto/apr_crypto_openssl.c
@@ -31,10 +31,23 @@
 #if APU_HAVE_CRYPTO
 
 #include <openssl/evp.h>
+#include <openssl/rand.h>
 #include <openssl/engine.h>
 
 #define LOG_PREFIX "apr_crypto_openssl: "
 
+#ifndef APR_USE_OPENSSL_PRE_1_1_API
+#if defined(LIBRESSL_VERSION_NUMBER)
+/* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
+ * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...), so
+ * we have to work around this...
+ */
+#define APR_USE_OPENSSL_PRE_1_1_API (1)
+#else
+#define APR_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#endif
+#endif
+
 struct apr_crypto_t {
     apr_pool_t *pool;
     const apr_crypto_driver_t *provider;
@@ -117,8 +130,8 @@ static apr_status_t crypto_shutdown_helper(void *data)
 static apr_status_t crypto_init(apr_pool_t *pool, const char *params,
         const apu_err_t **result)
 {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-    CRYPTO_malloc_init();
+#if APR_USE_OPENSSL_PRE_1_1_API
+    (void)CRYPTO_malloc_init();
 #else
     OPENSSL_malloc_init();
 #endif
@@ -721,7 +734,7 @@ static apr_status_t crypto_block_encrypt(unsigned char **out,
     if (!EVP_EncryptUpdate(ctx->cipherCtx, (*out), &outl,
             (unsigned char *) in, inlen)) {
 #endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if APR_USE_OPENSSL_PRE_1_1_API
         EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
 #else
         EVP_CIPHER_CTX_reset(ctx->cipherCtx);
@@ -764,7 +777,7 @@ static apr_status_t crypto_block_encrypt_finish(unsigned char *out,
     else {
         *outlen = len;
     }
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if APR_USE_OPENSSL_PRE_1_1_API
     EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
 #else
     EVP_CIPHER_CTX_reset(ctx->cipherCtx);
@@ -891,7 +904,7 @@ static apr_status_t crypto_block_decrypt(unsigned char **out,
     if (!EVP_DecryptUpdate(ctx->cipherCtx, *out, &outl, (unsigned char *) in,
             inlen)) {
 #endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if APR_USE_OPENSSL_PRE_1_1_API
         EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
 #else
         EVP_CIPHER_CTX_reset(ctx->cipherCtx);
@@ -934,7 +947,7 @@ static apr_status_t crypto_block_decrypt_finish(unsigned char *out,
     else {
         *outlen = len;
     }
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if APR_USE_OPENSSL_PRE_1_1_API
     EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
 #else
     EVP_CIPHER_CTX_reset(ctx->cipherCtx);
diff --git a/crypto/apr_crypto_openssl.dep b/crypto/apr_crypto_openssl.dep
index 7bd1e76..61bfb22 100644
--- a/crypto/apr_crypto_openssl.dep
+++ b/crypto/apr_crypto_openssl.dep
@@ -1,14 +1,14 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_crypto_openssl.mak
-
-.\apr_crypto_openssl.c : \
-	"..\include\apr_buckets.h"\
-	"..\include\apr_crypto.h"\
-	"..\include\apu.h"\
-	"..\include\apu_errno.h"\
-	"..\include\private\apr_crypto_internal.h"\
-	
-
-..\libaprutil.rc : \
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by apr_crypto_openssl.mak
+
+.\apr_crypto_openssl.c : \
+	"..\include\apr_buckets.h"\
+	"..\include\apr_crypto.h"\
+	"..\include\apu.h"\
+	"..\include\apu_errno.h"\
+	"..\include\private\apr_crypto_internal.h"\
+	
+
+..\libaprutil.rc : \
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	
diff --git a/crypto/apr_crypto_openssl.mak b/crypto/apr_crypto_openssl.mak
index 4ba37d7..83968d5 100644
--- a/crypto/apr_crypto_openssl.mak
+++ b/crypto/apr_crypto_openssl.mak
@@ -1,606 +1,606 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_crypto_openssl.dsp
-!IF "$(CFG)" == ""
-CFG=apr_crypto_openssl - Win32 Release
-!MESSAGE No configuration specified. Defaulting to apr_crypto_openssl - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_crypto_openssl - Win32 Release" && "$(CFG)" != "apr_crypto_openssl - Win32 Debug" && "$(CFG)" != "apr_crypto_openssl - x64 Release" && "$(CFG)" != "apr_crypto_openssl - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_crypto_openssl.mak" CFG="apr_crypto_openssl - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_crypto_openssl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_crypto_openssl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_crypto_openssl - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_crypto_openssl - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF "$(_HAVE_OSSL110)" == "1"
-SSLCRP=libcrypto
-SSLLIB=libssl
-SSLINC=/I ../../openssl/include
-SSLBIN=/libpath:../../openssl
-!ELSE 
-SSLCRP=libeay32
-SSLLIB=ssleay32
-SSLINC=/I ../../openssl/inc32
-SSLBIN=/libpath:../../openssl/out32dll
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_crypto_openssl - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_crypto_openssl-1.res"
-	- at erase "$(INTDIR)\apr_crypto_openssl.obj"
-	- at erase "$(INTDIR)\apr_crypto_openssl_src.idb"
-	- at erase "$(INTDIR)\apr_crypto_openssl_src.pdb"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.dll"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.exp"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.lib"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" $(SSLINC) /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_OPENSSL=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_openssl_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_openssl" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_openssl.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib $(SSLCRP).lib $(SSLLIB).lib /nologo /base:"0x6F100000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_openssl-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_openssl-1.dll" /implib:"$(OUTDIR)\apr_crypto_openssl-1.lib" $(SSLBIN) /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_crypto_openssl.obj" \
-	"$(INTDIR)\apr_crypto_openssl-1.res" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_crypto_openssl-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_crypto_openssl-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_openssl-1.dll"
-   if exist .\Release\apr_crypto_openssl-1.dll.manifest mt.exe -manifest .\Release\apr_crypto_openssl-1.dll.manifest -outputresource:.\Release\apr_crypto_openssl-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_openssl - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_crypto_openssl-1.res"
-	- at erase "$(INTDIR)\apr_crypto_openssl.obj"
-	- at erase "$(INTDIR)\apr_crypto_openssl_src.idb"
-	- at erase "$(INTDIR)\apr_crypto_openssl_src.pdb"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.dll"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.exp"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.lib"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" $(SSLINC) /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_OPENSSL=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_openssl_src" /FD /D /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_openssl" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_openssl.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib $(SSLCRP).lib $(SSLLIB).lib /nologo /base:"0x6F100000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_openssl-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_openssl-1.dll" /implib:"$(OUTDIR)\apr_crypto_openssl-1.lib" $(SSLBIN) 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_crypto_openssl.obj" \
-	"$(INTDIR)\apr_crypto_openssl-1.res" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_crypto_openssl-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_crypto_openssl-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_openssl-1.dll"
-   if exist .\Debug\apr_crypto_openssl-1.dll.manifest mt.exe -manifest .\Debug\apr_crypto_openssl-1.dll.manifest -outputresource:.\Debug\apr_crypto_openssl-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_crypto_openssl-1.res"
-	- at erase "$(INTDIR)\apr_crypto_openssl.obj"
-	- at erase "$(INTDIR)\apr_crypto_openssl_src.idb"
-	- at erase "$(INTDIR)\apr_crypto_openssl_src.pdb"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.dll"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.exp"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.lib"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" $(SSLINC) /D "NDEBUG" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_OPENSSL=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_openssl_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /x64 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_openssl" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_openssl.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib $(SSLCRP).lib $(SSLLIB).lib /nologo /base:"0x6F100000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_openssl-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_openssl-1.dll" /implib:"$(OUTDIR)\apr_crypto_openssl-1.lib" $(SSLBIN) /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_crypto_openssl.obj" \
-	"$(INTDIR)\apr_crypto_openssl-1.res" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_crypto_openssl-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_crypto_openssl-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_openssl-1.dll"
-   if exist .\x64\Release\apr_crypto_openssl-1.dll.manifest mt.exe -manifest .\x64\Release\apr_crypto_openssl-1.dll.manifest -outputresource:.\x64\Release\apr_crypto_openssl-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_crypto_openssl-1.res"
-	- at erase "$(INTDIR)\apr_crypto_openssl.obj"
-	- at erase "$(INTDIR)\apr_crypto_openssl_src.idb"
-	- at erase "$(INTDIR)\apr_crypto_openssl_src.pdb"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.dll"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.exp"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.lib"
-	- at erase "$(OUTDIR)\apr_crypto_openssl-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" $(SSLINC) /D "_DEBUG" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_OPENSSL=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_openssl_src" /FD /D /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /x64 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_openssl" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_openssl.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib $(SSLCRP).lib $(SSLLIB).lib /nologo /base:"0x6F100000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_openssl-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_openssl-1.dll" /implib:"$(OUTDIR)\apr_crypto_openssl-1.lib" $(SSLBIN) 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_crypto_openssl.obj" \
-	"$(INTDIR)\apr_crypto_openssl-1.res" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_crypto_openssl-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_crypto_openssl-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_openssl-1.dll"
-   if exist .\x64\Debug\apr_crypto_openssl-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_crypto_openssl-1.dll.manifest -outputresource:.\x64\Debug\apr_crypto_openssl-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_crypto_openssl.dep")
-!INCLUDE "apr_crypto_openssl.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_crypto_openssl.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_crypto_openssl - Win32 Release" || "$(CFG)" == "apr_crypto_openssl - Win32 Debug" || "$(CFG)" == "apr_crypto_openssl - x64 Release" || "$(CFG)" == "apr_crypto_openssl - x64 Debug"
-SOURCE=.\apr_crypto_openssl.c
-
-"$(INTDIR)\apr_crypto_openssl.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_crypto_openssl - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\crypto"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\crypto"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_openssl - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\crypto"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\crypto"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\crypto"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\crypto"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\crypto"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\crypto"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_crypto_openssl - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\crypto"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\crypto"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_openssl - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\crypto"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\crypto"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\crypto"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\crypto"
-
-!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\crypto"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\crypto"
-
-!ENDIF 
-
-SOURCE=..\libaprutil.rc
-
-!IF  "$(CFG)" == "apr_crypto_openssl - Win32 Release"
-
-
-"$(INTDIR)\apr_crypto_openssl-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_openssl" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_crypto_openssl - Win32 Debug"
-
-
-"$(INTDIR)\apr_crypto_openssl-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_openssl" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Release"
-
-
-"$(INTDIR)\apr_crypto_openssl-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_openssl" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Debug"
-
-
-"$(INTDIR)\apr_crypto_openssl-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_openssl" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on apr_crypto_openssl.dsp
+!IF "$(CFG)" == ""
+CFG=apr_crypto_openssl - Win32 Release
+!MESSAGE No configuration specified. Defaulting to apr_crypto_openssl - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "apr_crypto_openssl - Win32 Release" && "$(CFG)" != "apr_crypto_openssl - Win32 Debug" && "$(CFG)" != "apr_crypto_openssl - x64 Release" && "$(CFG)" != "apr_crypto_openssl - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_crypto_openssl.mak" CFG="apr_crypto_openssl - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_crypto_openssl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_crypto_openssl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_crypto_openssl - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_crypto_openssl - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF "$(_HAVE_OSSL110)" == "1"
+SSLCRP=libcrypto
+SSLLIB=libssl
+SSLINC=/I ../../openssl/include
+SSLBIN=/libpath:../../openssl
+!ELSE 
+SSLCRP=libeay32
+SSLLIB=ssleay32
+SSLINC=/I ../../openssl/inc32
+SSLBIN=/libpath:../../openssl/out32dll
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_crypto_openssl - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_crypto_openssl-1.res"
+	- at erase "$(INTDIR)\apr_crypto_openssl.obj"
+	- at erase "$(INTDIR)\apr_crypto_openssl_src.idb"
+	- at erase "$(INTDIR)\apr_crypto_openssl_src.pdb"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.dll"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.exp"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.lib"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" $(SSLINC) /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_OPENSSL=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_openssl_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_openssl" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_openssl.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib $(SSLCRP).lib $(SSLLIB).lib /nologo /base:"0x6F100000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_openssl-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_openssl-1.dll" /implib:"$(OUTDIR)\apr_crypto_openssl-1.lib" $(SSLBIN) /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_crypto_openssl.obj" \
+	"$(INTDIR)\apr_crypto_openssl-1.res" \
+	"..\..\apr\Release\libapr-1.lib" \
+	"..\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_crypto_openssl-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\apr_crypto_openssl-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_openssl-1.dll"
+   if exist .\Release\apr_crypto_openssl-1.dll.manifest mt.exe -manifest .\Release\apr_crypto_openssl-1.dll.manifest -outputresource:.\Release\apr_crypto_openssl-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_openssl - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_crypto_openssl-1.res"
+	- at erase "$(INTDIR)\apr_crypto_openssl.obj"
+	- at erase "$(INTDIR)\apr_crypto_openssl_src.idb"
+	- at erase "$(INTDIR)\apr_crypto_openssl_src.pdb"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.dll"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.exp"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.lib"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" $(SSLINC) /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_OPENSSL=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_openssl_src" /FD /D /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_openssl" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_openssl.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib $(SSLCRP).lib $(SSLLIB).lib /nologo /base:"0x6F100000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_openssl-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_openssl-1.dll" /implib:"$(OUTDIR)\apr_crypto_openssl-1.lib" $(SSLBIN) 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_crypto_openssl.obj" \
+	"$(INTDIR)\apr_crypto_openssl-1.res" \
+	"..\..\apr\Debug\libapr-1.lib" \
+	"..\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_crypto_openssl-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\apr_crypto_openssl-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_openssl-1.dll"
+   if exist .\Debug\apr_crypto_openssl-1.dll.manifest mt.exe -manifest .\Debug\apr_crypto_openssl-1.dll.manifest -outputresource:.\Debug\apr_crypto_openssl-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_crypto_openssl-1.res"
+	- at erase "$(INTDIR)\apr_crypto_openssl.obj"
+	- at erase "$(INTDIR)\apr_crypto_openssl_src.idb"
+	- at erase "$(INTDIR)\apr_crypto_openssl_src.pdb"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.dll"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.exp"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.lib"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" $(SSLINC) /D "NDEBUG" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_OPENSSL=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_openssl_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /x64 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_openssl" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_openssl.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib $(SSLCRP).lib $(SSLLIB).lib /nologo /base:"0x6F100000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_openssl-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_openssl-1.dll" /implib:"$(OUTDIR)\apr_crypto_openssl-1.lib" $(SSLBIN) /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_crypto_openssl.obj" \
+	"$(INTDIR)\apr_crypto_openssl-1.res" \
+	"..\..\apr\x64\Release\libapr-1.lib" \
+	"..\x64\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_crypto_openssl-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\apr_crypto_openssl-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_openssl-1.dll"
+   if exist .\x64\Release\apr_crypto_openssl-1.dll.manifest mt.exe -manifest .\x64\Release\apr_crypto_openssl-1.dll.manifest -outputresource:.\x64\Release\apr_crypto_openssl-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_crypto_openssl-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_crypto_openssl-1.res"
+	- at erase "$(INTDIR)\apr_crypto_openssl.obj"
+	- at erase "$(INTDIR)\apr_crypto_openssl_src.idb"
+	- at erase "$(INTDIR)\apr_crypto_openssl_src.pdb"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.dll"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.exp"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.lib"
+	- at erase "$(OUTDIR)\apr_crypto_openssl-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" $(SSLINC) /D "_DEBUG" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_OPENSSL=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_crypto_openssl_src" /FD /D /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /x64 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_crypto_openssl" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_crypto_openssl.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib $(SSLCRP).lib $(SSLLIB).lib /nologo /base:"0x6F100000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_crypto_openssl-1.pdb" /debug /out:"$(OUTDIR)\apr_crypto_openssl-1.dll" /implib:"$(OUTDIR)\apr_crypto_openssl-1.lib" $(SSLBIN) 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_crypto_openssl.obj" \
+	"$(INTDIR)\apr_crypto_openssl-1.res" \
+	"..\..\apr\x64\Debug\libapr-1.lib" \
+	"..\x64\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_crypto_openssl-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\apr_crypto_openssl-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_crypto_openssl-1.dll"
+   if exist .\x64\Debug\apr_crypto_openssl-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_crypto_openssl-1.dll.manifest -outputresource:.\x64\Debug\apr_crypto_openssl-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("apr_crypto_openssl.dep")
+!INCLUDE "apr_crypto_openssl.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "apr_crypto_openssl.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "apr_crypto_openssl - Win32 Release" || "$(CFG)" == "apr_crypto_openssl - Win32 Debug" || "$(CFG)" == "apr_crypto_openssl - x64 Release" || "$(CFG)" == "apr_crypto_openssl - x64 Debug"
+SOURCE=.\apr_crypto_openssl.c
+
+"$(INTDIR)\apr_crypto_openssl.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "apr_crypto_openssl - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util\crypto"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\crypto"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_openssl - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util\crypto"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\crypto"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util\crypto"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\crypto"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util\crypto"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\crypto"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_crypto_openssl - Win32 Release"
+
+"libaprutil - Win32 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
+   cd ".\crypto"
+
+"libaprutil - Win32 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
+   cd ".\crypto"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_openssl - Win32 Debug"
+
+"libaprutil - Win32 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
+   cd ".\crypto"
+
+"libaprutil - Win32 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".\crypto"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Release"
+
+"libaprutil - x64 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
+   cd ".\crypto"
+
+"libaprutil - x64 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
+   cd ".\crypto"
+
+!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Debug"
+
+"libaprutil - x64 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
+   cd ".\crypto"
+
+"libaprutil - x64 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
+   cd ".\crypto"
+
+!ENDIF 
+
+SOURCE=..\libaprutil.rc
+
+!IF  "$(CFG)" == "apr_crypto_openssl - Win32 Release"
+
+
+"$(INTDIR)\apr_crypto_openssl-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_openssl" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_crypto_openssl - Win32 Debug"
+
+
+"$(INTDIR)\apr_crypto_openssl-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_openssl" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Release"
+
+
+"$(INTDIR)\apr_crypto_openssl-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_openssl" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_crypto_openssl - x64 Debug"
+
+
+"$(INTDIR)\apr_crypto_openssl-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_crypto_openssl-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_crypto_openssl" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/crypto/apr_siphash.c b/crypto/apr_siphash.c
index 41cff70..c9cabe2 100644
--- a/crypto/apr_siphash.c
+++ b/crypto/apr_siphash.c
@@ -95,7 +95,7 @@ do { \
     r = v0 ^ v1 ^ v2 ^ v3; \
 } while (0)
 
-APR_DECLARE(apr_uint64_t) apr_siphash(const void *src, apr_size_t len,
+APU_DECLARE(apr_uint64_t) apr_siphash(const void *src, apr_size_t len,
                               const unsigned char key[APR_SIPHASH_KSIZE],
                                       unsigned int c, unsigned int d)
 {
@@ -118,7 +118,7 @@ APR_DECLARE(apr_uint64_t) apr_siphash(const void *src, apr_size_t len,
     return h;
 }
 
-APR_DECLARE(void) apr_siphash_auth(unsigned char out[APR_SIPHASH_DSIZE],
+APU_DECLARE(void) apr_siphash_auth(unsigned char out[APR_SIPHASH_DSIZE],
                                    const void *src, apr_size_t len,
                              const unsigned char key[APR_SIPHASH_KSIZE],
                                    unsigned int c, unsigned int d)
@@ -128,7 +128,7 @@ APR_DECLARE(void) apr_siphash_auth(unsigned char out[APR_SIPHASH_DSIZE],
     U64TO8_LE(out, h);
 }
 
-APR_DECLARE(apr_uint64_t) apr_siphash24(const void *src, apr_size_t len,
+APU_DECLARE(apr_uint64_t) apr_siphash24(const void *src, apr_size_t len,
                                const unsigned char key[APR_SIPHASH_KSIZE])
 {
     apr_uint64_t h;
@@ -149,7 +149,7 @@ APR_DECLARE(apr_uint64_t) apr_siphash24(const void *src, apr_size_t len,
     return h;
 }
 
-APR_DECLARE(void) apr_siphash24_auth(unsigned char out[APR_SIPHASH_DSIZE],
+APU_DECLARE(void) apr_siphash24_auth(unsigned char out[APR_SIPHASH_DSIZE],
                                      const void *src, apr_size_t len,
                                const unsigned char key[APR_SIPHASH_KSIZE])
 {
@@ -158,7 +158,7 @@ APR_DECLARE(void) apr_siphash24_auth(unsigned char out[APR_SIPHASH_DSIZE],
     U64TO8_LE(out, h);
 }
 
-APR_DECLARE(apr_uint64_t) apr_siphash48(const void *src, apr_size_t len,
+APU_DECLARE(apr_uint64_t) apr_siphash48(const void *src, apr_size_t len,
                                const unsigned char key[APR_SIPHASH_KSIZE])
 {
     apr_uint64_t h;
@@ -185,7 +185,7 @@ APR_DECLARE(apr_uint64_t) apr_siphash48(const void *src, apr_size_t len,
     return h;
 }
 
-APR_DECLARE(void) apr_siphash48_auth(unsigned char out[APR_SIPHASH_DSIZE],
+APU_DECLARE(void) apr_siphash48_auth(unsigned char out[APR_SIPHASH_DSIZE],
                                      const void *src, apr_size_t len,
                                const unsigned char key[APR_SIPHASH_KSIZE])
 {
diff --git a/dbd/apr_dbd_mysql.dep b/dbd/apr_dbd_mysql.dep
index 9291c62..91909b0 100644
--- a/dbd/apr_dbd_mysql.dep
+++ b/dbd/apr_dbd_mysql.dep
@@ -1,15 +1,15 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_mysql.mak
-
-.\apr_dbd_mysql.c : \
-	"..\include\apr_buckets.h"\
-	"..\include\apr_dbd.h"\
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	"..\include\private\apr_dbd_internal.h"\
-	"..\include\private\apu_config.h"\
-	
-
-..\libaprutil.rc : \
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_mysql.mak
+
+.\apr_dbd_mysql.c : \
+	"..\include\apr_buckets.h"\
+	"..\include\apr_dbd.h"\
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	"..\include\private\apr_dbd_internal.h"\
+	"..\include\private\apu_config.h"\
+	
+
+..\libaprutil.rc : \
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	
diff --git a/dbd/apr_dbd_mysql.mak b/dbd/apr_dbd_mysql.mak
index 22d8ab7..9e42643 100644
--- a/dbd/apr_dbd_mysql.mak
+++ b/dbd/apr_dbd_mysql.mak
@@ -1,594 +1,594 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_mysql.dsp
-!IF "$(CFG)" == ""
-CFG=apr_dbd_mysql - Win32 Release
-!MESSAGE No configuration specified. Defaulting to apr_dbd_mysql - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_dbd_mysql - Win32 Release" && "$(CFG)" != "apr_dbd_mysql - Win32 Debug" && "$(CFG)" != "apr_dbd_mysql - x64 Release" && "$(CFG)" != "apr_dbd_mysql - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_dbd_mysql.mak" CFG="apr_dbd_mysql - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_dbd_mysql - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_mysql - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_mysql - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_mysql - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_mysql - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_mysql-1.res"
-	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
-	- at erase "$(INTDIR)\apr_dbd_mysql_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_mysql_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_mysql" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_mysql.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /libpath:"..\..\mysql\lib" /pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" /implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_mysql.obj" \
-	"$(INTDIR)\apr_dbd_mysql-1.res" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_mysql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_dbd_mysql-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_mysql-1.dll"
-   if exist .\Release\apr_dbd_mysql-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_mysql-1.dll.manifest -outputresource:.\Release\apr_dbd_mysql-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_mysql - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_mysql-1.res"
-	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
-	- at erase "$(INTDIR)\apr_dbd_mysql_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_mysql_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_mysql" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_mysql.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysqld.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /libpath:"..\..\mysql\lib" /pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" /implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_mysql.obj" \
-	"$(INTDIR)\apr_dbd_mysql-1.res" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_mysql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_dbd_mysql-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_mysql-1.dll"
-   if exist .\Debug\apr_dbd_mysql-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_mysql-1.dll.manifest -outputresource:.\Debug\apr_dbd_mysql-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_mysql-1.res"
-	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
-	- at erase "$(INTDIR)\apr_dbd_mysql_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_mysql_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_mysql" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_mysql.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /libpath:"..\..\mysql\lib" /pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" /implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /MACHINE:X64 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_mysql.obj" \
-	"$(INTDIR)\apr_dbd_mysql-1.res" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_mysql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_dbd_mysql-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_mysql-1.dll"
-   if exist .\x64\Release\apr_dbd_mysql-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_mysql-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_mysql-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_mysql-1.res"
-	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
-	- at erase "$(INTDIR)\apr_dbd_mysql_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_mysql_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_mysql-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_mysql" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_mysql.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysqld.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /libpath:"..\..\mysql\lib" /pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" /implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /MACHINE:X64 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_mysql.obj" \
-	"$(INTDIR)\apr_dbd_mysql-1.res" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_mysql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_dbd_mysql-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_mysql-1.dll"
-   if exist .\x64\Debug\apr_dbd_mysql-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_mysql-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_mysql-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_dbd_mysql.dep")
-!INCLUDE "apr_dbd_mysql.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_dbd_mysql.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_dbd_mysql - Win32 Release" || "$(CFG)" == "apr_dbd_mysql - Win32 Debug" || "$(CFG)" == "apr_dbd_mysql - x64 Release" || "$(CFG)" == "apr_dbd_mysql - x64 Debug"
-SOURCE=.\apr_dbd_mysql.c
-
-"$(INTDIR)\apr_dbd_mysql.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_dbd_mysql - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_mysql - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_mysql - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\dbd"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_mysql - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\dbd"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\dbd"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\dbd"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ENDIF 
-
-SOURCE=..\libaprutil.rc
-
-!IF  "$(CFG)" == "apr_dbd_mysql - Win32 Release"
-
-
-"$(INTDIR)\apr_dbd_mysql-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_mysql" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_mysql - Win32 Debug"
-
-
-"$(INTDIR)\apr_dbd_mysql-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_mysql" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Release"
-
-
-"$(INTDIR)\apr_dbd_mysql-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_mysql" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Debug"
-
-
-"$(INTDIR)\apr_dbd_mysql-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_mysql" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_mysql.dsp
+!IF "$(CFG)" == ""
+CFG=apr_dbd_mysql - Win32 Release
+!MESSAGE No configuration specified. Defaulting to apr_dbd_mysql - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "apr_dbd_mysql - Win32 Release" && "$(CFG)" != "apr_dbd_mysql - Win32 Debug" && "$(CFG)" != "apr_dbd_mysql - x64 Release" && "$(CFG)" != "apr_dbd_mysql - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_mysql.mak" CFG="apr_dbd_mysql - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_mysql - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_mysql - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_mysql - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_mysql - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_mysql - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_mysql-1.res"
+	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
+	- at erase "$(INTDIR)\apr_dbd_mysql_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_mysql_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_mysql" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_mysql.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /libpath:"..\..\mysql\lib" /pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" /implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_mysql.obj" \
+	"$(INTDIR)\apr_dbd_mysql-1.res" \
+	"..\..\apr\Release\libapr-1.lib" \
+	"..\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_mysql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\apr_dbd_mysql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_mysql-1.dll"
+   if exist .\Release\apr_dbd_mysql-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_mysql-1.dll.manifest -outputresource:.\Release\apr_dbd_mysql-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_mysql-1.res"
+	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
+	- at erase "$(INTDIR)\apr_dbd_mysql_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_mysql_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_mysql" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_mysql.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysqld.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /libpath:"..\..\mysql\lib" /pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" /implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_mysql.obj" \
+	"$(INTDIR)\apr_dbd_mysql-1.res" \
+	"..\..\apr\Debug\libapr-1.lib" \
+	"..\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_mysql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\apr_dbd_mysql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_mysql-1.dll"
+   if exist .\Debug\apr_dbd_mysql-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_mysql-1.dll.manifest -outputresource:.\Debug\apr_dbd_mysql-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_mysql-1.res"
+	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
+	- at erase "$(INTDIR)\apr_dbd_mysql_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_mysql_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_mysql" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_mysql.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /libpath:"..\..\mysql\lib" /pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" /implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /MACHINE:X64 /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_mysql.obj" \
+	"$(INTDIR)\apr_dbd_mysql-1.res" \
+	"..\..\apr\x64\Release\libapr-1.lib" \
+	"..\x64\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_mysql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\apr_dbd_mysql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_mysql-1.dll"
+   if exist .\x64\Release\apr_dbd_mysql-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_mysql-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_mysql-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_mysql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_mysql-1.res"
+	- at erase "$(INTDIR)\apr_dbd_mysql.obj"
+	- at erase "$(INTDIR)\apr_dbd_mysql_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_mysql_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_mysql-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_mysql" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_mysql.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysqld.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /libpath:"..\..\mysql\lib" /pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" /implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /MACHINE:X64 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_mysql.obj" \
+	"$(INTDIR)\apr_dbd_mysql-1.res" \
+	"..\..\apr\x64\Debug\libapr-1.lib" \
+	"..\x64\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_mysql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\apr_dbd_mysql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_mysql-1.dll"
+   if exist .\x64\Debug\apr_dbd_mysql-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_mysql-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_mysql-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("apr_dbd_mysql.dep")
+!INCLUDE "apr_dbd_mysql.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "apr_dbd_mysql.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "apr_dbd_mysql - Win32 Release" || "$(CFG)" == "apr_dbd_mysql - Win32 Debug" || "$(CFG)" == "apr_dbd_mysql - x64 Release" || "$(CFG)" == "apr_dbd_mysql - x64 Debug"
+SOURCE=.\apr_dbd_mysql.c
+
+"$(INTDIR)\apr_dbd_mysql.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "apr_dbd_mysql - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_mysql - Win32 Release"
+
+"libaprutil - Win32 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
+   cd ".\dbd"
+
+"libaprutil - Win32 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - Win32 Debug"
+
+"libaprutil - Win32 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
+   cd ".\dbd"
+
+"libaprutil - Win32 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Release"
+
+"libaprutil - x64 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
+   cd ".\dbd"
+
+"libaprutil - x64 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Debug"
+
+"libaprutil - x64 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
+   cd ".\dbd"
+
+"libaprutil - x64 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ENDIF 
+
+SOURCE=..\libaprutil.rc
+
+!IF  "$(CFG)" == "apr_dbd_mysql - Win32 Release"
+
+
+"$(INTDIR)\apr_dbd_mysql-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_mysql" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - Win32 Debug"
+
+
+"$(INTDIR)\apr_dbd_mysql-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_mysql" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Release"
+
+
+"$(INTDIR)\apr_dbd_mysql-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_mysql" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Debug"
+
+
+"$(INTDIR)\apr_dbd_mysql-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_mysql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_mysql" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/dbd/apr_dbd_odbc.dep b/dbd/apr_dbd_odbc.dep
index f252983..31e3f8a 100644
--- a/dbd/apr_dbd_odbc.dep
+++ b/dbd/apr_dbd_odbc.dep
@@ -1,11 +1,11 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_odbc.mak
-
-.\apr_dbd_odbc.c : \
-	"..\include\apr_buckets.h"\
-	"..\include\apr_dbd.h"\
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	"..\include\private\apr_dbd_internal.h"\
-	"..\include\private\apr_dbd_odbc_v2.h"\
-	"..\include\private\apu_config.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_odbc.mak
+
+.\apr_dbd_odbc.c : \
+	"..\include\apr_buckets.h"\
+	"..\include\apr_dbd.h"\
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	"..\include\private\apr_dbd_internal.h"\
+	"..\include\private\apr_dbd_odbc_v2.h"\
+	"..\include\private\apu_config.h"\
+	
diff --git a/dbd/apr_dbd_odbc.mak b/dbd/apr_dbd_odbc.mak
index f3c13af..ee4320f 100644
--- a/dbd/apr_dbd_odbc.mak
+++ b/dbd/apr_dbd_odbc.mak
@@ -1,550 +1,550 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_odbc.dsp
-!IF "$(CFG)" == ""
-CFG=apr_dbd_odbc - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to apr_dbd_odbc - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_dbd_odbc - Win32 Release" && "$(CFG)" != "apr_dbd_odbc - Win32 Debug" && "$(CFG)" != "apr_dbd_odbc - x64 Release" && "$(CFG)" != "apr_dbd_odbc - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_dbd_odbc.mak" CFG="apr_dbd_odbc - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_dbd_odbc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_odbc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_odbc - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_odbc - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_odbc - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
-	- at erase "$(INTDIR)\apr_dbd_odbc_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_odbc_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "HAVE_SQL_H" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ODBC=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_odbc_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_odbc.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib odbc32.lib odbccp32.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_odbc-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_odbc-1.dll" /implib:"$(OUTDIR)\apr_dbd_odbc-1.lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_odbc.obj" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_odbc-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_dbd_odbc-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_odbc-1.dll"
-   if exist .\Release\apr_dbd_odbc-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_odbc-1.dll.manifest -outputresource:.\Release\apr_dbd_odbc-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_odbc - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
-	- at erase "$(INTDIR)\apr_dbd_odbc_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_odbc_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ODBC=1 /D "HAVE_SQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_odbc_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_odbc.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib odbc32.lib odbccp32.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_odbc-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_odbc-1.dll" /implib:"$(OUTDIR)\apr_dbd_odbc-1.lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_odbc.obj" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_odbc-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_dbd_odbc-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_odbc-1.dll"
-   if exist .\Debug\apr_dbd_odbc-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_odbc-1.dll.manifest -outputresource:.\Debug\apr_dbd_odbc-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_odbc - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
-	- at erase "$(INTDIR)\apr_dbd_odbc_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_odbc_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "HAVE_SQL_H" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ODBC=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_odbc_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_odbc.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib odbc32.lib odbccp32.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_odbc-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_odbc-1.dll" /implib:"$(OUTDIR)\apr_dbd_odbc-1.lib" /MACHINE:X64 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_odbc.obj" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_odbc-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_dbd_odbc-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_odbc-1.dll"
-   if exist .\x64\Release\apr_dbd_odbc-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_odbc-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_odbc-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_odbc - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
-	- at erase "$(INTDIR)\apr_dbd_odbc_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_odbc_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_odbc-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ODBC=1 /D "HAVE_SQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_odbc_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_odbc.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib odbc32.lib odbccp32.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_odbc-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_odbc-1.dll" /implib:"$(OUTDIR)\apr_dbd_odbc-1.lib" /MACHINE:X64 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_odbc.obj" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_odbc-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_dbd_odbc-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_odbc-1.dll"
-   if exist .\x64\Debug\apr_dbd_odbc-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_odbc-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_odbc-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_dbd_odbc.dep")
-!INCLUDE "apr_dbd_odbc.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_dbd_odbc.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_dbd_odbc - Win32 Release" || "$(CFG)" == "apr_dbd_odbc - Win32 Debug" || "$(CFG)" == "apr_dbd_odbc - x64 Release" || "$(CFG)" == "apr_dbd_odbc - x64 Debug"
-SOURCE=.\apr_dbd_odbc.c
-
-"$(INTDIR)\apr_dbd_odbc.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_dbd_odbc - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_odbc - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_odbc - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_odbc - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_odbc - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\dbd"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_odbc - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\dbd"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_odbc - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\dbd"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_odbc - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\dbd"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_odbc.dsp
+!IF "$(CFG)" == ""
+CFG=apr_dbd_odbc - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to apr_dbd_odbc - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "apr_dbd_odbc - Win32 Release" && "$(CFG)" != "apr_dbd_odbc - Win32 Debug" && "$(CFG)" != "apr_dbd_odbc - x64 Release" && "$(CFG)" != "apr_dbd_odbc - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_odbc.mak" CFG="apr_dbd_odbc - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_odbc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_odbc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_odbc - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_odbc - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_odbc - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
+	- at erase "$(INTDIR)\apr_dbd_odbc_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_odbc_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "HAVE_SQL_H" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ODBC=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_odbc_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_odbc.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib odbc32.lib odbccp32.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_odbc-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_odbc-1.dll" /implib:"$(OUTDIR)\apr_dbd_odbc-1.lib" /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_odbc.obj" \
+	"..\..\apr\Release\libapr-1.lib" \
+	"..\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_odbc-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\apr_dbd_odbc-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_odbc-1.dll"
+   if exist .\Release\apr_dbd_odbc-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_odbc-1.dll.manifest -outputresource:.\Release\apr_dbd_odbc-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_odbc - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
+	- at erase "$(INTDIR)\apr_dbd_odbc_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_odbc_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ODBC=1 /D "HAVE_SQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_odbc_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_odbc.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib odbc32.lib odbccp32.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_odbc-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_odbc-1.dll" /implib:"$(OUTDIR)\apr_dbd_odbc-1.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_odbc.obj" \
+	"..\..\apr\Debug\libapr-1.lib" \
+	"..\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_odbc-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\apr_dbd_odbc-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_odbc-1.dll"
+   if exist .\Debug\apr_dbd_odbc-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_odbc-1.dll.manifest -outputresource:.\Debug\apr_dbd_odbc-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_odbc - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
+	- at erase "$(INTDIR)\apr_dbd_odbc_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_odbc_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "HAVE_SQL_H" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ODBC=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_odbc_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_odbc.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib odbc32.lib odbccp32.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_odbc-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_odbc-1.dll" /implib:"$(OUTDIR)\apr_dbd_odbc-1.lib" /MACHINE:X64 /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_odbc.obj" \
+	"..\..\apr\x64\Release\libapr-1.lib" \
+	"..\x64\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_odbc-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\apr_dbd_odbc-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_odbc-1.dll"
+   if exist .\x64\Release\apr_dbd_odbc-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_odbc-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_odbc-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_odbc - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_odbc-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_odbc.obj"
+	- at erase "$(INTDIR)\apr_dbd_odbc_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_odbc_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_odbc-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ODBC=1 /D "HAVE_SQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_odbc_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_odbc.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib odbc32.lib odbccp32.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_odbc-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_odbc-1.dll" /implib:"$(OUTDIR)\apr_dbd_odbc-1.lib" /MACHINE:X64 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_odbc.obj" \
+	"..\..\apr\x64\Debug\libapr-1.lib" \
+	"..\x64\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_odbc-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\apr_dbd_odbc-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_odbc-1.dll"
+   if exist .\x64\Debug\apr_dbd_odbc-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_odbc-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_odbc-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("apr_dbd_odbc.dep")
+!INCLUDE "apr_dbd_odbc.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "apr_dbd_odbc.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "apr_dbd_odbc - Win32 Release" || "$(CFG)" == "apr_dbd_odbc - Win32 Debug" || "$(CFG)" == "apr_dbd_odbc - x64 Release" || "$(CFG)" == "apr_dbd_odbc - x64 Debug"
+SOURCE=.\apr_dbd_odbc.c
+
+"$(INTDIR)\apr_dbd_odbc.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "apr_dbd_odbc - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_odbc - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_odbc - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_odbc - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_odbc - Win32 Release"
+
+"libaprutil - Win32 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
+   cd ".\dbd"
+
+"libaprutil - Win32 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_odbc - Win32 Debug"
+
+"libaprutil - Win32 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
+   cd ".\dbd"
+
+"libaprutil - Win32 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_odbc - x64 Release"
+
+"libaprutil - x64 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
+   cd ".\dbd"
+
+"libaprutil - x64 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_odbc - x64 Debug"
+
+"libaprutil - x64 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
+   cd ".\dbd"
+
+"libaprutil - x64 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/dbd/apr_dbd_oracle.dep b/dbd/apr_dbd_oracle.dep
index 888bfc4..ef507be 100644
--- a/dbd/apr_dbd_oracle.dep
+++ b/dbd/apr_dbd_oracle.dep
@@ -1,13 +1,13 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_oracle.mak
-
-.\apr_dbd_oracle.c : \
-	"..\include\apr_buckets.h"\
-	"..\include\apr_dbd.h"\
-	"..\include\apu.h"\
-	"..\include\private\apr_dbd_internal.h"\
-	
-
-..\libaprutil.rc : \
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_oracle.mak
+
+.\apr_dbd_oracle.c : \
+	"..\include\apr_buckets.h"\
+	"..\include\apr_dbd.h"\
+	"..\include\apu.h"\
+	"..\include\private\apr_dbd_internal.h"\
+	
+
+..\libaprutil.rc : \
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	
diff --git a/dbd/apr_dbd_oracle.mak b/dbd/apr_dbd_oracle.mak
index 8e44615..bea3f5e 100644
--- a/dbd/apr_dbd_oracle.mak
+++ b/dbd/apr_dbd_oracle.mak
@@ -1,594 +1,594 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_oracle.dsp
-!IF "$(CFG)" == ""
-CFG=apr_dbd_oracle - Win32 Release
-!MESSAGE No configuration specified. Defaulting to apr_dbd_oracle - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_dbd_oracle - Win32 Release" && "$(CFG)" != "apr_dbd_oracle - Win32 Debug" && "$(CFG)" != "apr_dbd_oracle - x64 Release" && "$(CFG)" != "apr_dbd_oracle - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_dbd_oracle.mak" CFG="apr_dbd_oracle - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_dbd_oracle - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_oracle - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_oracle - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_oracle - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_oracle - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_oracle-1.res"
-	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
-	- at erase "$(INTDIR)\apr_dbd_oracle_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_oracle_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ORACLE=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_oracle_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_oracle" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_oracle.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_oracle-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_oracle-1.dll" /implib:"$(OUTDIR)\apr_dbd_oracle-1.lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_oracle.obj" \
-	"$(INTDIR)\apr_dbd_oracle-1.res" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_oracle-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_dbd_oracle-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_oracle-1.dll"
-   if exist .\Release\apr_dbd_oracle-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_oracle-1.dll.manifest -outputresource:.\Release\apr_dbd_oracle-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_oracle - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_oracle-1.res"
-	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
-	- at erase "$(INTDIR)\apr_dbd_oracle_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_oracle_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ORACLE=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_oracle_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_oracle" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_oracle.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_oracle-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_oracle-1.dll" /implib:"$(OUTDIR)\apr_dbd_oracle-1.lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_oracle.obj" \
-	"$(INTDIR)\apr_dbd_oracle-1.res" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_oracle-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_dbd_oracle-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_oracle-1.dll"
-   if exist .\Debug\apr_dbd_oracle-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_oracle-1.dll.manifest -outputresource:.\Debug\apr_dbd_oracle-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_oracle-1.res"
-	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
-	- at erase "$(INTDIR)\apr_dbd_oracle_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_oracle_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ORACLE=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_oracle_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_oracle" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_oracle.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_oracle-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_oracle-1.dll" /implib:"$(OUTDIR)\apr_dbd_oracle-1.lib" /MACHINE:X64 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_oracle.obj" \
-	"$(INTDIR)\apr_dbd_oracle-1.res" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_oracle-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_dbd_oracle-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_oracle-1.dll"
-   if exist .\x64\Release\apr_dbd_oracle-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_oracle-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_oracle-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_oracle-1.res"
-	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
-	- at erase "$(INTDIR)\apr_dbd_oracle_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_oracle_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_oracle-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ORACLE=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_oracle_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_oracle" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_oracle.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_oracle-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_oracle-1.dll" /implib:"$(OUTDIR)\apr_dbd_oracle-1.lib" /MACHINE:X64 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_oracle.obj" \
-	"$(INTDIR)\apr_dbd_oracle-1.res" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_oracle-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_dbd_oracle-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_oracle-1.dll"
-   if exist .\x64\Debug\apr_dbd_oracle-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_oracle-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_oracle-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_dbd_oracle.dep")
-!INCLUDE "apr_dbd_oracle.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_dbd_oracle.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_dbd_oracle - Win32 Release" || "$(CFG)" == "apr_dbd_oracle - Win32 Debug" || "$(CFG)" == "apr_dbd_oracle - x64 Release" || "$(CFG)" == "apr_dbd_oracle - x64 Debug"
-SOURCE=.\apr_dbd_oracle.c
-
-"$(INTDIR)\apr_dbd_oracle.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_dbd_oracle - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_oracle - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_oracle - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\dbd"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_oracle - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\dbd"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\dbd"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\dbd"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ENDIF 
-
-SOURCE=..\libaprutil.rc
-
-!IF  "$(CFG)" == "apr_dbd_oracle - Win32 Release"
-
-
-"$(INTDIR)\apr_dbd_oracle-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_oracle" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_oracle - Win32 Debug"
-
-
-"$(INTDIR)\apr_dbd_oracle-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_oracle" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Release"
-
-
-"$(INTDIR)\apr_dbd_oracle-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_oracle" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Debug"
-
-
-"$(INTDIR)\apr_dbd_oracle-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_oracle" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_oracle.dsp
+!IF "$(CFG)" == ""
+CFG=apr_dbd_oracle - Win32 Release
+!MESSAGE No configuration specified. Defaulting to apr_dbd_oracle - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "apr_dbd_oracle - Win32 Release" && "$(CFG)" != "apr_dbd_oracle - Win32 Debug" && "$(CFG)" != "apr_dbd_oracle - x64 Release" && "$(CFG)" != "apr_dbd_oracle - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_oracle.mak" CFG="apr_dbd_oracle - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_oracle - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_oracle - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_oracle - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_oracle - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_oracle - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_oracle-1.res"
+	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
+	- at erase "$(INTDIR)\apr_dbd_oracle_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_oracle_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ORACLE=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_oracle_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_oracle" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_oracle.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_oracle-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_oracle-1.dll" /implib:"$(OUTDIR)\apr_dbd_oracle-1.lib" /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_oracle.obj" \
+	"$(INTDIR)\apr_dbd_oracle-1.res" \
+	"..\..\apr\Release\libapr-1.lib" \
+	"..\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_oracle-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\apr_dbd_oracle-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_oracle-1.dll"
+   if exist .\Release\apr_dbd_oracle-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_oracle-1.dll.manifest -outputresource:.\Release\apr_dbd_oracle-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_oracle-1.res"
+	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
+	- at erase "$(INTDIR)\apr_dbd_oracle_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_oracle_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ORACLE=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_oracle_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_oracle" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_oracle.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_oracle-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_oracle-1.dll" /implib:"$(OUTDIR)\apr_dbd_oracle-1.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_oracle.obj" \
+	"$(INTDIR)\apr_dbd_oracle-1.res" \
+	"..\..\apr\Debug\libapr-1.lib" \
+	"..\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_oracle-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\apr_dbd_oracle-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_oracle-1.dll"
+   if exist .\Debug\apr_dbd_oracle-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_oracle-1.dll.manifest -outputresource:.\Debug\apr_dbd_oracle-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_oracle-1.res"
+	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
+	- at erase "$(INTDIR)\apr_dbd_oracle_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_oracle_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ORACLE=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_oracle_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_oracle" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_oracle.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_oracle-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_oracle-1.dll" /implib:"$(OUTDIR)\apr_dbd_oracle-1.lib" /MACHINE:X64 /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_oracle.obj" \
+	"$(INTDIR)\apr_dbd_oracle-1.res" \
+	"..\..\apr\x64\Release\libapr-1.lib" \
+	"..\x64\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_oracle-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\apr_dbd_oracle-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_oracle-1.dll"
+   if exist .\x64\Release\apr_dbd_oracle-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_oracle-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_oracle-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_oracle-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_oracle-1.res"
+	- at erase "$(INTDIR)\apr_dbd_oracle.obj"
+	- at erase "$(INTDIR)\apr_dbd_oracle_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_oracle_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_oracle-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_ORACLE=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_oracle_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_oracle" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_oracle.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_oracle-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_oracle-1.dll" /implib:"$(OUTDIR)\apr_dbd_oracle-1.lib" /MACHINE:X64 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_oracle.obj" \
+	"$(INTDIR)\apr_dbd_oracle-1.res" \
+	"..\..\apr\x64\Debug\libapr-1.lib" \
+	"..\x64\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_oracle-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\apr_dbd_oracle-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_oracle-1.dll"
+   if exist .\x64\Debug\apr_dbd_oracle-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_oracle-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_oracle-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("apr_dbd_oracle.dep")
+!INCLUDE "apr_dbd_oracle.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "apr_dbd_oracle.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "apr_dbd_oracle - Win32 Release" || "$(CFG)" == "apr_dbd_oracle - Win32 Debug" || "$(CFG)" == "apr_dbd_oracle - x64 Release" || "$(CFG)" == "apr_dbd_oracle - x64 Debug"
+SOURCE=.\apr_dbd_oracle.c
+
+"$(INTDIR)\apr_dbd_oracle.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "apr_dbd_oracle - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_oracle - Win32 Release"
+
+"libaprutil - Win32 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
+   cd ".\dbd"
+
+"libaprutil - Win32 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - Win32 Debug"
+
+"libaprutil - Win32 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
+   cd ".\dbd"
+
+"libaprutil - Win32 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Release"
+
+"libaprutil - x64 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
+   cd ".\dbd"
+
+"libaprutil - x64 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Debug"
+
+"libaprutil - x64 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
+   cd ".\dbd"
+
+"libaprutil - x64 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ENDIF 
+
+SOURCE=..\libaprutil.rc
+
+!IF  "$(CFG)" == "apr_dbd_oracle - Win32 Release"
+
+
+"$(INTDIR)\apr_dbd_oracle-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_oracle" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - Win32 Debug"
+
+
+"$(INTDIR)\apr_dbd_oracle-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_oracle" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Release"
+
+
+"$(INTDIR)\apr_dbd_oracle-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_oracle" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Debug"
+
+
+"$(INTDIR)\apr_dbd_oracle-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_oracle-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_oracle" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/dbd/apr_dbd_pgsql.dep b/dbd/apr_dbd_pgsql.dep
index ce8b518..72e4b86 100644
--- a/dbd/apr_dbd_pgsql.dep
+++ b/dbd/apr_dbd_pgsql.dep
@@ -1,14 +1,14 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_pgsql.mak
-
-.\apr_dbd_pgsql.c : \
-	"..\include\apr_buckets.h"\
-	"..\include\apr_dbd.h"\
-	"..\include\apu.h"\
-	"..\include\private\apr_dbd_internal.h"\
-	"..\include\private\apu_config.h"\
-	
-
-..\libaprutil.rc : \
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_pgsql.mak
+
+.\apr_dbd_pgsql.c : \
+	"..\include\apr_buckets.h"\
+	"..\include\apr_dbd.h"\
+	"..\include\apu.h"\
+	"..\include\private\apr_dbd_internal.h"\
+	"..\include\private\apu_config.h"\
+	
+
+..\libaprutil.rc : \
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	
diff --git a/dbd/apr_dbd_pgsql.mak b/dbd/apr_dbd_pgsql.mak
index 20371e6..adab906 100644
--- a/dbd/apr_dbd_pgsql.mak
+++ b/dbd/apr_dbd_pgsql.mak
@@ -1,594 +1,594 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_pgsql.dsp
-!IF "$(CFG)" == ""
-CFG=apr_dbd_pgsql - Win32 Release
-!MESSAGE No configuration specified. Defaulting to apr_dbd_pgsql - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_dbd_pgsql - Win32 Release" && "$(CFG)" != "apr_dbd_pgsql - Win32 Debug" && "$(CFG)" != "apr_dbd_pgsql - x64 Release" && "$(CFG)" != "apr_dbd_pgsql - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_dbd_pgsql.mak" CFG="apr_dbd_pgsql - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_dbd_pgsql - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_pgsql - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_pgsql - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_pgsql - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_pgsql - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_pgsql-1.res"
-	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
-	- at erase "$(INTDIR)\apr_dbd_pgsql_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_pgsql_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_PGSQL=1 /D "HAVE_LIBPQ_FE_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_pgsql_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_pgsql" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_pgsql.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_pgsql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_pgsql-1.dll" /implib:"$(OUTDIR)\apr_dbd_pgsql-1.lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_pgsql.obj" \
-	"$(INTDIR)\apr_dbd_pgsql-1.res" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_pgsql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_dbd_pgsql-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_pgsql-1.dll"
-   if exist .\Release\apr_dbd_pgsql-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_pgsql-1.dll.manifest -outputresource:.\Release\apr_dbd_pgsql-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_pgsql-1.res"
-	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
-	- at erase "$(INTDIR)\apr_dbd_pgsql_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_pgsql_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_PGSQL=1 /D "HAVE_LIBPQ_FE_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_pgsql_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_pgsql" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_pgsql.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_pgsql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_pgsql-1.dll" /implib:"$(OUTDIR)\apr_dbd_pgsql-1.lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_pgsql.obj" \
-	"$(INTDIR)\apr_dbd_pgsql-1.res" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_pgsql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_dbd_pgsql-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_pgsql-1.dll"
-   if exist .\Debug\apr_dbd_pgsql-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_pgsql-1.dll.manifest -outputresource:.\Debug\apr_dbd_pgsql-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_pgsql-1.res"
-	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
-	- at erase "$(INTDIR)\apr_dbd_pgsql_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_pgsql_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_PGSQL=1 /D "HAVE_LIBPQ_FE_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_pgsql_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_pgsql" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_pgsql.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_pgsql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_pgsql-1.dll" /implib:"$(OUTDIR)\apr_dbd_pgsql-1.lib" /MACHINE:X64 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_pgsql.obj" \
-	"$(INTDIR)\apr_dbd_pgsql-1.res" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_pgsql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_dbd_pgsql-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_pgsql-1.dll"
-   if exist .\x64\Release\apr_dbd_pgsql-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_pgsql-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_pgsql-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_pgsql-1.res"
-	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
-	- at erase "$(INTDIR)\apr_dbd_pgsql_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_pgsql_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_PGSQL=1 /D "HAVE_LIBPQ_FE_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_pgsql_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_pgsql" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_pgsql.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_pgsql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_pgsql-1.dll" /implib:"$(OUTDIR)\apr_dbd_pgsql-1.lib" /MACHINE:X64 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_pgsql.obj" \
-	"$(INTDIR)\apr_dbd_pgsql-1.res" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_pgsql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_dbd_pgsql-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_pgsql-1.dll"
-   if exist .\x64\Debug\apr_dbd_pgsql-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_pgsql-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_pgsql-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_dbd_pgsql.dep")
-!INCLUDE "apr_dbd_pgsql.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_dbd_pgsql.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_dbd_pgsql - Win32 Release" || "$(CFG)" == "apr_dbd_pgsql - Win32 Debug" || "$(CFG)" == "apr_dbd_pgsql - x64 Release" || "$(CFG)" == "apr_dbd_pgsql - x64 Debug"
-SOURCE=.\apr_dbd_pgsql.c
-
-"$(INTDIR)\apr_dbd_pgsql.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_dbd_pgsql - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_pgsql - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\dbd"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\dbd"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\dbd"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\dbd"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ENDIF 
-
-SOURCE=..\libaprutil.rc
-
-!IF  "$(CFG)" == "apr_dbd_pgsql - Win32 Release"
-
-
-"$(INTDIR)\apr_dbd_pgsql-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_pgsql" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - Win32 Debug"
-
-
-"$(INTDIR)\apr_dbd_pgsql-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_pgsql" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Release"
-
-
-"$(INTDIR)\apr_dbd_pgsql-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_pgsql" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Debug"
-
-
-"$(INTDIR)\apr_dbd_pgsql-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_pgsql" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_pgsql.dsp
+!IF "$(CFG)" == ""
+CFG=apr_dbd_pgsql - Win32 Release
+!MESSAGE No configuration specified. Defaulting to apr_dbd_pgsql - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "apr_dbd_pgsql - Win32 Release" && "$(CFG)" != "apr_dbd_pgsql - Win32 Debug" && "$(CFG)" != "apr_dbd_pgsql - x64 Release" && "$(CFG)" != "apr_dbd_pgsql - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_pgsql.mak" CFG="apr_dbd_pgsql - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_pgsql - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_pgsql - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_pgsql - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_pgsql - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_pgsql - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_pgsql-1.res"
+	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
+	- at erase "$(INTDIR)\apr_dbd_pgsql_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_pgsql_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_PGSQL=1 /D "HAVE_LIBPQ_FE_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_pgsql_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_pgsql" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_pgsql.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_pgsql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_pgsql-1.dll" /implib:"$(OUTDIR)\apr_dbd_pgsql-1.lib" /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_pgsql.obj" \
+	"$(INTDIR)\apr_dbd_pgsql-1.res" \
+	"..\..\apr\Release\libapr-1.lib" \
+	"..\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_pgsql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\apr_dbd_pgsql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_pgsql-1.dll"
+   if exist .\Release\apr_dbd_pgsql-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_pgsql-1.dll.manifest -outputresource:.\Release\apr_dbd_pgsql-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_pgsql-1.res"
+	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
+	- at erase "$(INTDIR)\apr_dbd_pgsql_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_pgsql_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_PGSQL=1 /D "HAVE_LIBPQ_FE_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_pgsql_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_pgsql" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_pgsql.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_pgsql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_pgsql-1.dll" /implib:"$(OUTDIR)\apr_dbd_pgsql-1.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_pgsql.obj" \
+	"$(INTDIR)\apr_dbd_pgsql-1.res" \
+	"..\..\apr\Debug\libapr-1.lib" \
+	"..\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_pgsql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\apr_dbd_pgsql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_pgsql-1.dll"
+   if exist .\Debug\apr_dbd_pgsql-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_pgsql-1.dll.manifest -outputresource:.\Debug\apr_dbd_pgsql-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_pgsql-1.res"
+	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
+	- at erase "$(INTDIR)\apr_dbd_pgsql_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_pgsql_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_PGSQL=1 /D "HAVE_LIBPQ_FE_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_pgsql_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_pgsql" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_pgsql.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_pgsql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_pgsql-1.dll" /implib:"$(OUTDIR)\apr_dbd_pgsql-1.lib" /MACHINE:X64 /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_pgsql.obj" \
+	"$(INTDIR)\apr_dbd_pgsql-1.res" \
+	"..\..\apr\x64\Release\libapr-1.lib" \
+	"..\x64\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_pgsql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\apr_dbd_pgsql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_pgsql-1.dll"
+   if exist .\x64\Release\apr_dbd_pgsql-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_pgsql-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_pgsql-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_pgsql-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_pgsql-1.res"
+	- at erase "$(INTDIR)\apr_dbd_pgsql.obj"
+	- at erase "$(INTDIR)\apr_dbd_pgsql_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_pgsql_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_pgsql-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_PGSQL=1 /D "HAVE_LIBPQ_FE_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_pgsql_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_pgsql" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_pgsql.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_pgsql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_pgsql-1.dll" /implib:"$(OUTDIR)\apr_dbd_pgsql-1.lib" /MACHINE:X64 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_pgsql.obj" \
+	"$(INTDIR)\apr_dbd_pgsql-1.res" \
+	"..\..\apr\x64\Debug\libapr-1.lib" \
+	"..\x64\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_pgsql-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\apr_dbd_pgsql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_pgsql-1.dll"
+   if exist .\x64\Debug\apr_dbd_pgsql-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_pgsql-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_pgsql-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("apr_dbd_pgsql.dep")
+!INCLUDE "apr_dbd_pgsql.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "apr_dbd_pgsql.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "apr_dbd_pgsql - Win32 Release" || "$(CFG)" == "apr_dbd_pgsql - Win32 Debug" || "$(CFG)" == "apr_dbd_pgsql - x64 Release" || "$(CFG)" == "apr_dbd_pgsql - x64 Debug"
+SOURCE=.\apr_dbd_pgsql.c
+
+"$(INTDIR)\apr_dbd_pgsql.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "apr_dbd_pgsql - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_pgsql - Win32 Release"
+
+"libaprutil - Win32 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
+   cd ".\dbd"
+
+"libaprutil - Win32 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - Win32 Debug"
+
+"libaprutil - Win32 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
+   cd ".\dbd"
+
+"libaprutil - Win32 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Release"
+
+"libaprutil - x64 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
+   cd ".\dbd"
+
+"libaprutil - x64 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Debug"
+
+"libaprutil - x64 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
+   cd ".\dbd"
+
+"libaprutil - x64 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ENDIF 
+
+SOURCE=..\libaprutil.rc
+
+!IF  "$(CFG)" == "apr_dbd_pgsql - Win32 Release"
+
+
+"$(INTDIR)\apr_dbd_pgsql-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_pgsql" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - Win32 Debug"
+
+
+"$(INTDIR)\apr_dbd_pgsql-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_pgsql" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Release"
+
+
+"$(INTDIR)\apr_dbd_pgsql-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_pgsql" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Debug"
+
+
+"$(INTDIR)\apr_dbd_pgsql-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_pgsql-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_pgsql" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/dbd/apr_dbd_sqlite2.dep b/dbd/apr_dbd_sqlite2.dep
index d8d138b..c9969c6 100644
--- a/dbd/apr_dbd_sqlite2.dep
+++ b/dbd/apr_dbd_sqlite2.dep
@@ -1,13 +1,13 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_sqlite2.mak
-
-.\apr_dbd_sqlite2.c : \
-	"..\include\apr_buckets.h"\
-	"..\include\apr_dbd.h"\
-	"..\include\apu.h"\
-	"..\include\private\apr_dbd_internal.h"\
-	
-
-..\libaprutil.rc : \
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_sqlite2.mak
+
+.\apr_dbd_sqlite2.c : \
+	"..\include\apr_buckets.h"\
+	"..\include\apr_dbd.h"\
+	"..\include\apu.h"\
+	"..\include\private\apr_dbd_internal.h"\
+	
+
+..\libaprutil.rc : \
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	
diff --git a/dbd/apr_dbd_sqlite2.mak b/dbd/apr_dbd_sqlite2.mak
index 821d536..915be31 100644
--- a/dbd/apr_dbd_sqlite2.mak
+++ b/dbd/apr_dbd_sqlite2.mak
@@ -1,594 +1,594 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_sqlite2.dsp
-!IF "$(CFG)" == ""
-CFG=apr_dbd_sqlite2 - Win32 Release
-!MESSAGE No configuration specified. Defaulting to apr_dbd_sqlite2 - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_dbd_sqlite2 - Win32 Release" && "$(CFG)" != "apr_dbd_sqlite2 - Win32 Debug" && "$(CFG)" != "apr_dbd_sqlite2 - x64 Release" && "$(CFG)" != "apr_dbd_sqlite2 - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_dbd_sqlite2.mak" CFG="apr_dbd_sqlite2 - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_dbd_sqlite2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_sqlite2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_sqlite2 - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_sqlite2 - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_sqlite2-1.res"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE2=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite2_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite2" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite2.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_sqlite2-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite2-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite2-1.lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_sqlite2.obj" \
-	"$(INTDIR)\apr_dbd_sqlite2-1.res" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_sqlite2-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_dbd_sqlite2-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
-   if exist .\Release\apr_dbd_sqlite2-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_sqlite2-1.dll.manifest -outputresource:.\Release\apr_dbd_sqlite2-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_sqlite2-1.res"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE2=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite2_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite2" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite2.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_sqlite2-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite2-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite2-1.lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_sqlite2.obj" \
-	"$(INTDIR)\apr_dbd_sqlite2-1.res" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_sqlite2-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_dbd_sqlite2-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
-   if exist .\Debug\apr_dbd_sqlite2-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_sqlite2-1.dll.manifest -outputresource:.\Debug\apr_dbd_sqlite2-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_sqlite2-1.res"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE2=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite2_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite2" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite2.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_sqlite2-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite2-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite2-1.lib" /MACHINE:X64 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_sqlite2.obj" \
-	"$(INTDIR)\apr_dbd_sqlite2-1.res" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_sqlite2-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_dbd_sqlite2-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
-   if exist .\x64\Release\apr_dbd_sqlite2-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_sqlite2-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_sqlite2-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_sqlite2-1.res"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE2=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite2_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite2" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite2.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_sqlite2-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite2-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite2-1.lib" /MACHINE:X64 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_sqlite2.obj" \
-	"$(INTDIR)\apr_dbd_sqlite2-1.res" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_sqlite2-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_dbd_sqlite2-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
-   if exist .\x64\Debug\apr_dbd_sqlite2-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_sqlite2-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_sqlite2-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_dbd_sqlite2.dep")
-!INCLUDE "apr_dbd_sqlite2.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_dbd_sqlite2.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_dbd_sqlite2 - Win32 Release" || "$(CFG)" == "apr_dbd_sqlite2 - Win32 Debug" || "$(CFG)" == "apr_dbd_sqlite2 - x64 Release" || "$(CFG)" == "apr_dbd_sqlite2 - x64 Debug"
-SOURCE=.\apr_dbd_sqlite2.c
-
-"$(INTDIR)\apr_dbd_sqlite2.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\dbd"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\dbd"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\dbd"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\dbd"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ENDIF 
-
-SOURCE=..\libaprutil.rc
-
-!IF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Release"
-
-
-"$(INTDIR)\apr_dbd_sqlite2-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite2" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Debug"
-
-
-"$(INTDIR)\apr_dbd_sqlite2-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite2" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Release"
-
-
-"$(INTDIR)\apr_dbd_sqlite2-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite2" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Debug"
-
-
-"$(INTDIR)\apr_dbd_sqlite2-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite2" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_sqlite2.dsp
+!IF "$(CFG)" == ""
+CFG=apr_dbd_sqlite2 - Win32 Release
+!MESSAGE No configuration specified. Defaulting to apr_dbd_sqlite2 - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "apr_dbd_sqlite2 - Win32 Release" && "$(CFG)" != "apr_dbd_sqlite2 - Win32 Debug" && "$(CFG)" != "apr_dbd_sqlite2 - x64 Release" && "$(CFG)" != "apr_dbd_sqlite2 - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_sqlite2.mak" CFG="apr_dbd_sqlite2 - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_sqlite2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_sqlite2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_sqlite2 - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_sqlite2 - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_sqlite2-1.res"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE2=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite2_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite2" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite2.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_sqlite2-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite2-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite2-1.lib" /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_sqlite2.obj" \
+	"$(INTDIR)\apr_dbd_sqlite2-1.res" \
+	"..\..\apr\Release\libapr-1.lib" \
+	"..\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_sqlite2-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\apr_dbd_sqlite2-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
+   if exist .\Release\apr_dbd_sqlite2-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_sqlite2-1.dll.manifest -outputresource:.\Release\apr_dbd_sqlite2-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_sqlite2-1.res"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE2=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite2_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite2" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite2.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_sqlite2-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite2-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite2-1.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_sqlite2.obj" \
+	"$(INTDIR)\apr_dbd_sqlite2-1.res" \
+	"..\..\apr\Debug\libapr-1.lib" \
+	"..\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_sqlite2-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\apr_dbd_sqlite2-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
+   if exist .\Debug\apr_dbd_sqlite2-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_sqlite2-1.dll.manifest -outputresource:.\Debug\apr_dbd_sqlite2-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_sqlite2-1.res"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE2=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite2_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite2" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite2.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_sqlite2-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite2-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite2-1.lib" /MACHINE:X64 /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_sqlite2.obj" \
+	"$(INTDIR)\apr_dbd_sqlite2-1.res" \
+	"..\..\apr\x64\Release\libapr-1.lib" \
+	"..\x64\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_sqlite2-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\apr_dbd_sqlite2-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
+   if exist .\x64\Release\apr_dbd_sqlite2-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_sqlite2-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_sqlite2-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_sqlite2-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_sqlite2-1.res"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_sqlite2_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite2-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE2=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite2_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite2" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite2.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_sqlite2-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite2-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite2-1.lib" /MACHINE:X64 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_sqlite2.obj" \
+	"$(INTDIR)\apr_dbd_sqlite2-1.res" \
+	"..\..\apr\x64\Debug\libapr-1.lib" \
+	"..\x64\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_sqlite2-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\apr_dbd_sqlite2-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite2-1.dll"
+   if exist .\x64\Debug\apr_dbd_sqlite2-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_sqlite2-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_sqlite2-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("apr_dbd_sqlite2.dep")
+!INCLUDE "apr_dbd_sqlite2.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "apr_dbd_sqlite2.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "apr_dbd_sqlite2 - Win32 Release" || "$(CFG)" == "apr_dbd_sqlite2 - Win32 Debug" || "$(CFG)" == "apr_dbd_sqlite2 - x64 Release" || "$(CFG)" == "apr_dbd_sqlite2 - x64 Debug"
+SOURCE=.\apr_dbd_sqlite2.c
+
+"$(INTDIR)\apr_dbd_sqlite2.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Release"
+
+"libaprutil - Win32 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
+   cd ".\dbd"
+
+"libaprutil - Win32 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Debug"
+
+"libaprutil - Win32 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
+   cd ".\dbd"
+
+"libaprutil - Win32 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Release"
+
+"libaprutil - x64 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
+   cd ".\dbd"
+
+"libaprutil - x64 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Debug"
+
+"libaprutil - x64 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
+   cd ".\dbd"
+
+"libaprutil - x64 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ENDIF 
+
+SOURCE=..\libaprutil.rc
+
+!IF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Release"
+
+
+"$(INTDIR)\apr_dbd_sqlite2-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite2" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Debug"
+
+
+"$(INTDIR)\apr_dbd_sqlite2-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite2" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Release"
+
+
+"$(INTDIR)\apr_dbd_sqlite2-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite2" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Debug"
+
+
+"$(INTDIR)\apr_dbd_sqlite2-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite2-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite2" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/dbd/apr_dbd_sqlite3.dep b/dbd/apr_dbd_sqlite3.dep
index c7ffca4..e0f655a 100644
--- a/dbd/apr_dbd_sqlite3.dep
+++ b/dbd/apr_dbd_sqlite3.dep
@@ -1,13 +1,13 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_sqlite3.mak
-
-.\apr_dbd_sqlite3.c : \
-	"..\include\apr_buckets.h"\
-	"..\include\apr_dbd.h"\
-	"..\include\apu.h"\
-	"..\include\private\apr_dbd_internal.h"\
-	
-
-..\libaprutil.rc : \
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_sqlite3.mak
+
+.\apr_dbd_sqlite3.c : \
+	"..\include\apr_buckets.h"\
+	"..\include\apr_dbd.h"\
+	"..\include\apu.h"\
+	"..\include\private\apr_dbd_internal.h"\
+	
+
+..\libaprutil.rc : \
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	
diff --git a/dbd/apr_dbd_sqlite3.mak b/dbd/apr_dbd_sqlite3.mak
index 4674378..32f00e5 100644
--- a/dbd/apr_dbd_sqlite3.mak
+++ b/dbd/apr_dbd_sqlite3.mak
@@ -1,594 +1,594 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_sqlite3.dsp
-!IF "$(CFG)" == ""
-CFG=apr_dbd_sqlite3 - Win32 Release
-!MESSAGE No configuration specified. Defaulting to apr_dbd_sqlite3 - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_dbd_sqlite3 - Win32 Release" && "$(CFG)" != "apr_dbd_sqlite3 - Win32 Debug" && "$(CFG)" != "apr_dbd_sqlite3 - x64 Release" && "$(CFG)" != "apr_dbd_sqlite3 - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_dbd_sqlite3.mak" CFG="apr_dbd_sqlite3 - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_dbd_sqlite3 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_sqlite3 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_sqlite3 - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_sqlite3 - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_sqlite3-1.res"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../sqlite3" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite3" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite3.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /libpath:"..\..\sqlite3" /pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_sqlite3.obj" \
-	"$(INTDIR)\apr_dbd_sqlite3-1.res" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_sqlite3-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_dbd_sqlite3-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
-   if exist .\Release\apr_dbd_sqlite3-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_sqlite3-1.dll.manifest -outputresource:.\Release\apr_dbd_sqlite3-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_sqlite3-1.res"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../sqlite3" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite3" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite3.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /libpath:"..\..\sqlite3" /pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_sqlite3.obj" \
-	"$(INTDIR)\apr_dbd_sqlite3-1.res" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_sqlite3-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_dbd_sqlite3-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
-   if exist .\Debug\apr_dbd_sqlite3-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_sqlite3-1.dll.manifest -outputresource:.\Debug\apr_dbd_sqlite3-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_sqlite3-1.res"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../sqlite3" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite3" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite3.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /libpath:"..\..\sqlite3" /pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /MACHINE:X64 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_sqlite3.obj" \
-	"$(INTDIR)\apr_dbd_sqlite3-1.res" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_sqlite3-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_dbd_sqlite3-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
-   if exist .\x64\Release\apr_dbd_sqlite3-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_sqlite3-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_sqlite3-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_sqlite3-1.res"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../sqlite3" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite3" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite3.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /libpath:"..\..\sqlite3" /pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /MACHINE:X64 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_sqlite3.obj" \
-	"$(INTDIR)\apr_dbd_sqlite3-1.res" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_sqlite3-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_dbd_sqlite3-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
-   if exist .\x64\Debug\apr_dbd_sqlite3-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_sqlite3-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_sqlite3-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_dbd_sqlite3.dep")
-!INCLUDE "apr_dbd_sqlite3.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_dbd_sqlite3.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_dbd_sqlite3 - Win32 Release" || "$(CFG)" == "apr_dbd_sqlite3 - Win32 Debug" || "$(CFG)" == "apr_dbd_sqlite3 - x64 Release" || "$(CFG)" == "apr_dbd_sqlite3 - x64 Debug"
-SOURCE=.\apr_dbd_sqlite3.c
-
-"$(INTDIR)\apr_dbd_sqlite3.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\dbd"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\dbd"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\dbd"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\dbd"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ENDIF 
-
-SOURCE=..\libaprutil.rc
-
-!IF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Release"
-
-
-"$(INTDIR)\apr_dbd_sqlite3-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite3" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Debug"
-
-
-"$(INTDIR)\apr_dbd_sqlite3-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite3" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Release"
-
-
-"$(INTDIR)\apr_dbd_sqlite3-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite3" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Debug"
-
-
-"$(INTDIR)\apr_dbd_sqlite3-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite3" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_sqlite3.dsp
+!IF "$(CFG)" == ""
+CFG=apr_dbd_sqlite3 - Win32 Release
+!MESSAGE No configuration specified. Defaulting to apr_dbd_sqlite3 - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "apr_dbd_sqlite3 - Win32 Release" && "$(CFG)" != "apr_dbd_sqlite3 - Win32 Debug" && "$(CFG)" != "apr_dbd_sqlite3 - x64 Release" && "$(CFG)" != "apr_dbd_sqlite3 - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_sqlite3.mak" CFG="apr_dbd_sqlite3 - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_sqlite3 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_sqlite3 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_sqlite3 - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_sqlite3 - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_sqlite3-1.res"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../sqlite3" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite3" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite3.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /libpath:"..\..\sqlite3" /pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_sqlite3.obj" \
+	"$(INTDIR)\apr_dbd_sqlite3-1.res" \
+	"..\..\apr\Release\libapr-1.lib" \
+	"..\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_sqlite3-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\apr_dbd_sqlite3-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
+   if exist .\Release\apr_dbd_sqlite3-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_sqlite3-1.dll.manifest -outputresource:.\Release\apr_dbd_sqlite3-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_sqlite3-1.res"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../sqlite3" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite3" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite3.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /libpath:"..\..\sqlite3" /pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_sqlite3.obj" \
+	"$(INTDIR)\apr_dbd_sqlite3-1.res" \
+	"..\..\apr\Debug\libapr-1.lib" \
+	"..\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_sqlite3-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\apr_dbd_sqlite3-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
+   if exist .\Debug\apr_dbd_sqlite3-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_sqlite3-1.dll.manifest -outputresource:.\Debug\apr_dbd_sqlite3-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_sqlite3-1.res"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../sqlite3" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite3" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite3.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /libpath:"..\..\sqlite3" /pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /MACHINE:X64 /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_sqlite3.obj" \
+	"$(INTDIR)\apr_dbd_sqlite3-1.res" \
+	"..\..\apr\x64\Release\libapr-1.lib" \
+	"..\x64\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_sqlite3-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\apr_dbd_sqlite3-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
+   if exist .\x64\Release\apr_dbd_sqlite3-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_sqlite3-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_sqlite3-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_sqlite3-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_sqlite3-1.res"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3.obj"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_sqlite3_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_sqlite3-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../sqlite3" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_sqlite3" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_sqlite3.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /libpath:"..\..\sqlite3" /pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /MACHINE:X64 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_sqlite3.obj" \
+	"$(INTDIR)\apr_dbd_sqlite3-1.res" \
+	"..\..\apr\x64\Debug\libapr-1.lib" \
+	"..\x64\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_sqlite3-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\apr_dbd_sqlite3-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_sqlite3-1.dll"
+   if exist .\x64\Debug\apr_dbd_sqlite3-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_sqlite3-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_sqlite3-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("apr_dbd_sqlite3.dep")
+!INCLUDE "apr_dbd_sqlite3.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "apr_dbd_sqlite3.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "apr_dbd_sqlite3 - Win32 Release" || "$(CFG)" == "apr_dbd_sqlite3 - Win32 Debug" || "$(CFG)" == "apr_dbd_sqlite3 - x64 Release" || "$(CFG)" == "apr_dbd_sqlite3 - x64 Debug"
+SOURCE=.\apr_dbd_sqlite3.c
+
+"$(INTDIR)\apr_dbd_sqlite3.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Release"
+
+"libaprutil - Win32 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
+   cd ".\dbd"
+
+"libaprutil - Win32 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Debug"
+
+"libaprutil - Win32 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
+   cd ".\dbd"
+
+"libaprutil - Win32 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Release"
+
+"libaprutil - x64 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
+   cd ".\dbd"
+
+"libaprutil - x64 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Debug"
+
+"libaprutil - x64 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
+   cd ".\dbd"
+
+"libaprutil - x64 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ENDIF 
+
+SOURCE=..\libaprutil.rc
+
+!IF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Release"
+
+
+"$(INTDIR)\apr_dbd_sqlite3-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite3" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Debug"
+
+
+"$(INTDIR)\apr_dbd_sqlite3-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite3" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Release"
+
+
+"$(INTDIR)\apr_dbd_sqlite3-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite3" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Debug"
+
+
+"$(INTDIR)\apr_dbd_sqlite3-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_sqlite3-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_sqlite3" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/dbd/unsupported/apr_dbd_freetds.dep b/dbd/unsupported/apr_dbd_freetds.dep
index a97f93a..386f030 100644
--- a/dbd/unsupported/apr_dbd_freetds.dep
+++ b/dbd/unsupported/apr_dbd_freetds.dep
@@ -1,13 +1,13 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_freetds.mak
-
-.\apr_dbd_freetds.c : \
-	"..\include\apr_dbd.h"\
-	"..\include\apu.h"\
-	"..\include\private\apr_dbd_internal.h"\
-	"..\include\private\apu_config.h"\
-	
-
-..\libaprutil.rc : \
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by apr_dbd_freetds.mak
+
+.\apr_dbd_freetds.c : \
+	"..\include\apr_dbd.h"\
+	"..\include\apu.h"\
+	"..\include\private\apr_dbd_internal.h"\
+	"..\include\private\apu_config.h"\
+	
+
+..\libaprutil.rc : \
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	
diff --git a/dbd/unsupported/apr_dbd_freetds.mak b/dbd/unsupported/apr_dbd_freetds.mak
index 77db191..d34f7aa 100644
--- a/dbd/unsupported/apr_dbd_freetds.mak
+++ b/dbd/unsupported/apr_dbd_freetds.mak
@@ -1,594 +1,594 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_freetds.dsp
-!IF "$(CFG)" == ""
-CFG=apr_dbd_freetds - Win32 Release
-!MESSAGE No configuration specified. Defaulting to apr_dbd_freetds - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_dbd_freetds - Win32 Release" && "$(CFG)" != "apr_dbd_freetds - Win32 Debug" && "$(CFG)" != "apr_dbd_freetds - x64 Release" && "$(CFG)" != "apr_dbd_freetds - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_dbd_freetds.mak" CFG="apr_dbd_freetds - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_dbd_freetds - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_freetds - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_freetds - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbd_freetds - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_freetds - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_freetds-1.res"
-	- at erase "$(INTDIR)\apr_dbd_freetds.obj"
-	- at erase "$(INTDIR)\apr_dbd_freetds_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_freetds_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_FREETDS=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_freetds_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_freetds" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_freetds.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_freetds-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_freetds-1.dll" /implib:"$(OUTDIR)\apr_dbd_freetds-1.lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_freetds.obj" \
-	"$(INTDIR)\apr_dbd_freetds-1.res" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_freetds-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_dbd_freetds-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_freetds-1.dll"
-   if exist .\Release\apr_dbd_freetds-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_freetds-1.dll.manifest -outputresource:.\Release\apr_dbd_freetds-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_freetds - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_freetds-1.res"
-	- at erase "$(INTDIR)\apr_dbd_freetds.obj"
-	- at erase "$(INTDIR)\apr_dbd_freetds_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_freetds_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_FREETDS=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_freetds_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_freetds" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_freetds.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_freetds-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_freetds-1.dll" /implib:"$(OUTDIR)\apr_dbd_freetds-1.lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_freetds.obj" \
-	"$(INTDIR)\apr_dbd_freetds-1.res" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_freetds-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_dbd_freetds-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_freetds-1.dll"
-   if exist .\Debug\apr_dbd_freetds-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_freetds-1.dll.manifest -outputresource:.\Debug\apr_dbd_freetds-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_freetds-1.res"
-	- at erase "$(INTDIR)\apr_dbd_freetds.obj"
-	- at erase "$(INTDIR)\apr_dbd_freetds_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_freetds_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_FREETDS=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_freetds_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_freetds" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_freetds.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_freetds-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_freetds-1.dll" /implib:"$(OUTDIR)\apr_dbd_freetds-1.lib" /MACHINE:X64 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_freetds.obj" \
-	"$(INTDIR)\apr_dbd_freetds-1.res" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_freetds-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_dbd_freetds-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_freetds-1.dll"
-   if exist .\x64\Release\apr_dbd_freetds-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_freetds-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_freetds-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbd_freetds-1.res"
-	- at erase "$(INTDIR)\apr_dbd_freetds.obj"
-	- at erase "$(INTDIR)\apr_dbd_freetds_src.idb"
-	- at erase "$(INTDIR)\apr_dbd_freetds_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.dll"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.exp"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.lib"
-	- at erase "$(OUTDIR)\apr_dbd_freetds-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_FREETDS=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_freetds_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_freetds" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_freetds.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_freetds-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_freetds-1.dll" /implib:"$(OUTDIR)\apr_dbd_freetds-1.lib" /MACHINE:X64 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbd_freetds.obj" \
-	"$(INTDIR)\apr_dbd_freetds-1.res" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbd_freetds-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_dbd_freetds-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_freetds-1.dll"
-   if exist .\x64\Debug\apr_dbd_freetds-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_freetds-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_freetds-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_dbd_freetds.dep")
-!INCLUDE "apr_dbd_freetds.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_dbd_freetds.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_dbd_freetds - Win32 Release" || "$(CFG)" == "apr_dbd_freetds - Win32 Debug" || "$(CFG)" == "apr_dbd_freetds - x64 Release" || "$(CFG)" == "apr_dbd_freetds - x64 Debug"
-SOURCE=.\apr_dbd_freetds.c
-
-"$(INTDIR)\apr_dbd_freetds.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_dbd_freetds - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_freetds - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\dbd"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbd"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbd_freetds - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\dbd"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_freetds - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\dbd"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\dbd"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\dbd"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\dbd"
-
-!ENDIF 
-
-SOURCE=..\libaprutil.rc
-
-!IF  "$(CFG)" == "apr_dbd_freetds - Win32 Release"
-
-
-"$(INTDIR)\apr_dbd_freetds-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_freetds" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_freetds - Win32 Debug"
-
-
-"$(INTDIR)\apr_dbd_freetds-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_freetds" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Release"
-
-
-"$(INTDIR)\apr_dbd_freetds-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_freetds" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Debug"
-
-
-"$(INTDIR)\apr_dbd_freetds-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_freetds" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbd_freetds.dsp
+!IF "$(CFG)" == ""
+CFG=apr_dbd_freetds - Win32 Release
+!MESSAGE No configuration specified. Defaulting to apr_dbd_freetds - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "apr_dbd_freetds - Win32 Release" && "$(CFG)" != "apr_dbd_freetds - Win32 Debug" && "$(CFG)" != "apr_dbd_freetds - x64 Release" && "$(CFG)" != "apr_dbd_freetds - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_freetds.mak" CFG="apr_dbd_freetds - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_freetds - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_freetds - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_freetds - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_freetds - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_freetds - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_freetds-1.res"
+	- at erase "$(INTDIR)\apr_dbd_freetds.obj"
+	- at erase "$(INTDIR)\apr_dbd_freetds_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_freetds_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_FREETDS=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_freetds_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_freetds" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_freetds.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_freetds-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_freetds-1.dll" /implib:"$(OUTDIR)\apr_dbd_freetds-1.lib" /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_freetds.obj" \
+	"$(INTDIR)\apr_dbd_freetds-1.res" \
+	"..\..\apr\Release\libapr-1.lib" \
+	"..\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_freetds-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\apr_dbd_freetds-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_freetds-1.dll"
+   if exist .\Release\apr_dbd_freetds-1.dll.manifest mt.exe -manifest .\Release\apr_dbd_freetds-1.dll.manifest -outputresource:.\Release\apr_dbd_freetds-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_freetds-1.res"
+	- at erase "$(INTDIR)\apr_dbd_freetds.obj"
+	- at erase "$(INTDIR)\apr_dbd_freetds_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_freetds_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_FREETDS=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_freetds_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_freetds" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_freetds.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_freetds-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_freetds-1.dll" /implib:"$(OUTDIR)\apr_dbd_freetds-1.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_freetds.obj" \
+	"$(INTDIR)\apr_dbd_freetds-1.res" \
+	"..\..\apr\Debug\libapr-1.lib" \
+	"..\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_freetds-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\apr_dbd_freetds-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_freetds-1.dll"
+   if exist .\Debug\apr_dbd_freetds-1.dll.manifest mt.exe -manifest .\Debug\apr_dbd_freetds-1.dll.manifest -outputresource:.\Debug\apr_dbd_freetds-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_freetds-1.res"
+	- at erase "$(INTDIR)\apr_dbd_freetds.obj"
+	- at erase "$(INTDIR)\apr_dbd_freetds_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_freetds_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_FREETDS=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_freetds_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_freetds" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_freetds.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_freetds-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_freetds-1.dll" /implib:"$(OUTDIR)\apr_dbd_freetds-1.lib" /MACHINE:X64 /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_freetds.obj" \
+	"$(INTDIR)\apr_dbd_freetds-1.res" \
+	"..\..\apr\x64\Release\libapr-1.lib" \
+	"..\x64\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_freetds-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\apr_dbd_freetds-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_freetds-1.dll"
+   if exist .\x64\Release\apr_dbd_freetds-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbd_freetds-1.dll.manifest -outputresource:.\x64\Release\apr_dbd_freetds-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbd_freetds-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbd_freetds-1.res"
+	- at erase "$(INTDIR)\apr_dbd_freetds.obj"
+	- at erase "$(INTDIR)\apr_dbd_freetds_src.idb"
+	- at erase "$(INTDIR)\apr_dbd_freetds_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.dll"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.exp"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.lib"
+	- at erase "$(OUTDIR)\apr_dbd_freetds-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_FREETDS=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_freetds_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbd_freetds" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd_freetds.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbd_freetds-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_freetds-1.dll" /implib:"$(OUTDIR)\apr_dbd_freetds-1.lib" /MACHINE:X64 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbd_freetds.obj" \
+	"$(INTDIR)\apr_dbd_freetds-1.res" \
+	"..\..\apr\x64\Debug\libapr-1.lib" \
+	"..\x64\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbd_freetds-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\apr_dbd_freetds-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbd_freetds-1.dll"
+   if exist .\x64\Debug\apr_dbd_freetds-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbd_freetds-1.dll.manifest -outputresource:.\x64\Debug\apr_dbd_freetds-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("apr_dbd_freetds.dep")
+!INCLUDE "apr_dbd_freetds.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "apr_dbd_freetds.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "apr_dbd_freetds - Win32 Release" || "$(CFG)" == "apr_dbd_freetds - Win32 Debug" || "$(CFG)" == "apr_dbd_freetds - x64 Release" || "$(CFG)" == "apr_dbd_freetds - x64 Debug"
+SOURCE=.\apr_dbd_freetds.c
+
+"$(INTDIR)\apr_dbd_freetds.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "apr_dbd_freetds - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util\dbd"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbd"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbd_freetds - Win32 Release"
+
+"libaprutil - Win32 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
+   cd ".\dbd"
+
+"libaprutil - Win32 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - Win32 Debug"
+
+"libaprutil - Win32 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
+   cd ".\dbd"
+
+"libaprutil - Win32 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Release"
+
+"libaprutil - x64 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
+   cd ".\dbd"
+
+"libaprutil - x64 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Debug"
+
+"libaprutil - x64 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
+   cd ".\dbd"
+
+"libaprutil - x64 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
+   cd ".\dbd"
+
+!ENDIF 
+
+SOURCE=..\libaprutil.rc
+
+!IF  "$(CFG)" == "apr_dbd_freetds - Win32 Release"
+
+
+"$(INTDIR)\apr_dbd_freetds-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_freetds" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - Win32 Debug"
+
+
+"$(INTDIR)\apr_dbd_freetds-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_freetds" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Release"
+
+
+"$(INTDIR)\apr_dbd_freetds-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_freetds" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Debug"
+
+
+"$(INTDIR)\apr_dbd_freetds-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbd_freetds-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbd_freetds" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/dbm/apr_dbm_db.dep b/dbm/apr_dbm_db.dep
index d6f1ebf..daa24bd 100644
--- a/dbm/apr_dbm_db.dep
+++ b/dbm/apr_dbm_db.dep
@@ -1,15 +1,15 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_dbm_db.mak
-
-.\apr_dbm_berkeleydb.c : \
-	"..\include\apr_dbm.h"\
-	"..\include\apu.h"\
-	"..\include\apu_want.h"\
-	"..\include\private\apr_dbm_private.h"\
-	"..\include\private\apu_config.h"\
-	"..\include\private\apu_select_dbm.h"\
-	
-
-..\libaprutil.rc : \
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by apr_dbm_db.mak
+
+.\apr_dbm_berkeleydb.c : \
+	"..\include\apr_dbm.h"\
+	"..\include\apu.h"\
+	"..\include\apu_want.h"\
+	"..\include\private\apr_dbm_private.h"\
+	"..\include\private\apu_config.h"\
+	"..\include\private\apu_select_dbm.h"\
+	
+
+..\libaprutil.rc : \
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	
diff --git a/dbm/apr_dbm_db.mak b/dbm/apr_dbm_db.mak
index 14a8c04..63bebcf 100644
--- a/dbm/apr_dbm_db.mak
+++ b/dbm/apr_dbm_db.mak
@@ -1,594 +1,594 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbm_db.dsp
-!IF "$(CFG)" == ""
-CFG=apr_dbm_db - Win32 Release
-!MESSAGE No configuration specified. Defaulting to apr_dbm_db - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_dbm_db - Win32 Release" && "$(CFG)" != "apr_dbm_db - Win32 Debug" && "$(CFG)" != "apr_dbm_db - x64 Release" && "$(CFG)" != "apr_dbm_db - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_dbm_db.mak" CFG="apr_dbm_db - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_dbm_db - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbm_db - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbm_db - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbm_db - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbm_db - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
-	- at erase "$(INTDIR)\apr_dbm_db-1.res"
-	- at erase "$(INTDIR)\apr_dbm_db_src.idb"
-	- at erase "$(INTDIR)\apr_dbm_db_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.dll"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.exp"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.lib"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_db" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_db.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /libpath:"..\..\db" /pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" /implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
-	"$(INTDIR)\apr_dbm_db-1.res" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbm_db-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_dbm_db-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_db-1.dll"
-   if exist .\Release\apr_dbm_db-1.dll.manifest mt.exe -manifest .\Release\apr_dbm_db-1.dll.manifest -outputresource:.\Release\apr_dbm_db-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_db - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
-	- at erase "$(INTDIR)\apr_dbm_db-1.res"
-	- at erase "$(INTDIR)\apr_dbm_db_src.idb"
-	- at erase "$(INTDIR)\apr_dbm_db_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.dll"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.exp"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.lib"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_db" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_db.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /libpath:"..\..\db" /pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" /implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
-	"$(INTDIR)\apr_dbm_db-1.res" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbm_db-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_dbm_db-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_db-1.dll"
-   if exist .\Debug\apr_dbm_db-1.dll.manifest mt.exe -manifest .\Debug\apr_dbm_db-1.dll.manifest -outputresource:.\Debug\apr_dbm_db-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
-	- at erase "$(INTDIR)\apr_dbm_db-1.res"
-	- at erase "$(INTDIR)\apr_dbm_db_src.idb"
-	- at erase "$(INTDIR)\apr_dbm_db_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.dll"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.exp"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.lib"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_db" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_db.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /libpath:"..\..\db" /pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" /implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X64 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
-	"$(INTDIR)\apr_dbm_db-1.res" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbm_db-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_dbm_db-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_db-1.dll"
-   if exist .\x64\Release\apr_dbm_db-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbm_db-1.dll.manifest -outputresource:.\x64\Release\apr_dbm_db-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
-	- at erase "$(INTDIR)\apr_dbm_db-1.res"
-	- at erase "$(INTDIR)\apr_dbm_db_src.idb"
-	- at erase "$(INTDIR)\apr_dbm_db_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.dll"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.exp"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.lib"
-	- at erase "$(OUTDIR)\apr_dbm_db-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_db" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_db.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /libpath:"..\..\db" /pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" /implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X64 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
-	"$(INTDIR)\apr_dbm_db-1.res" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbm_db-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_dbm_db-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_db-1.dll"
-   if exist .\x64\Debug\apr_dbm_db-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbm_db-1.dll.manifest -outputresource:.\x64\Debug\apr_dbm_db-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_dbm_db.dep")
-!INCLUDE "apr_dbm_db.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_dbm_db.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_dbm_db - Win32 Release" || "$(CFG)" == "apr_dbm_db - Win32 Debug" || "$(CFG)" == "apr_dbm_db - x64 Release" || "$(CFG)" == "apr_dbm_db - x64 Debug"
-SOURCE=.\apr_dbm_berkeleydb.c
-
-"$(INTDIR)\apr_dbm_berkeleydb.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_dbm_db - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\dbm"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbm"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_db - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\dbm"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbm"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\dbm"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbm"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\dbm"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbm"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbm_db - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\dbm"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\dbm"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_db - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\dbm"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\dbm"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\dbm"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\dbm"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\dbm"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\dbm"
-
-!ENDIF 
-
-SOURCE=..\libaprutil.rc
-
-!IF  "$(CFG)" == "apr_dbm_db - Win32 Release"
-
-
-"$(INTDIR)\apr_dbm_db-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_db" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbm_db - Win32 Debug"
-
-
-"$(INTDIR)\apr_dbm_db-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_db" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Release"
-
-
-"$(INTDIR)\apr_dbm_db-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_db" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Debug"
-
-
-"$(INTDIR)\apr_dbm_db-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_db" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbm_db.dsp
+!IF "$(CFG)" == ""
+CFG=apr_dbm_db - Win32 Release
+!MESSAGE No configuration specified. Defaulting to apr_dbm_db - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "apr_dbm_db - Win32 Release" && "$(CFG)" != "apr_dbm_db - Win32 Debug" && "$(CFG)" != "apr_dbm_db - x64 Release" && "$(CFG)" != "apr_dbm_db - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbm_db.mak" CFG="apr_dbm_db - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbm_db - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbm_db - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbm_db - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbm_db - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbm_db - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
+	- at erase "$(INTDIR)\apr_dbm_db-1.res"
+	- at erase "$(INTDIR)\apr_dbm_db_src.idb"
+	- at erase "$(INTDIR)\apr_dbm_db_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.dll"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.exp"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.lib"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_db" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_db.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /libpath:"..\..\db" /pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" /implib:"$(OUTDIR)\apr_dbm_db-1.lib" /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
+	"$(INTDIR)\apr_dbm_db-1.res" \
+	"..\..\apr\Release\libapr-1.lib" \
+	"..\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbm_db-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\apr_dbm_db-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_db-1.dll"
+   if exist .\Release\apr_dbm_db-1.dll.manifest mt.exe -manifest .\Release\apr_dbm_db-1.dll.manifest -outputresource:.\Release\apr_dbm_db-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_db - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
+	- at erase "$(INTDIR)\apr_dbm_db-1.res"
+	- at erase "$(INTDIR)\apr_dbm_db_src.idb"
+	- at erase "$(INTDIR)\apr_dbm_db_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.dll"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.exp"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.lib"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_db" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_db.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /libpath:"..\..\db" /pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" /implib:"$(OUTDIR)\apr_dbm_db-1.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
+	"$(INTDIR)\apr_dbm_db-1.res" \
+	"..\..\apr\Debug\libapr-1.lib" \
+	"..\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbm_db-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\apr_dbm_db-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_db-1.dll"
+   if exist .\Debug\apr_dbm_db-1.dll.manifest mt.exe -manifest .\Debug\apr_dbm_db-1.dll.manifest -outputresource:.\Debug\apr_dbm_db-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
+	- at erase "$(INTDIR)\apr_dbm_db-1.res"
+	- at erase "$(INTDIR)\apr_dbm_db_src.idb"
+	- at erase "$(INTDIR)\apr_dbm_db_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.dll"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.exp"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.lib"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_db" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_db.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /libpath:"..\..\db" /pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" /implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X64 /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
+	"$(INTDIR)\apr_dbm_db-1.res" \
+	"..\..\apr\x64\Release\libapr-1.lib" \
+	"..\x64\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbm_db-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\apr_dbm_db-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_db-1.dll"
+   if exist .\x64\Release\apr_dbm_db-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbm_db-1.dll.manifest -outputresource:.\x64\Release\apr_dbm_db-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbm_db-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbm_berkeleydb.obj"
+	- at erase "$(INTDIR)\apr_dbm_db-1.res"
+	- at erase "$(INTDIR)\apr_dbm_db_src.idb"
+	- at erase "$(INTDIR)\apr_dbm_db_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.dll"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.exp"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.lib"
+	- at erase "$(OUTDIR)\apr_dbm_db-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_db" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_db.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /libpath:"..\..\db" /pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" /implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X64 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
+	"$(INTDIR)\apr_dbm_db-1.res" \
+	"..\..\apr\x64\Debug\libapr-1.lib" \
+	"..\x64\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbm_db-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\apr_dbm_db-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_db-1.dll"
+   if exist .\x64\Debug\apr_dbm_db-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbm_db-1.dll.manifest -outputresource:.\x64\Debug\apr_dbm_db-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("apr_dbm_db.dep")
+!INCLUDE "apr_dbm_db.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "apr_dbm_db.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "apr_dbm_db - Win32 Release" || "$(CFG)" == "apr_dbm_db - Win32 Debug" || "$(CFG)" == "apr_dbm_db - x64 Release" || "$(CFG)" == "apr_dbm_db - x64 Debug"
+SOURCE=.\apr_dbm_berkeleydb.c
+
+"$(INTDIR)\apr_dbm_berkeleydb.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "apr_dbm_db - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util\dbm"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbm"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_db - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util\dbm"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbm"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util\dbm"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbm"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util\dbm"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbm"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbm_db - Win32 Release"
+
+"libaprutil - Win32 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
+   cd ".\dbm"
+
+"libaprutil - Win32 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
+   cd ".\dbm"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_db - Win32 Debug"
+
+"libaprutil - Win32 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
+   cd ".\dbm"
+
+"libaprutil - Win32 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".\dbm"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Release"
+
+"libaprutil - x64 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
+   cd ".\dbm"
+
+"libaprutil - x64 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
+   cd ".\dbm"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Debug"
+
+"libaprutil - x64 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
+   cd ".\dbm"
+
+"libaprutil - x64 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
+   cd ".\dbm"
+
+!ENDIF 
+
+SOURCE=..\libaprutil.rc
+
+!IF  "$(CFG)" == "apr_dbm_db - Win32 Release"
+
+
+"$(INTDIR)\apr_dbm_db-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_db" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbm_db - Win32 Debug"
+
+
+"$(INTDIR)\apr_dbm_db-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_db" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Release"
+
+
+"$(INTDIR)\apr_dbm_db-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_db" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbm_db - x64 Debug"
+
+
+"$(INTDIR)\apr_dbm_db-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_db-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_db" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/dbm/apr_dbm_gdbm.dep b/dbm/apr_dbm_gdbm.dep
index a21556d..c283c4e 100644
--- a/dbm/apr_dbm_gdbm.dep
+++ b/dbm/apr_dbm_gdbm.dep
@@ -1,14 +1,14 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_dbm_gdbm.mak
-
-.\apr_dbm_gdbm.c : \
-	"..\include\apr_dbm.h"\
-	"..\include\apu.h"\
-	"..\include\private\apr_dbm_private.h"\
-	"..\include\private\apu_config.h"\
-	"..\include\private\apu_select_dbm.h"\
-	
-
-..\libaprutil.rc : \
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by apr_dbm_gdbm.mak
+
+.\apr_dbm_gdbm.c : \
+	"..\include\apr_dbm.h"\
+	"..\include\apu.h"\
+	"..\include\private\apr_dbm_private.h"\
+	"..\include\private\apu_config.h"\
+	"..\include\private\apu_select_dbm.h"\
+	
+
+..\libaprutil.rc : \
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	
diff --git a/dbm/apr_dbm_gdbm.mak b/dbm/apr_dbm_gdbm.mak
index fce705d..5c96af4 100644
--- a/dbm/apr_dbm_gdbm.mak
+++ b/dbm/apr_dbm_gdbm.mak
@@ -1,594 +1,594 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbm_gdbm.dsp
-!IF "$(CFG)" == ""
-CFG=apr_dbm_gdbm - Win32 Release
-!MESSAGE No configuration specified. Defaulting to apr_dbm_gdbm - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_dbm_gdbm - Win32 Release" && "$(CFG)" != "apr_dbm_gdbm - Win32 Debug" && "$(CFG)" != "apr_dbm_gdbm - x64 Release" && "$(CFG)" != "apr_dbm_gdbm - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_dbm_gdbm.mak" CFG="apr_dbm_gdbm - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_dbm_gdbm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbm_gdbm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbm_gdbm - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_dbm_gdbm - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbm_gdbm - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbm_gdbm-1.res"
-	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_gdbm_src.idb"
-	- at erase "$(INTDIR)\apr_dbm_gdbm_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.dll"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.exp"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.lib"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_GDBM=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_gdbm_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_gdbm" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_gdbm.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libgdbm.lib /nologo /base:"0x6F010000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbm_gdbm-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_gdbm-1.dll" /implib:"$(OUTDIR)\apr_dbm_gdbm-1.lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbm_gdbm.obj" \
-	"$(INTDIR)\apr_dbm_gdbm-1.res" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbm_gdbm-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_dbm_gdbm-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_gdbm-1.dll"
-   if exist .\Release\apr_dbm_gdbm-1.dll.manifest mt.exe -manifest .\Release\apr_dbm_gdbm-1.dll.manifest -outputresource:.\Release\apr_dbm_gdbm-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbm_gdbm-1.res"
-	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_gdbm_src.idb"
-	- at erase "$(INTDIR)\apr_dbm_gdbm_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.dll"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.exp"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.lib"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_GDBM=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_gdbm_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_gdbm" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_gdbm.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libgdbm.lib /nologo /base:"0x6F010000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbm_gdbm-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_gdbm-1.dll" /implib:"$(OUTDIR)\apr_dbm_gdbm-1.lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbm_gdbm.obj" \
-	"$(INTDIR)\apr_dbm_gdbm-1.res" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbm_gdbm-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_dbm_gdbm-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_gdbm-1.dll"
-   if exist .\Debug\apr_dbm_gdbm-1.dll.manifest mt.exe -manifest .\Debug\apr_dbm_gdbm-1.dll.manifest -outputresource:.\Debug\apr_dbm_gdbm-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbm_gdbm-1.res"
-	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_gdbm_src.idb"
-	- at erase "$(INTDIR)\apr_dbm_gdbm_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.dll"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.exp"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.lib"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_GDBM=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_gdbm_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_gdbm" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_gdbm.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libgdbm.lib /nologo /base:"0x6F010000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbm_gdbm-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_gdbm-1.dll" /implib:"$(OUTDIR)\apr_dbm_gdbm-1.lib" /MACHINE:X64 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbm_gdbm.obj" \
-	"$(INTDIR)\apr_dbm_gdbm-1.res" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbm_gdbm-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_dbm_gdbm-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_gdbm-1.dll"
-   if exist .\x64\Release\apr_dbm_gdbm-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbm_gdbm-1.dll.manifest -outputresource:.\x64\Release\apr_dbm_gdbm-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_dbm_gdbm-1.res"
-	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_gdbm_src.idb"
-	- at erase "$(INTDIR)\apr_dbm_gdbm_src.pdb"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.dll"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.exp"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.lib"
-	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_GDBM=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_gdbm_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_gdbm" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_gdbm.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libgdbm.lib /nologo /base:"0x6F010000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbm_gdbm-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_gdbm-1.dll" /implib:"$(OUTDIR)\apr_dbm_gdbm-1.lib" /MACHINE:X64 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_dbm_gdbm.obj" \
-	"$(INTDIR)\apr_dbm_gdbm-1.res" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_dbm_gdbm-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_dbm_gdbm-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_gdbm-1.dll"
-   if exist .\x64\Debug\apr_dbm_gdbm-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbm_gdbm-1.dll.manifest -outputresource:.\x64\Debug\apr_dbm_gdbm-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_dbm_gdbm.dep")
-!INCLUDE "apr_dbm_gdbm.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_dbm_gdbm.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_dbm_gdbm - Win32 Release" || "$(CFG)" == "apr_dbm_gdbm - Win32 Debug" || "$(CFG)" == "apr_dbm_gdbm - x64 Release" || "$(CFG)" == "apr_dbm_gdbm - x64 Debug"
-SOURCE=.\apr_dbm_gdbm.c
-
-"$(INTDIR)\apr_dbm_gdbm.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_dbm_gdbm - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\dbm"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbm"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\dbm"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbm"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\dbm"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbm"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\dbm"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\dbm"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_dbm_gdbm - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\dbm"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\dbm"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\dbm"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\dbm"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\dbm"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\dbm"
-
-!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\dbm"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\dbm"
-
-!ENDIF 
-
-SOURCE=..\libaprutil.rc
-
-!IF  "$(CFG)" == "apr_dbm_gdbm - Win32 Release"
-
-
-"$(INTDIR)\apr_dbm_gdbm-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_gdbm" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - Win32 Debug"
-
-
-"$(INTDIR)\apr_dbm_gdbm-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_gdbm" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Release"
-
-
-"$(INTDIR)\apr_dbm_gdbm-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_gdbm" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Debug"
-
-
-"$(INTDIR)\apr_dbm_gdbm-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_gdbm" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on apr_dbm_gdbm.dsp
+!IF "$(CFG)" == ""
+CFG=apr_dbm_gdbm - Win32 Release
+!MESSAGE No configuration specified. Defaulting to apr_dbm_gdbm - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "apr_dbm_gdbm - Win32 Release" && "$(CFG)" != "apr_dbm_gdbm - Win32 Debug" && "$(CFG)" != "apr_dbm_gdbm - x64 Release" && "$(CFG)" != "apr_dbm_gdbm - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbm_gdbm.mak" CFG="apr_dbm_gdbm - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbm_gdbm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbm_gdbm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbm_gdbm - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbm_gdbm - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbm_gdbm - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbm_gdbm-1.res"
+	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_gdbm_src.idb"
+	- at erase "$(INTDIR)\apr_dbm_gdbm_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.dll"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.exp"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.lib"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_GDBM=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_gdbm_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_gdbm" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_gdbm.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libgdbm.lib /nologo /base:"0x6F010000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbm_gdbm-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_gdbm-1.dll" /implib:"$(OUTDIR)\apr_dbm_gdbm-1.lib" /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbm_gdbm.obj" \
+	"$(INTDIR)\apr_dbm_gdbm-1.res" \
+	"..\..\apr\Release\libapr-1.lib" \
+	"..\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbm_gdbm-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\apr_dbm_gdbm-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_gdbm-1.dll"
+   if exist .\Release\apr_dbm_gdbm-1.dll.manifest mt.exe -manifest .\Release\apr_dbm_gdbm-1.dll.manifest -outputresource:.\Release\apr_dbm_gdbm-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbm_gdbm-1.res"
+	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_gdbm_src.idb"
+	- at erase "$(INTDIR)\apr_dbm_gdbm_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.dll"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.exp"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.lib"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_GDBM=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_gdbm_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_gdbm" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_gdbm.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libgdbm.lib /nologo /base:"0x6F010000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbm_gdbm-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_gdbm-1.dll" /implib:"$(OUTDIR)\apr_dbm_gdbm-1.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbm_gdbm.obj" \
+	"$(INTDIR)\apr_dbm_gdbm-1.res" \
+	"..\..\apr\Debug\libapr-1.lib" \
+	"..\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbm_gdbm-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\apr_dbm_gdbm-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_gdbm-1.dll"
+   if exist .\Debug\apr_dbm_gdbm-1.dll.manifest mt.exe -manifest .\Debug\apr_dbm_gdbm-1.dll.manifest -outputresource:.\Debug\apr_dbm_gdbm-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbm_gdbm-1.res"
+	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_gdbm_src.idb"
+	- at erase "$(INTDIR)\apr_dbm_gdbm_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.dll"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.exp"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.lib"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_GDBM=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_gdbm_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_gdbm" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_gdbm.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libgdbm.lib /nologo /base:"0x6F010000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbm_gdbm-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_gdbm-1.dll" /implib:"$(OUTDIR)\apr_dbm_gdbm-1.lib" /MACHINE:X64 /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbm_gdbm.obj" \
+	"$(INTDIR)\apr_dbm_gdbm-1.res" \
+	"..\..\apr\x64\Release\libapr-1.lib" \
+	"..\x64\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbm_gdbm-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\apr_dbm_gdbm-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_gdbm-1.dll"
+   if exist .\x64\Release\apr_dbm_gdbm-1.dll.manifest mt.exe -manifest .\x64\Release\apr_dbm_gdbm-1.dll.manifest -outputresource:.\x64\Release\apr_dbm_gdbm-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_dbm_gdbm-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_dbm_gdbm-1.res"
+	- at erase "$(INTDIR)\apr_dbm_gdbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_gdbm_src.idb"
+	- at erase "$(INTDIR)\apr_dbm_gdbm_src.pdb"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.dll"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.exp"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.lib"
+	- at erase "$(OUTDIR)\apr_dbm_gdbm-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_GDBM=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_gdbm_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_dbm_gdbm" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm_gdbm.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libgdbm.lib /nologo /base:"0x6F010000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_dbm_gdbm-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_gdbm-1.dll" /implib:"$(OUTDIR)\apr_dbm_gdbm-1.lib" /MACHINE:X64 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_dbm_gdbm.obj" \
+	"$(INTDIR)\apr_dbm_gdbm-1.res" \
+	"..\..\apr\x64\Debug\libapr-1.lib" \
+	"..\x64\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_dbm_gdbm-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\apr_dbm_gdbm-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_dbm_gdbm-1.dll"
+   if exist .\x64\Debug\apr_dbm_gdbm-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_dbm_gdbm-1.dll.manifest -outputresource:.\x64\Debug\apr_dbm_gdbm-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("apr_dbm_gdbm.dep")
+!INCLUDE "apr_dbm_gdbm.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "apr_dbm_gdbm.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "apr_dbm_gdbm - Win32 Release" || "$(CFG)" == "apr_dbm_gdbm - Win32 Debug" || "$(CFG)" == "apr_dbm_gdbm - x64 Release" || "$(CFG)" == "apr_dbm_gdbm - x64 Debug"
+SOURCE=.\apr_dbm_gdbm.c
+
+"$(INTDIR)\apr_dbm_gdbm.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "apr_dbm_gdbm - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util\dbm"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbm"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util\dbm"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbm"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util\dbm"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbm"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util\dbm"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\dbm"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_dbm_gdbm - Win32 Release"
+
+"libaprutil - Win32 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
+   cd ".\dbm"
+
+"libaprutil - Win32 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
+   cd ".\dbm"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - Win32 Debug"
+
+"libaprutil - Win32 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
+   cd ".\dbm"
+
+"libaprutil - Win32 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".\dbm"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Release"
+
+"libaprutil - x64 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
+   cd ".\dbm"
+
+"libaprutil - x64 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
+   cd ".\dbm"
+
+!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Debug"
+
+"libaprutil - x64 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
+   cd ".\dbm"
+
+"libaprutil - x64 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
+   cd ".\dbm"
+
+!ENDIF 
+
+SOURCE=..\libaprutil.rc
+
+!IF  "$(CFG)" == "apr_dbm_gdbm - Win32 Release"
+
+
+"$(INTDIR)\apr_dbm_gdbm-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_gdbm" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - Win32 Debug"
+
+
+"$(INTDIR)\apr_dbm_gdbm-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_gdbm" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Release"
+
+
+"$(INTDIR)\apr_dbm_gdbm-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_gdbm" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_dbm_gdbm - x64 Debug"
+
+
+"$(INTDIR)\apr_dbm_gdbm-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_dbm_gdbm-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_dbm_gdbm" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/dbm/sdbm/sdbm.c b/dbm/sdbm/sdbm.c
index a1ce695..a62b009 100644
--- a/dbm/sdbm/sdbm.c
+++ b/dbm/sdbm/sdbm.c
@@ -40,7 +40,7 @@
  */
 static int getdbit (apr_sdbm_t *, long);
 static apr_status_t setdbit(apr_sdbm_t *, long);
-static apr_status_t getpage(apr_sdbm_t *db, long);
+static apr_status_t getpage(apr_sdbm_t *db, long, int, int);
 static apr_status_t getnext(apr_sdbm_datum_t *key, apr_sdbm_t *db);
 static apr_status_t makroom(apr_sdbm_t *, long, int);
 
@@ -93,6 +93,7 @@ static apr_status_t prep(apr_sdbm_t **pdb, const char *dirname, const char *pagn
 
     db = malloc(sizeof(*db));
     memset(db, 0, sizeof(*db));
+    db->pagbno = -1L;
 
     db->pool = p;
 
@@ -193,7 +194,7 @@ APU_DECLARE(apr_status_t) apr_sdbm_fetch(apr_sdbm_t *db, apr_sdbm_datum_t *val,
     if ((status = apr_sdbm_lock(db, APR_FLOCK_SHARED)) != APR_SUCCESS)
         return status;
 
-    if ((status = getpage(db, exhash(key))) == APR_SUCCESS) {
+    if ((status = getpage(db, exhash(key), 0, 1)) == APR_SUCCESS) {
         *val = getpair(db->pagbuf, key);
         /* ### do we want a not-found result? */
     }
@@ -227,7 +228,7 @@ APU_DECLARE(apr_status_t) apr_sdbm_delete(apr_sdbm_t *db,
     if ((status = apr_sdbm_lock(db, APR_FLOCK_EXCLUSIVE)) != APR_SUCCESS)
         return status;
 
-    if ((status = getpage(db, exhash(key))) == APR_SUCCESS) {
+    if ((status = getpage(db, exhash(key), 0, 1)) == APR_SUCCESS) {
         if (!delpair(db->pagbuf, key))
             /* ### should we define some APRUTIL codes? */
             status = APR_EGENERAL;
@@ -261,7 +262,7 @@ APU_DECLARE(apr_status_t) apr_sdbm_store(apr_sdbm_t *db, apr_sdbm_datum_t key,
     if ((status = apr_sdbm_lock(db, APR_FLOCK_EXCLUSIVE)) != APR_SUCCESS)
         return status;
 
-    if ((status = getpage(db, (hash = exhash(key)))) == APR_SUCCESS) {
+    if ((status = getpage(db, (hash = exhash(key)), 0, 1)) == APR_SUCCESS) {
 
         /*
          * if we need to replace, delete the key/data pair
@@ -376,17 +377,19 @@ static apr_status_t makroom(apr_sdbm_t *db, long hash, int need)
 
 /* Reads 'len' bytes from file 'f' at offset 'off' into buf.
  * 'off' is given relative to the start of the file.
- * If EOF is returned while reading, this is taken as success.
+ * If 'create' is asked and EOF is returned while reading, this is taken
+ * as success (i.e. a cleared buffer is returned).
  */
 static apr_status_t read_from(apr_file_t *f, void *buf, 
-             apr_off_t off, apr_size_t len)
+                              apr_off_t off, apr_size_t len,
+                              int create)
 {
     apr_status_t status;
 
     if ((status = apr_file_seek(f, APR_SET, &off)) != APR_SUCCESS ||
         ((status = apr_file_read_full(f, buf, len, NULL)) != APR_SUCCESS)) {
         /* if EOF is reached, pretend we read all zero's */
-        if (status == APR_EOF) {
+        if (status == APR_EOF && create) {
             memset(buf, 0, len);
             status = APR_SUCCESS;
         }
@@ -410,9 +413,7 @@ APU_DECLARE(apr_status_t) apr_sdbm_firstkey(apr_sdbm_t *db,
     /*
      * start at page 0
      */
-    if ((status = read_from(db->pagf, db->pagbuf, OFF_PAG(0), PBLKSIZ))
-                == APR_SUCCESS) {
-        db->pagbno = 0;
+    if ((status = getpage(db, 0, 1, 1)) == APR_SUCCESS) {
         db->blkptr = 0;
         db->keyptr = 0;
         status = getnext(key, db);
@@ -441,24 +442,28 @@ APU_DECLARE(apr_status_t) apr_sdbm_nextkey(apr_sdbm_t *db,
 /*
  * all important binary tree traversal
  */
-static apr_status_t getpage(apr_sdbm_t *db, long hash)
+static apr_status_t getpage(apr_sdbm_t *db, long hash, int by_num, int create)
 {
-    register int hbit;
-    register long dbit;
-    register long pagb;
     apr_status_t status;
+    register long pagb;
 
-    dbit = 0;
-    hbit = 0;
-    while (dbit < db->maxbno && getdbit(db, dbit))
-    dbit = 2 * dbit + ((hash & (1 << hbit++)) ? 2 : 1);
+    if (by_num) {
+        pagb = hash;
+    }
+    else {
+        register int hbit = 0;
+        register long dbit = 0;
 
-    debug(("dbit: %d...", dbit));
+        while (dbit < db->maxbno && getdbit(db, dbit))
+            dbit = 2 * dbit + ((hash & (1 << hbit++)) ? 2 : 1);
+        debug(("dbit: %d...", dbit));
 
-    db->curbit = dbit;
-    db->hmask = masks[hbit];
+        db->curbit = dbit;
+        db->hmask = masks[hbit];
+
+        pagb = hash & db->hmask;
+    }
 
-    pagb = hash & db->hmask;
     /*
      * see if the block we need is already in memory.
      * note: this lookaside cache has about 10% hit rate.
@@ -470,12 +475,14 @@ static apr_status_t getpage(apr_sdbm_t *db, long hash)
          * ### joe: this assumption was surely never correct? but
          * ### we make it so in read_from anyway.
          */
-        if ((status = read_from(db->pagf, db->pagbuf, OFF_PAG(pagb), PBLKSIZ)) 
-                    != APR_SUCCESS)
+        if ((status = read_from(db->pagf, db->pagbuf,
+                                OFF_PAG(pagb), PBLKSIZ,
+                                create)) != APR_SUCCESS)
             return status;
 
         if (!chkpage(db->pagbuf))
             return APR_ENOSPC; /* ### better error? */
+
         db->pagbno = pagb;
 
         debug(("pag read: %d\n", pagb));
@@ -492,8 +499,9 @@ static int getdbit(apr_sdbm_t *db, long dbit)
     dirb = c / DBLKSIZ;
 
     if (dirb != db->dirbno) {
-        if (read_from(db->dirf, db->dirbuf, OFF_DIR(dirb), DBLKSIZ)
-                    != APR_SUCCESS)
+        if (read_from(db->dirf, db->dirbuf,
+                      OFF_DIR(dirb), DBLKSIZ,
+                      1) != APR_SUCCESS)
             return 0;
 
         db->dirbno = dirb;
@@ -515,8 +523,9 @@ static apr_status_t setdbit(apr_sdbm_t *db, long dbit)
     dirb = c / DBLKSIZ;
 
     if (dirb != db->dirbno) {
-        if ((status = read_from(db->dirf, db->dirbuf, OFF_DIR(dirb), DBLKSIZ))
-                    != APR_SUCCESS)
+        if ((status = read_from(db->dirf, db->dirbuf,
+                                OFF_DIR(dirb), DBLKSIZ,
+                                1)) != APR_SUCCESS)
             return status;
 
         db->dirbno = dirb;
@@ -553,21 +562,12 @@ static apr_status_t getnext(apr_sdbm_datum_t *key, apr_sdbm_t *db)
          * try the next one... If we lost our position on the
          * file, we will have to seek.
          */
+        db->blkptr++;
         db->keyptr = 0;
-        if (db->pagbno != db->blkptr++) {
-            apr_off_t off = OFF_PAG(db->blkptr);
-            if ((status = apr_file_seek(db->pagf, APR_SET, &off))
-                        != APR_SUCCESS)
-                return status;
-        }
 
-        db->pagbno = db->blkptr;
         /* ### EOF acceptable here too? */
-        if ((status = apr_file_read_full(db->pagf, db->pagbuf, PBLKSIZ, NULL))
-                    != APR_SUCCESS)
+        if ((status = getpage(db, db->blkptr, 1, 0)) != APR_SUCCESS)
             return status;
-        if (!chkpage(db->pagbuf))
-            return APR_EGENERAL;     /* ### need better error */
     }
 
     /* NOTREACHED */
diff --git a/dbm/sdbm/sdbm_pair.c b/dbm/sdbm/sdbm_pair.c
index 2130200..50d7965 100644
--- a/dbm/sdbm/sdbm_pair.c
+++ b/dbm/sdbm/sdbm_pair.c
@@ -308,7 +308,8 @@ char *pag;
 	if (n > 0) {
 		off = PBLKSIZ;
 		for (ino++; n > 0; ino += 2) {
-			if (ino[0] > off || ino[1] > off ||
+			if (ino[0] < 0 || ino[0] > off ||
+			    ino[1] < 0 || ino[1] > off ||
 			    ino[1] > ino[0])
 				return 0;
 			off = ino[1];
diff --git a/include/apr_crypto.h b/include/apr_crypto.h
index 31bacea..b90f3fe 100644
--- a/include/apr_crypto.h
+++ b/include/apr_crypto.h
@@ -194,7 +194,7 @@ APU_DECLARE(apr_status_t) apr_crypto_clear(apr_pool_t *pool, void *buffer,
  * @param buffer - buffer to zero out
  * @param size - size of the buffer to zero out
  */
-APR_DECLARE(apr_status_t) apr_crypto_memzero(void *buffer, apr_size_t size);
+APU_DECLARE(apr_status_t) apr_crypto_memzero(void *buffer, apr_size_t size);
 
 /**
  * @brief Timing attacks safe buffers comparison, where the executing time does
@@ -205,7 +205,7 @@ APR_DECLARE(apr_status_t) apr_crypto_memzero(void *buffer, apr_size_t size);
  * @param size - size of the buffers to compare
  * @return 1 if the buffers are equals, 0 otherwise.
  */
-APR_DECLARE(int) apr_crypto_equals(const void *buf1, const void *buf2,
+APU_DECLARE(int) apr_crypto_equals(const void *buf1, const void *buf2,
                                    apr_size_t size);
 
 /**
@@ -309,7 +309,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get_block_key_modes(apr_hash_t **modes,
  *         not known. APR_EPADDING if padding was requested but is not supported.
  *         APR_ENOTIMPL if not implemented.
  */
-APR_DECLARE(apr_status_t) apr_crypto_key(apr_crypto_key_t **key,
+APU_DECLARE(apr_status_t) apr_crypto_key(apr_crypto_key_t **key,
         const apr_crypto_key_rec_t *rec, const apr_crypto_t *f, apr_pool_t *p);
 
 /**
diff --git a/include/apr_siphash.h b/include/apr_siphash.h
index d25498b..42aa887 100644
--- a/include/apr_siphash.h
+++ b/include/apr_siphash.h
@@ -30,6 +30,7 @@
 #define APR_SIPHASH_H
 
 #include "apr.h"
+#include "apu.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -66,7 +67,7 @@ extern "C" {
  * @param d   The number of finalization rounds
  * @return The hash value as a 64bit unsigned integer
  */
-APR_DECLARE(apr_uint64_t) apr_siphash(const void *src, apr_size_t len,
+APU_DECLARE(apr_uint64_t) apr_siphash(const void *src, apr_size_t len,
                               const unsigned char key[APR_SIPHASH_KSIZE],
                                       unsigned int c, unsigned int d);
 
@@ -83,7 +84,7 @@ APR_DECLARE(apr_uint64_t) apr_siphash(const void *src, apr_size_t len,
  * @param d   The number of finalization rounds
  * @return The hash value as a 64bit unsigned integer
  */
-APR_DECLARE(void) apr_siphash_auth(unsigned char out[APR_SIPHASH_DSIZE],
+APU_DECLARE(void) apr_siphash_auth(unsigned char out[APR_SIPHASH_DSIZE],
                                    const void *src, apr_size_t len,
                              const unsigned char key[APR_SIPHASH_KSIZE],
                                    unsigned int c, unsigned int d);
@@ -96,7 +97,7 @@ APR_DECLARE(void) apr_siphash_auth(unsigned char out[APR_SIPHASH_DSIZE],
  * @param key The secret key
  * @return The hash value as a 64bit unsigned integer
  */
-APR_DECLARE(apr_uint64_t) apr_siphash24(const void *src, apr_size_t len,
+APU_DECLARE(apr_uint64_t) apr_siphash24(const void *src, apr_size_t len,
                                const unsigned char key[APR_SIPHASH_KSIZE]);
 
 /**
@@ -110,7 +111,7 @@ APR_DECLARE(apr_uint64_t) apr_siphash24(const void *src, apr_size_t len,
  * @param key The secret key
  * @return The hash value as a 64bit unsigned integer
  */
-APR_DECLARE(void) apr_siphash24_auth(unsigned char out[APR_SIPHASH_DSIZE],
+APU_DECLARE(void) apr_siphash24_auth(unsigned char out[APR_SIPHASH_DSIZE],
                                      const void *src, apr_size_t len,
                                const unsigned char key[APR_SIPHASH_KSIZE]);
 
@@ -122,7 +123,7 @@ APR_DECLARE(void) apr_siphash24_auth(unsigned char out[APR_SIPHASH_DSIZE],
  * @param key The secret key
  * @return The hash value as a 64bit unsigned integer
  */
-APR_DECLARE(apr_uint64_t) apr_siphash48(const void *src, apr_size_t len,
+APU_DECLARE(apr_uint64_t) apr_siphash48(const void *src, apr_size_t len,
                                const unsigned char key[APR_SIPHASH_KSIZE]);
 
 /**
@@ -136,7 +137,7 @@ APR_DECLARE(apr_uint64_t) apr_siphash48(const void *src, apr_size_t len,
  * @param key The secret key
  * @return The hash value as a 64bit unsigned integer
  */
-APR_DECLARE(void) apr_siphash48_auth(unsigned char out[APR_SIPHASH_DSIZE],
+APU_DECLARE(void) apr_siphash48_auth(unsigned char out[APR_SIPHASH_DSIZE],
                                      const void *src, apr_size_t len,
                                const unsigned char key[APR_SIPHASH_KSIZE]);
 
diff --git a/include/apu_version.h b/include/apu_version.h
index a287336..e4fb2e6 100644
--- a/include/apu_version.h
+++ b/include/apu_version.h
@@ -62,14 +62,14 @@
  * The Patch Level never includes API changes, simply bug fixes.
  * Reset to 0 when upgrading APR_MINOR_VERSION
  */
-#define APU_PATCH_VERSION       0
+#define APU_PATCH_VERSION       1
 
 /** 
  * The symbol APU_IS_DEV_VERSION is only defined for internal,
  * "development" copies of APU.  It is undefined for released versions
  * of APU.
- * #define APU_IS_DEV_VERSION
  */
+/* #undef APU_IS_DEV_VERSION */
 
 
 #if defined(APU_IS_DEV_VERSION) || defined(DOXYGEN)
diff --git a/ldap/apr_ldap.dep b/ldap/apr_ldap.dep
index 810466f..56cab56 100644
--- a/ldap/apr_ldap.dep
+++ b/ldap/apr_ldap.dep
@@ -1,37 +1,37 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_ldap.mak
-
-.\apr_ldap_init.c : \
-	"..\include\apr_ldap.h"\
-	"..\include\apr_ldap_init.h"\
-	"..\include\apr_ldap_option.h"\
-	"..\include\apr_ldap_rebind.h"\
-	"..\include\apr_ldap_url.h"\
-	"..\include\apu.h"\
-	"..\include\private\apu_config.h"\
-	"..\include\private\apu_internal.h"\
-	
-
-.\apr_ldap_option.c : \
-	"..\include\apr_ldap.h"\
-	"..\include\apr_ldap_init.h"\
-	"..\include\apr_ldap_option.h"\
-	"..\include\apr_ldap_rebind.h"\
-	"..\include\apr_ldap_url.h"\
-	"..\include\apu.h"\
-	"..\include\private\apu_config.h"\
-	
-
-.\apr_ldap_rebind.c : \
-	"..\include\apr_ldap.h"\
-	"..\include\apr_ldap_init.h"\
-	"..\include\apr_ldap_option.h"\
-	"..\include\apr_ldap_rebind.h"\
-	"..\include\apr_ldap_url.h"\
-	"..\include\apu.h"\
-	"..\include\private\apu_config.h"\
-	
-
-..\libaprutil.rc : \
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by apr_ldap.mak
+
+.\apr_ldap_init.c : \
+	"..\include\apr_ldap.h"\
+	"..\include\apr_ldap_init.h"\
+	"..\include\apr_ldap_option.h"\
+	"..\include\apr_ldap_rebind.h"\
+	"..\include\apr_ldap_url.h"\
+	"..\include\apu.h"\
+	"..\include\private\apu_config.h"\
+	"..\include\private\apu_internal.h"\
+	
+
+.\apr_ldap_option.c : \
+	"..\include\apr_ldap.h"\
+	"..\include\apr_ldap_init.h"\
+	"..\include\apr_ldap_option.h"\
+	"..\include\apr_ldap_rebind.h"\
+	"..\include\apr_ldap_url.h"\
+	"..\include\apu.h"\
+	"..\include\private\apu_config.h"\
+	
+
+.\apr_ldap_rebind.c : \
+	"..\include\apr_ldap.h"\
+	"..\include\apr_ldap_init.h"\
+	"..\include\apr_ldap_option.h"\
+	"..\include\apr_ldap_rebind.h"\
+	"..\include\apr_ldap_url.h"\
+	"..\include\apu.h"\
+	"..\include\private\apu_config.h"\
+	
+
+..\libaprutil.rc : \
+	"..\include\apu.h"\
+	"..\include\apu_version.h"\
+	
diff --git a/ldap/apr_ldap.mak b/ldap/apr_ldap.mak
index 7a6e576..040ca67 100644
--- a/ldap/apr_ldap.mak
+++ b/ldap/apr_ldap.mak
@@ -1,620 +1,620 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_ldap.dsp
-!IF "$(CFG)" == ""
-CFG=apr_ldap - Win32 Release
-!MESSAGE No configuration specified. Defaulting to apr_ldap - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_ldap - Win32 Release" && "$(CFG)" != "apr_ldap - Win32 Debug" && "$(CFG)" != "apr_ldap - x64 Release" && "$(CFG)" != "apr_ldap - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_ldap.mak" CFG="apr_ldap - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_ldap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_ldap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_ldap - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_ldap - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_ldap - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_ldap-1.res"
-	- at erase "$(INTDIR)\apr_ldap_init.obj"
-	- at erase "$(INTDIR)\apr_ldap_option.obj"
-	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
-	- at erase "$(INTDIR)\apr_ldap_src.idb"
-	- at erase "$(INTDIR)\apr_ldap_src.pdb"
-	- at erase "$(OUTDIR)\apr_ldap-1.dll"
-	- at erase "$(OUTDIR)\apr_ldap-1.exp"
-	- at erase "$(OUTDIR)\apr_ldap-1.lib"
-	- at erase "$(OUTDIR)\apr_ldap-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_ldap_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_ldap.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_ldap-1.pdb" /debug /out:"$(OUTDIR)\apr_ldap-1.dll" /implib:"$(OUTDIR)\apr_ldap-1.lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_ldap_init.obj" \
-	"$(INTDIR)\apr_ldap_option.obj" \
-	"$(INTDIR)\apr_ldap_rebind.obj" \
-	"$(INTDIR)\apr_ldap-1.res" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_ldap-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_ldap-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_ldap-1.dll"
-   if exist .\Release\apr_ldap-1.dll.manifest mt.exe -manifest .\Release\apr_ldap-1.dll.manifest -outputresource:.\Release\apr_ldap-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_ldap-1.res"
-	- at erase "$(INTDIR)\apr_ldap_init.obj"
-	- at erase "$(INTDIR)\apr_ldap_option.obj"
-	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
-	- at erase "$(INTDIR)\apr_ldap_src.idb"
-	- at erase "$(INTDIR)\apr_ldap_src.pdb"
-	- at erase "$(OUTDIR)\apr_ldap-1.dll"
-	- at erase "$(OUTDIR)\apr_ldap-1.exp"
-	- at erase "$(OUTDIR)\apr_ldap-1.lib"
-	- at erase "$(OUTDIR)\apr_ldap-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_ldap_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_ldap.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_ldap-1.pdb" /debug /out:"$(OUTDIR)\apr_ldap-1.dll" /implib:"$(OUTDIR)\apr_ldap-1.lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_ldap_init.obj" \
-	"$(INTDIR)\apr_ldap_option.obj" \
-	"$(INTDIR)\apr_ldap_rebind.obj" \
-	"$(INTDIR)\apr_ldap-1.res" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_ldap-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_ldap-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_ldap-1.dll"
-   if exist .\Debug\apr_ldap-1.dll.manifest mt.exe -manifest .\Debug\apr_ldap-1.dll.manifest -outputresource:.\Debug\apr_ldap-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_ldap-1.res"
-	- at erase "$(INTDIR)\apr_ldap_init.obj"
-	- at erase "$(INTDIR)\apr_ldap_option.obj"
-	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
-	- at erase "$(INTDIR)\apr_ldap_src.idb"
-	- at erase "$(INTDIR)\apr_ldap_src.pdb"
-	- at erase "$(OUTDIR)\apr_ldap-1.dll"
-	- at erase "$(OUTDIR)\apr_ldap-1.exp"
-	- at erase "$(OUTDIR)\apr_ldap-1.lib"
-	- at erase "$(OUTDIR)\apr_ldap-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_ldap_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_ldap.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_ldap-1.pdb" /debug /out:"$(OUTDIR)\apr_ldap-1.dll" /implib:"$(OUTDIR)\apr_ldap-1.lib" /MACHINE:X64 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_ldap_init.obj" \
-	"$(INTDIR)\apr_ldap_option.obj" \
-	"$(INTDIR)\apr_ldap_rebind.obj" \
-	"$(INTDIR)\apr_ldap-1.res" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_ldap-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_ldap-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_ldap-1.dll"
-   if exist .\x64\Release\apr_ldap-1.dll.manifest mt.exe -manifest .\x64\Release\apr_ldap-1.dll.manifest -outputresource:.\x64\Release\apr_ldap-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_ldap-1.res"
-	- at erase "$(INTDIR)\apr_ldap_init.obj"
-	- at erase "$(INTDIR)\apr_ldap_option.obj"
-	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
-	- at erase "$(INTDIR)\apr_ldap_src.idb"
-	- at erase "$(INTDIR)\apr_ldap_src.pdb"
-	- at erase "$(OUTDIR)\apr_ldap-1.dll"
-	- at erase "$(OUTDIR)\apr_ldap-1.exp"
-	- at erase "$(OUTDIR)\apr_ldap-1.lib"
-	- at erase "$(OUTDIR)\apr_ldap-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_ldap_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_ldap.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_ldap-1.pdb" /debug /out:"$(OUTDIR)\apr_ldap-1.dll" /implib:"$(OUTDIR)\apr_ldap-1.lib" /MACHINE:X64 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_ldap_init.obj" \
-	"$(INTDIR)\apr_ldap_option.obj" \
-	"$(INTDIR)\apr_ldap_rebind.obj" \
-	"$(INTDIR)\apr_ldap-1.res" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_ldap-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_ldap-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_ldap-1.dll"
-   if exist .\x64\Debug\apr_ldap-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_ldap-1.dll.manifest -outputresource:.\x64\Debug\apr_ldap-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_ldap.dep")
-!INCLUDE "apr_ldap.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_ldap.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_ldap - Win32 Release" || "$(CFG)" == "apr_ldap - Win32 Debug" || "$(CFG)" == "apr_ldap - x64 Release" || "$(CFG)" == "apr_ldap - x64 Debug"
-SOURCE=.\apr_ldap_init.c
-
-"$(INTDIR)\apr_ldap_init.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\apr_ldap_option.c
-
-"$(INTDIR)\apr_ldap_option.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\apr_ldap_rebind.c
-
-"$(INTDIR)\apr_ldap_rebind.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_ldap - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\ldap"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\ldap"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\ldap"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\ldap"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\ldap"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\ldap"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\ldap"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\ldap"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_ldap - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\ldap"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\ldap"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\ldap"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\ldap"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\ldap"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\ldap"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\ldap"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\ldap"
-
-!ENDIF 
-
-SOURCE=..\libaprutil.rc
-
-!IF  "$(CFG)" == "apr_ldap - Win32 Release"
-
-
-"$(INTDIR)\apr_ldap-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
-
-
-"$(INTDIR)\apr_ldap-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
-
-
-"$(INTDIR)\apr_ldap-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
-
-
-"$(INTDIR)\apr_ldap-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on apr_ldap.dsp
+!IF "$(CFG)" == ""
+CFG=apr_ldap - Win32 Release
+!MESSAGE No configuration specified. Defaulting to apr_ldap - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "apr_ldap - Win32 Release" && "$(CFG)" != "apr_ldap - Win32 Debug" && "$(CFG)" != "apr_ldap - x64 Release" && "$(CFG)" != "apr_ldap - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_ldap.mak" CFG="apr_ldap - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_ldap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_ldap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_ldap - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_ldap - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_ldap - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_ldap-1.res"
+	- at erase "$(INTDIR)\apr_ldap_init.obj"
+	- at erase "$(INTDIR)\apr_ldap_option.obj"
+	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
+	- at erase "$(INTDIR)\apr_ldap_src.idb"
+	- at erase "$(INTDIR)\apr_ldap_src.pdb"
+	- at erase "$(OUTDIR)\apr_ldap-1.dll"
+	- at erase "$(OUTDIR)\apr_ldap-1.exp"
+	- at erase "$(OUTDIR)\apr_ldap-1.lib"
+	- at erase "$(OUTDIR)\apr_ldap-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_ldap_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_ldap.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_ldap-1.pdb" /debug /out:"$(OUTDIR)\apr_ldap-1.dll" /implib:"$(OUTDIR)\apr_ldap-1.lib" /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_ldap_init.obj" \
+	"$(INTDIR)\apr_ldap_option.obj" \
+	"$(INTDIR)\apr_ldap_rebind.obj" \
+	"$(INTDIR)\apr_ldap-1.res" \
+	"..\..\apr\Release\libapr-1.lib" \
+	"..\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_ldap-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\apr_ldap-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_ldap-1.dll"
+   if exist .\Release\apr_ldap-1.dll.manifest mt.exe -manifest .\Release\apr_ldap-1.dll.manifest -outputresource:.\Release\apr_ldap-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_ldap-1.res"
+	- at erase "$(INTDIR)\apr_ldap_init.obj"
+	- at erase "$(INTDIR)\apr_ldap_option.obj"
+	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
+	- at erase "$(INTDIR)\apr_ldap_src.idb"
+	- at erase "$(INTDIR)\apr_ldap_src.pdb"
+	- at erase "$(OUTDIR)\apr_ldap-1.dll"
+	- at erase "$(OUTDIR)\apr_ldap-1.exp"
+	- at erase "$(OUTDIR)\apr_ldap-1.lib"
+	- at erase "$(OUTDIR)\apr_ldap-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_ldap_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_ldap.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_ldap-1.pdb" /debug /out:"$(OUTDIR)\apr_ldap-1.dll" /implib:"$(OUTDIR)\apr_ldap-1.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_ldap_init.obj" \
+	"$(INTDIR)\apr_ldap_option.obj" \
+	"$(INTDIR)\apr_ldap_rebind.obj" \
+	"$(INTDIR)\apr_ldap-1.res" \
+	"..\..\apr\Debug\libapr-1.lib" \
+	"..\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_ldap-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\apr_ldap-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_ldap-1.dll"
+   if exist .\Debug\apr_ldap-1.dll.manifest mt.exe -manifest .\Debug\apr_ldap-1.dll.manifest -outputresource:.\Debug\apr_ldap-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_ldap-1.res"
+	- at erase "$(INTDIR)\apr_ldap_init.obj"
+	- at erase "$(INTDIR)\apr_ldap_option.obj"
+	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
+	- at erase "$(INTDIR)\apr_ldap_src.idb"
+	- at erase "$(INTDIR)\apr_ldap_src.pdb"
+	- at erase "$(OUTDIR)\apr_ldap-1.dll"
+	- at erase "$(OUTDIR)\apr_ldap-1.exp"
+	- at erase "$(OUTDIR)\apr_ldap-1.lib"
+	- at erase "$(OUTDIR)\apr_ldap-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_ldap_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_ldap.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_ldap-1.pdb" /debug /out:"$(OUTDIR)\apr_ldap-1.dll" /implib:"$(OUTDIR)\apr_ldap-1.lib" /MACHINE:X64 /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_ldap_init.obj" \
+	"$(INTDIR)\apr_ldap_option.obj" \
+	"$(INTDIR)\apr_ldap_rebind.obj" \
+	"$(INTDIR)\apr_ldap-1.res" \
+	"..\..\apr\x64\Release\libapr-1.lib" \
+	"..\x64\Release\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_ldap-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\apr_ldap-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_ldap-1.dll"
+   if exist .\x64\Release\apr_ldap-1.dll.manifest mt.exe -manifest .\x64\Release\apr_ldap-1.dll.manifest -outputresource:.\x64\Release\apr_ldap-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_ldap-1.res"
+	- at erase "$(INTDIR)\apr_ldap_init.obj"
+	- at erase "$(INTDIR)\apr_ldap_option.obj"
+	- at erase "$(INTDIR)\apr_ldap_rebind.obj"
+	- at erase "$(INTDIR)\apr_ldap_src.idb"
+	- at erase "$(INTDIR)\apr_ldap_src.pdb"
+	- at erase "$(OUTDIR)\apr_ldap-1.dll"
+	- at erase "$(OUTDIR)\apr_ldap-1.exp"
+	- at erase "$(OUTDIR)\apr_ldap-1.lib"
+	- at erase "$(OUTDIR)\apr_ldap-1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_ldap_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_ldap.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_ldap-1.pdb" /debug /out:"$(OUTDIR)\apr_ldap-1.dll" /implib:"$(OUTDIR)\apr_ldap-1.lib" /MACHINE:X64 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_ldap_init.obj" \
+	"$(INTDIR)\apr_ldap_option.obj" \
+	"$(INTDIR)\apr_ldap_rebind.obj" \
+	"$(INTDIR)\apr_ldap-1.res" \
+	"..\..\apr\x64\Debug\libapr-1.lib" \
+	"..\x64\Debug\libaprutil-1.lib"
+
+"$(OUTDIR)\apr_ldap-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\apr_ldap-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_ldap-1.dll"
+   if exist .\x64\Debug\apr_ldap-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_ldap-1.dll.manifest -outputresource:.\x64\Debug\apr_ldap-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("apr_ldap.dep")
+!INCLUDE "apr_ldap.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "apr_ldap.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "apr_ldap - Win32 Release" || "$(CFG)" == "apr_ldap - Win32 Debug" || "$(CFG)" == "apr_ldap - x64 Release" || "$(CFG)" == "apr_ldap - x64 Debug"
+SOURCE=.\apr_ldap_init.c
+
+"$(INTDIR)\apr_ldap_init.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\apr_ldap_option.c
+
+"$(INTDIR)\apr_ldap_option.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\apr_ldap_rebind.c
+
+"$(INTDIR)\apr_ldap_rebind.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "apr_ldap - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util\ldap"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\ldap"
+
+!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util\ldap"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\ldap"
+
+!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util\ldap"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util\ldap"
+
+!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util\ldap"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util\ldap"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "apr_ldap - Win32 Release"
+
+"libaprutil - Win32 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
+   cd ".\ldap"
+
+"libaprutil - Win32 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
+   cd ".\ldap"
+
+!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
+
+"libaprutil - Win32 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
+   cd ".\ldap"
+
+"libaprutil - Win32 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".\ldap"
+
+!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
+
+"libaprutil - x64 Release" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
+   cd ".\ldap"
+
+"libaprutil - x64 ReleaseCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
+   cd ".\ldap"
+
+!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
+
+"libaprutil - x64 Debug" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
+   cd ".\ldap"
+
+"libaprutil - x64 DebugCLEAN" : 
+   cd ".\.."
+   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
+   cd ".\ldap"
+
+!ENDIF 
+
+SOURCE=..\libaprutil.rc
+
+!IF  "$(CFG)" == "apr_ldap - Win32 Release"
+
+
+"$(INTDIR)\apr_ldap-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
+
+
+"$(INTDIR)\apr_ldap-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
+
+
+"$(INTDIR)\apr_ldap-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
+
+
+"$(INTDIR)\apr_ldap-1.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /i "\httpd-2.4.4\srclib\apr-util" /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/libaprutil.dep b/libaprutil.dep
index 4aa3835..6ff8a74 100644
--- a/libaprutil.dep
+++ b/libaprutil.dep
@@ -1,340 +1,339 @@
-# Microsoft Developer Studio Generated Dependency File, included by libaprutil.mak
-
-.\buckets\apr_brigade.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_alloc.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_eos.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_file.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_flush.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_heap.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_mmap.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_pipe.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_pool.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_refcount.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_simple.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\buckets\apr_buckets_socket.c : \
-	".\include\apr_buckets.h"\
-	".\include\apu.h"\
-	
-
-.\crypto\apr_crypto.c : \
-	".\include\apr_crypto.h"\
-	".\include\apu.h"\
-	".\include\apu_errno.h"\
-	".\include\apu_version.h"\
-	".\include\private\apr_crypto_internal.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_internal.h"\
-	
-
-.\crypto\apr_md4.c : \
-	".\include\apr_md4.h"\
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	
-
-.\crypto\apr_md5.c : \
-	".\include\apr_md5.h"\
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	".\include\private\apu_config.h"\
-	
-
-.\crypto\apr_passwd.c : \
-	".\crypto\crypt_blowfish.h"\
-	".\include\apr_md5.h"\
-	".\include\apr_sha1.h"\
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	".\include\private\apu_config.h"\
-	
-
-.\crypto\apr_sha1.c : \
-	".\include\apr_base64.h"\
-	".\include\apr_sha1.h"\
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	
-
-.\crypto\apr_siphash.c : \
-	".\include\apr_siphash.h"\
-	
-
-.\crypto\crypt_blowfish.c : \
-	".\crypto\crypt_blowfish.h"\
-	
-
-.\crypto\getuuid.c : \
-	".\include\apr_md5.h"\
-	".\include\apr_uuid.h"\
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	
-
-.\crypto\uuid.c : \
-	".\include\apr_uuid.h"\
-	".\include\apu.h"\
-	
-
-.\dbd\apr_dbd.c : \
-	".\include\apr_dbd.h"\
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	".\include\private\apr_dbd_internal.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_internal.h"\
-	
-
-.\dbm\apr_dbm.c : \
-	".\include\apr_dbm.h"\
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	".\include\private\apr_dbm_private.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_internal.h"\
-	".\include\private\apu_select_dbm.h"\
-	
-
-.\dbm\apr_dbm_sdbm.c : \
-	".\include\apr_dbm.h"\
-	".\include\apr_sdbm.h"\
-	".\include\apu.h"\
-	".\include\private\apr_dbm_private.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_select_dbm.h"\
-	
-
-.\encoding\apr_base64.c : \
-	".\include\apr_base64.h"\
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	
-
-.\hooks\apr_hooks.c : \
-	".\include\apr_hooks.h"\
-	".\include\apr_optional.h"\
-	".\include\apr_optional_hooks.h"\
-	".\include\apu.h"\
-	
-
-.\ldap\apr_ldap_stub.c : \
-	".\include\apr_ldap.h"\
-	".\include\apr_ldap_init.h"\
-	".\include\apr_ldap_option.h"\
-	".\include\apr_ldap_rebind.h"\
-	".\include\apr_ldap_url.h"\
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_internal.h"\
-	
-
-.\ldap\apr_ldap_url.c : \
-	".\include\apr_ldap.h"\
-	".\include\apr_ldap_init.h"\
-	".\include\apr_ldap_option.h"\
-	".\include\apr_ldap_rebind.h"\
-	".\include\apr_ldap_url.h"\
-	".\include\apu.h"\
-	
-
-.\memcache\apr_memcache.c : \
-	".\include\apr_buckets.h"\
-	".\include\apr_memcache.h"\
-	".\include\apr_reslist.h"\
-	".\include\apu.h"\
-	
-
-.\misc\apr_date.c : \
-	".\include\apr_date.h"\
-	".\include\apu.h"\
-	
-
-.\misc\apr_queue.c : \
-	".\include\apr_queue.h"\
-	".\include\apu.h"\
-	
-
-.\misc\apr_reslist.c : \
-	".\include\apr_reslist.h"\
-	".\include\apu.h"\
-	
-
-.\misc\apr_rmm.c : \
-	".\include\apr_anylock.h"\
-	".\include\apr_rmm.h"\
-	".\include\apu.h"\
-	
-
-.\misc\apr_thread_pool.c : \
-	".\include\apr_thread_pool.h"\
-	".\include\apu.h"\
-	
-
-.\misc\apu_dso.c : \
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	".\include\private\apu_config.h"\
-	".\include\private\apu_internal.h"\
-	
-
-.\misc\apu_version.c : \
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	
-
-.\dbm\sdbm\sdbm.c : \
-	".\dbm\sdbm\sdbm_pair.h"\
-	".\dbm\sdbm\sdbm_private.h"\
-	".\dbm\sdbm\sdbm_tune.h"\
-	".\include\apr_sdbm.h"\
-	".\include\apu.h"\
-	
-
-.\dbm\sdbm\sdbm_hash.c : \
-	".\dbm\sdbm\sdbm_private.h"\
-	".\include\apr_sdbm.h"\
-	".\include\apu.h"\
-	
-
-.\dbm\sdbm\sdbm_lock.c : \
-	".\dbm\sdbm\sdbm_private.h"\
-	".\dbm\sdbm\sdbm_tune.h"\
-	".\include\apr_sdbm.h"\
-	".\include\apu.h"\
-	
-
-.\dbm\sdbm\sdbm_pair.c : \
-	".\dbm\sdbm\sdbm_pair.h"\
-	".\dbm\sdbm\sdbm_private.h"\
-	".\dbm\sdbm\sdbm_tune.h"\
-	".\include\apr_sdbm.h"\
-	".\include\apu.h"\
-	
-
-.\strmatch\apr_strmatch.c : \
-	".\include\apr_strmatch.h"\
-	".\include\apu.h"\
-	
-
-.\uri\apr_uri.c : \
-	".\include\apr_uri.h"\
-	".\include\apu.h"\
-	
-
-.\xlate\xlate.c : \
-	".\include\apr_xlate.h"\
-	".\include\apu.h"\
-	".\include\private\apu_config.h"\
-	
-
-.\xml\apr_xml.c : \
-	".\include\apr_xlate.h"\
-	".\include\apr_xml.h"\
-	".\include\apu.h"\
-	".\include\private\apu_config.h"\
-	".\xml\expat\lib\expat.h"\
-	
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-!ENDIF 
-
-.\libaprutil.rc : \
-	".\include\apu.h"\
-	".\include\apu_version.h"\
-	
+# Microsoft Developer Studio Generated Dependency File, included by libaprutil.mak
+
+.\buckets\apr_brigade.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_alloc.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_eos.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_file.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_flush.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_heap.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_mmap.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_pipe.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_pool.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_refcount.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_simple.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\buckets\apr_buckets_socket.c : \
+	".\include\apr_buckets.h"\
+	".\include\apu.h"\
+	
+
+.\crypto\apr_crypto.c : \
+	".\include\apr_crypto.h"\
+	".\include\apu.h"\
+	".\include\apu_errno.h"\
+	".\include\apu_version.h"\
+	".\include\private\apr_crypto_internal.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_internal.h"\
+	
+
+.\crypto\apr_md4.c : \
+	".\include\apr_md4.h"\
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	
+
+.\crypto\apr_md5.c : \
+	".\include\apr_md5.h"\
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	".\include\private\apu_config.h"\
+	
+
+.\crypto\apr_passwd.c : \
+	".\crypto\crypt_blowfish.h"\
+	".\include\apr_md5.h"\
+	".\include\apr_sha1.h"\
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	".\include\private\apu_config.h"\
+	
+
+.\crypto\apr_sha1.c : \
+	".\include\apr_base64.h"\
+	".\include\apr_sha1.h"\
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	
+
+.\crypto\apr_siphash.c : \
+	".\include\apr_siphash.h"\
+	
+
+.\crypto\crypt_blowfish.c : \
+	".\crypto\crypt_blowfish.h"\
+	
+
+.\crypto\getuuid.c : \
+	".\include\apr_md5.h"\
+	".\include\apr_uuid.h"\
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	
+
+.\crypto\uuid.c : \
+	".\include\apr_uuid.h"\
+	".\include\apu.h"\
+	
+
+.\dbd\apr_dbd.c : \
+	".\include\apr_dbd.h"\
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	".\include\private\apr_dbd_internal.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_internal.h"\
+	
+
+.\dbm\apr_dbm.c : \
+	".\include\apr_dbm.h"\
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	".\include\private\apr_dbm_private.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_internal.h"\
+	".\include\private\apu_select_dbm.h"\
+	
+
+.\dbm\apr_dbm_sdbm.c : \
+	".\include\apr_dbm.h"\
+	".\include\apr_sdbm.h"\
+	".\include\apu.h"\
+	".\include\private\apr_dbm_private.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_select_dbm.h"\
+	
+
+.\encoding\apr_base64.c : \
+	".\include\apr_base64.h"\
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	
+
+.\hooks\apr_hooks.c : \
+	".\include\apr_hooks.h"\
+	".\include\apr_optional.h"\
+	".\include\apr_optional_hooks.h"\
+	".\include\apu.h"\
+	
+
+.\ldap\apr_ldap_stub.c : \
+	".\include\apr_ldap.h"\
+	".\include\apr_ldap_init.h"\
+	".\include\apr_ldap_option.h"\
+	".\include\apr_ldap_rebind.h"\
+	".\include\apr_ldap_url.h"\
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_internal.h"\
+	
+
+.\ldap\apr_ldap_url.c : \
+	".\include\apr_ldap.h"\
+	".\include\apr_ldap_init.h"\
+	".\include\apr_ldap_option.h"\
+	".\include\apr_ldap_rebind.h"\
+	".\include\apr_ldap_url.h"\
+	".\include\apu.h"\
+	
+
+.\memcache\apr_memcache.c : \
+	".\include\apr_buckets.h"\
+	".\include\apr_memcache.h"\
+	".\include\apr_reslist.h"\
+	".\include\apu.h"\
+	
+
+.\misc\apr_date.c : \
+	".\include\apr_date.h"\
+	".\include\apu.h"\
+	
+
+.\misc\apr_queue.c : \
+	".\include\apr_queue.h"\
+	".\include\apu.h"\
+	
+
+.\misc\apr_reslist.c : \
+	".\include\apr_reslist.h"\
+	".\include\apu.h"\
+	
+
+.\misc\apr_rmm.c : \
+	".\include\apr_anylock.h"\
+	".\include\apr_rmm.h"\
+	".\include\apu.h"\
+	
+
+.\misc\apr_thread_pool.c : \
+	".\include\apr_thread_pool.h"\
+	".\include\apu.h"\
+	
+
+.\misc\apu_dso.c : \
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	".\include\private\apu_config.h"\
+	".\include\private\apu_internal.h"\
+	
+
+.\misc\apu_version.c : \
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	
+
+.\dbm\sdbm\sdbm.c : \
+	".\dbm\sdbm\sdbm_pair.h"\
+	".\dbm\sdbm\sdbm_private.h"\
+	".\dbm\sdbm\sdbm_tune.h"\
+	".\include\apr_sdbm.h"\
+	".\include\apu.h"\
+	
+
+.\dbm\sdbm\sdbm_hash.c : \
+	".\dbm\sdbm\sdbm_private.h"\
+	".\include\apr_sdbm.h"\
+	".\include\apu.h"\
+	
+
+.\dbm\sdbm\sdbm_lock.c : \
+	".\dbm\sdbm\sdbm_private.h"\
+	".\dbm\sdbm\sdbm_tune.h"\
+	".\include\apr_sdbm.h"\
+	".\include\apu.h"\
+	
+
+.\dbm\sdbm\sdbm_pair.c : \
+	".\dbm\sdbm\sdbm_pair.h"\
+	".\dbm\sdbm\sdbm_private.h"\
+	".\dbm\sdbm\sdbm_tune.h"\
+	".\include\apr_sdbm.h"\
+	".\include\apu.h"\
+	
+
+.\strmatch\apr_strmatch.c : \
+	".\include\apr_strmatch.h"\
+	".\include\apu.h"\
+	
+
+.\uri\apr_uri.c : \
+	".\include\apr_uri.h"\
+	".\include\apu.h"\
+	
+
+.\xlate\xlate.c : \
+	".\include\apr_xlate.h"\
+	".\include\apu.h"\
+	".\include\private\apu_config.h"\
+	
+
+.\xml\apr_xml.c : \
+	".\include\apr_xlate.h"\
+	".\include\apr_xml.h"\
+	".\include\apu.h"\
+	".\include\private\apu_config.h"\
+	
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+!ENDIF 
+
+.\libaprutil.rc : \
+	".\include\apu.h"\
+	".\include\apu_version.h"\
+	
diff --git a/libaprutil.dsp b/libaprutil.dsp
index 8144e46..aff3431 100644
--- a/libaprutil.dsp
+++ b/libaprutil.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Release\libaprutil-1.dll" /pdb:"Release\libaprutil-1.pdb" /implib:"Release\libaprutil-1.lib" /MACHINE:X86 /opt:ref
+# ADD LINK32 $(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Release\libaprutil-1.dll" /pdb:"Release\libaprutil-1.pdb" /implib:"Release\libaprutil-1.lib" /MACHINE:X86 /opt:ref
 # Begin Special Build Tool
 TargetPath=Release\libaprutil-1.dll
 SOURCE="$(InputPath)"
@@ -77,7 +77,7 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -87,7 +87,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\libaprutil-1.dll" /pdb:"Debug\libaprutil-1.pdb" /implib:"Debug\libaprutil-1.lib" /MACHINE:X86
+# ADD LINK32 $(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\libaprutil-1.dll" /pdb:"Debug\libaprutil-1.pdb" /implib:"Debug\libaprutil-1.lib" /MACHINE:X86
 # Begin Special Build Tool
 TargetPath=Debug\libaprutil-1.dll
 SOURCE="$(InputPath)"
@@ -109,7 +109,7 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -119,7 +119,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\libaprutil-1.dll" /pdb:"x64\Release\libaprutil-1.pdb" /implib:"x64\Release\libaprutil-1.lib" /MACHINE:X64 /opt:ref
+# ADD LINK32 $(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\libaprutil-1.dll" /pdb:"x64\Release\libaprutil-1.pdb" /implib:"x64\Release\libaprutil-1.lib" /MACHINE:X64 /opt:ref
 # Begin Special Build Tool
 TargetPath=x64\Release\libaprutil-1.dll
 SOURCE="$(InputPath)"
@@ -141,7 +141,7 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -151,7 +151,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\libaprutil-1.dll" /pdb:"x64\Debug\libaprutil-1.pdb" /implib:"x64\Debug\libaprutil-1.lib" /MACHINE:X64
+# ADD LINK32 $(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\libaprutil-1.dll" /pdb:"x64\Debug\libaprutil-1.pdb" /implib:"x64\Debug\libaprutil-1.lib" /MACHINE:X64
 # Begin Special Build Tool
 TargetPath=x64\Debug\libaprutil-1.dll
 SOURCE="$(InputPath)"
diff --git a/libaprutil.mak b/libaprutil.mak
index c6d7278..f00d14a 100644
--- a/libaprutil.mak
+++ b/libaprutil.mak
@@ -1,1526 +1,1472 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on libaprutil.dsp
-!IF "$(CFG)" == ""
-CFG=libaprutil - Win32 Release
-!MESSAGE No configuration specified. Defaulting to libaprutil - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "libaprutil - Win32 Release" && "$(CFG)" != "libaprutil - Win32 Debug" && "$(CFG)" != "libaprutil - x64 Release" && "$(CFG)" != "libaprutil - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libaprutil.mak" CFG="libaprutil - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libaprutil - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libaprutil - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libaprutil - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libaprutil - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF "$(_HAVE_OSSL110)" == "1"
-SSLINC=/I ../openssl/include
-!ELSE 
-SSLINC=/I ../openssl/inc32
-!ENDIF 
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : ".\include\apu_want.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "xml - Win32 Release" "libapriconv - Win32 Release" "libapr - Win32 Release" ".\include\apu_want.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libapriconv - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_base64.obj"
-	- at erase "$(INTDIR)\apr_brigade.obj"
-	- at erase "$(INTDIR)\apr_buckets.obj"
-	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
-	- at erase "$(INTDIR)\apr_buckets_eos.obj"
-	- at erase "$(INTDIR)\apr_buckets_file.obj"
-	- at erase "$(INTDIR)\apr_buckets_flush.obj"
-	- at erase "$(INTDIR)\apr_buckets_heap.obj"
-	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
-	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
-	- at erase "$(INTDIR)\apr_buckets_pool.obj"
-	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
-	- at erase "$(INTDIR)\apr_buckets_simple.obj"
-	- at erase "$(INTDIR)\apr_buckets_socket.obj"
-	- at erase "$(INTDIR)\apr_crypto.obj"
-	- at erase "$(INTDIR)\apr_date.obj"
-	- at erase "$(INTDIR)\apr_dbd.obj"
-	- at erase "$(INTDIR)\apr_dbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
-	- at erase "$(INTDIR)\apr_hooks.obj"
-	- at erase "$(INTDIR)\apr_ldap_stub.obj"
-	- at erase "$(INTDIR)\apr_ldap_url.obj"
-	- at erase "$(INTDIR)\apr_md4.obj"
-	- at erase "$(INTDIR)\apr_md5.obj"
-	- at erase "$(INTDIR)\apr_memcache.obj"
-	- at erase "$(INTDIR)\apr_passwd.obj"
-	- at erase "$(INTDIR)\apr_queue.obj"
-	- at erase "$(INTDIR)\apr_redis.obj"
-	- at erase "$(INTDIR)\apr_reslist.obj"
-	- at erase "$(INTDIR)\apr_rmm.obj"
-	- at erase "$(INTDIR)\apr_sha1.obj"
-	- at erase "$(INTDIR)\apr_siphash.obj"
-	- at erase "$(INTDIR)\apr_strmatch.obj"
-	- at erase "$(INTDIR)\apr_thread_pool.obj"
-	- at erase "$(INTDIR)\apr_uri.obj"
-	- at erase "$(INTDIR)\apr_xml.obj"
-	- at erase "$(INTDIR)\apu_dso.obj"
-	- at erase "$(INTDIR)\apu_version.obj"
-	- at erase "$(INTDIR)\crypt_blowfish.obj"
-	- at erase "$(INTDIR)\getuuid.obj"
-	- at erase "$(INTDIR)\libaprutil.res"
-	- at erase "$(INTDIR)\libaprutil_src.idb"
-	- at erase "$(INTDIR)\libaprutil_src.pdb"
-	- at erase "$(INTDIR)\sdbm.obj"
-	- at erase "$(INTDIR)\sdbm_hash.obj"
-	- at erase "$(INTDIR)\sdbm_lock.obj"
-	- at erase "$(INTDIR)\sdbm_pair.obj"
-	- at erase "$(INTDIR)\uuid.obj"
-	- at erase "$(INTDIR)\xlate.obj"
-	- at erase "$(OUTDIR)\libaprutil-1.dll"
-	- at erase "$(OUTDIR)\libaprutil-1.exp"
-	- at erase "$(OUTDIR)\libaprutil-1.lib"
-	- at erase "$(OUTDIR)\libaprutil-1.pdb"
-	- at erase ".\include\apu_want.h"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libaprutil.res" /i "./include" /i "../apr/include" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libaprutil.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib"  /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_brigade.obj" \
-	"$(INTDIR)\apr_buckets.obj" \
-	"$(INTDIR)\apr_buckets_alloc.obj" \
-	"$(INTDIR)\apr_buckets_eos.obj" \
-	"$(INTDIR)\apr_buckets_file.obj" \
-	"$(INTDIR)\apr_buckets_flush.obj" \
-	"$(INTDIR)\apr_buckets_heap.obj" \
-	"$(INTDIR)\apr_buckets_mmap.obj" \
-	"$(INTDIR)\apr_buckets_pipe.obj" \
-	"$(INTDIR)\apr_buckets_pool.obj" \
-	"$(INTDIR)\apr_buckets_refcount.obj" \
-	"$(INTDIR)\apr_buckets_simple.obj" \
-	"$(INTDIR)\apr_buckets_socket.obj" \
-	"$(INTDIR)\apr_crypto.obj" \
-	"$(INTDIR)\apr_md4.obj" \
-	"$(INTDIR)\apr_md5.obj" \
-	"$(INTDIR)\apr_passwd.obj" \
-	"$(INTDIR)\apr_sha1.obj" \
-	"$(INTDIR)\apr_siphash.obj" \
-	"$(INTDIR)\crypt_blowfish.obj" \
-	"$(INTDIR)\getuuid.obj" \
-	"$(INTDIR)\uuid.obj" \
-	"$(INTDIR)\apr_dbd.obj" \
-	"$(INTDIR)\apr_dbm.obj" \
-	"$(INTDIR)\apr_dbm_sdbm.obj" \
-	"$(INTDIR)\apr_base64.obj" \
-	"$(INTDIR)\apr_hooks.obj" \
-	"$(INTDIR)\apr_ldap_stub.obj" \
-	"$(INTDIR)\apr_ldap_url.obj" \
-	"$(INTDIR)\apr_memcache.obj" \
-	"$(INTDIR)\apr_date.obj" \
-	"$(INTDIR)\apu_dso.obj" \
-	"$(INTDIR)\apr_queue.obj" \
-	"$(INTDIR)\apr_redis.obj" \
-	"$(INTDIR)\apr_reslist.obj" \
-	"$(INTDIR)\apr_rmm.obj" \
-	"$(INTDIR)\apr_thread_pool.obj" \
-	"$(INTDIR)\apu_version.obj" \
-	"$(INTDIR)\sdbm.obj" \
-	"$(INTDIR)\sdbm_hash.obj" \
-	"$(INTDIR)\sdbm_lock.obj" \
-	"$(INTDIR)\sdbm_pair.obj" \
-	"$(INTDIR)\apr_strmatch.obj" \
-	"$(INTDIR)\apr_uri.obj" \
-	"$(INTDIR)\xlate.obj" \
-	"$(INTDIR)\apr_xml.obj" \
-	"$(INTDIR)\libaprutil.res" \
-	"..\apr\Release\libapr-1.lib" \
-	"..\apr-iconv\Release\libapriconv-1.lib" \
-	".\xml\LibR\xml.lib"
-
-"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\libaprutil-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libaprutil-1.dll"
-   if exist .\Release\libaprutil-1.dll.manifest mt.exe -manifest .\Release\libaprutil-1.dll.manifest -outputresource:.\Release\libaprutil-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "xml - Win32 Debug" "libapriconv - Win32 Debug" "libapr - Win32 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libapriconv - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_base64.obj"
-	- at erase "$(INTDIR)\apr_brigade.obj"
-	- at erase "$(INTDIR)\apr_buckets.obj"
-	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
-	- at erase "$(INTDIR)\apr_buckets_eos.obj"
-	- at erase "$(INTDIR)\apr_buckets_file.obj"
-	- at erase "$(INTDIR)\apr_buckets_flush.obj"
-	- at erase "$(INTDIR)\apr_buckets_heap.obj"
-	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
-	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
-	- at erase "$(INTDIR)\apr_buckets_pool.obj"
-	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
-	- at erase "$(INTDIR)\apr_buckets_simple.obj"
-	- at erase "$(INTDIR)\apr_buckets_socket.obj"
-	- at erase "$(INTDIR)\apr_crypto.obj"
-	- at erase "$(INTDIR)\apr_date.obj"
-	- at erase "$(INTDIR)\apr_dbd.obj"
-	- at erase "$(INTDIR)\apr_dbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
-	- at erase "$(INTDIR)\apr_hooks.obj"
-	- at erase "$(INTDIR)\apr_ldap_stub.obj"
-	- at erase "$(INTDIR)\apr_ldap_url.obj"
-	- at erase "$(INTDIR)\apr_md4.obj"
-	- at erase "$(INTDIR)\apr_md5.obj"
-	- at erase "$(INTDIR)\apr_memcache.obj"
-	- at erase "$(INTDIR)\apr_passwd.obj"
-	- at erase "$(INTDIR)\apr_queue.obj"
-	- at erase "$(INTDIR)\apr_redis.obj"
-	- at erase "$(INTDIR)\apr_reslist.obj"
-	- at erase "$(INTDIR)\apr_rmm.obj"
-	- at erase "$(INTDIR)\apr_sha1.obj"
-	- at erase "$(INTDIR)\apr_siphash.obj"
-	- at erase "$(INTDIR)\apr_strmatch.obj"
-	- at erase "$(INTDIR)\apr_thread_pool.obj"
-	- at erase "$(INTDIR)\apr_uri.obj"
-	- at erase "$(INTDIR)\apr_xml.obj"
-	- at erase "$(INTDIR)\apu_dso.obj"
-	- at erase "$(INTDIR)\apu_version.obj"
-	- at erase "$(INTDIR)\crypt_blowfish.obj"
-	- at erase "$(INTDIR)\getuuid.obj"
-	- at erase "$(INTDIR)\libaprutil.res"
-	- at erase "$(INTDIR)\libaprutil_src.idb"
-	- at erase "$(INTDIR)\libaprutil_src.pdb"
-	- at erase "$(INTDIR)\sdbm.obj"
-	- at erase "$(INTDIR)\sdbm_hash.obj"
-	- at erase "$(INTDIR)\sdbm_lock.obj"
-	- at erase "$(INTDIR)\sdbm_pair.obj"
-	- at erase "$(INTDIR)\uuid.obj"
-	- at erase "$(INTDIR)\xlate.obj"
-	- at erase "$(OUTDIR)\libaprutil-1.dll"
-	- at erase "$(OUTDIR)\libaprutil-1.exp"
-	- at erase "$(OUTDIR)\libaprutil-1.lib"
-	- at erase "$(OUTDIR)\libaprutil-1.pdb"
-	- at erase ".\include\apr_ldap.h"
-	- at erase ".\include\apu.h"
-	- at erase ".\include\apu_want.h"
-	- at erase ".\include\private\apu_config.h"
-	- at erase ".\include\private\apu_select_dbm.h"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libaprutil.res" /i "./include" /i "../apr/include" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libaprutil.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib"  
-LINK32_OBJS= \
-	"$(INTDIR)\apr_brigade.obj" \
-	"$(INTDIR)\apr_buckets.obj" \
-	"$(INTDIR)\apr_buckets_alloc.obj" \
-	"$(INTDIR)\apr_buckets_eos.obj" \
-	"$(INTDIR)\apr_buckets_file.obj" \
-	"$(INTDIR)\apr_buckets_flush.obj" \
-	"$(INTDIR)\apr_buckets_heap.obj" \
-	"$(INTDIR)\apr_buckets_mmap.obj" \
-	"$(INTDIR)\apr_buckets_pipe.obj" \
-	"$(INTDIR)\apr_buckets_pool.obj" \
-	"$(INTDIR)\apr_buckets_refcount.obj" \
-	"$(INTDIR)\apr_buckets_simple.obj" \
-	"$(INTDIR)\apr_buckets_socket.obj" \
-	"$(INTDIR)\apr_crypto.obj" \
-	"$(INTDIR)\apr_md4.obj" \
-	"$(INTDIR)\apr_md5.obj" \
-	"$(INTDIR)\apr_passwd.obj" \
-	"$(INTDIR)\apr_sha1.obj" \
-	"$(INTDIR)\apr_siphash.obj" \
-	"$(INTDIR)\crypt_blowfish.obj" \
-	"$(INTDIR)\getuuid.obj" \
-	"$(INTDIR)\uuid.obj" \
-	"$(INTDIR)\apr_dbd.obj" \
-	"$(INTDIR)\apr_dbm.obj" \
-	"$(INTDIR)\apr_dbm_sdbm.obj" \
-	"$(INTDIR)\apr_base64.obj" \
-	"$(INTDIR)\apr_hooks.obj" \
-	"$(INTDIR)\apr_ldap_stub.obj" \
-	"$(INTDIR)\apr_ldap_url.obj" \
-	"$(INTDIR)\apr_memcache.obj" \
-	"$(INTDIR)\apr_date.obj" \
-	"$(INTDIR)\apu_dso.obj" \
-	"$(INTDIR)\apr_queue.obj" \
-	"$(INTDIR)\apr_redis.obj" \
-	"$(INTDIR)\apr_reslist.obj" \
-	"$(INTDIR)\apr_rmm.obj" \
-	"$(INTDIR)\apr_thread_pool.obj" \
-	"$(INTDIR)\apu_version.obj" \
-	"$(INTDIR)\sdbm.obj" \
-	"$(INTDIR)\sdbm_hash.obj" \
-	"$(INTDIR)\sdbm_lock.obj" \
-	"$(INTDIR)\sdbm_pair.obj" \
-	"$(INTDIR)\apr_strmatch.obj" \
-	"$(INTDIR)\apr_uri.obj" \
-	"$(INTDIR)\xlate.obj" \
-	"$(INTDIR)\apr_xml.obj" \
-	"$(INTDIR)\libaprutil.res" \
-	"..\apr\Debug\libapr-1.lib" \
-	"..\apr-iconv\Debug\libapriconv-1.lib" \
-	".\xml\LibD\xml.lib"
-
-"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\libaprutil-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libaprutil-1.dll"
-   if exist .\Debug\libaprutil-1.dll.manifest mt.exe -manifest .\Debug\libaprutil-1.dll.manifest -outputresource:.\Debug\libaprutil-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "xml - x64 Release" "libapriconv - x64 Release" "libapr - x64 Release" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libapriconv - x64 ReleaseCLEAN" "xml - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_base64.obj"
-	- at erase "$(INTDIR)\apr_brigade.obj"
-	- at erase "$(INTDIR)\apr_buckets.obj"
-	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
-	- at erase "$(INTDIR)\apr_buckets_eos.obj"
-	- at erase "$(INTDIR)\apr_buckets_file.obj"
-	- at erase "$(INTDIR)\apr_buckets_flush.obj"
-	- at erase "$(INTDIR)\apr_buckets_heap.obj"
-	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
-	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
-	- at erase "$(INTDIR)\apr_buckets_pool.obj"
-	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
-	- at erase "$(INTDIR)\apr_buckets_simple.obj"
-	- at erase "$(INTDIR)\apr_buckets_socket.obj"
-	- at erase "$(INTDIR)\apr_crypto.obj"
-	- at erase "$(INTDIR)\apr_date.obj"
-	- at erase "$(INTDIR)\apr_dbd.obj"
-	- at erase "$(INTDIR)\apr_dbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
-	- at erase "$(INTDIR)\apr_hooks.obj"
-	- at erase "$(INTDIR)\apr_ldap_stub.obj"
-	- at erase "$(INTDIR)\apr_ldap_url.obj"
-	- at erase "$(INTDIR)\apr_md4.obj"
-	- at erase "$(INTDIR)\apr_md5.obj"
-	- at erase "$(INTDIR)\apr_memcache.obj"
-	- at erase "$(INTDIR)\apr_passwd.obj"
-	- at erase "$(INTDIR)\apr_queue.obj"
-	- at erase "$(INTDIR)\apr_redis.obj"
-	- at erase "$(INTDIR)\apr_reslist.obj"
-	- at erase "$(INTDIR)\apr_rmm.obj"
-	- at erase "$(INTDIR)\apr_sha1.obj"
-	- at erase "$(INTDIR)\apr_siphash.obj"
-	- at erase "$(INTDIR)\apr_strmatch.obj"
-	- at erase "$(INTDIR)\apr_thread_pool.obj"
-	- at erase "$(INTDIR)\apr_uri.obj"
-	- at erase "$(INTDIR)\apr_xml.obj"
-	- at erase "$(INTDIR)\apu_dso.obj"
-	- at erase "$(INTDIR)\apu_version.obj"
-	- at erase "$(INTDIR)\crypt_blowfish.obj"
-	- at erase "$(INTDIR)\getuuid.obj"
-	- at erase "$(INTDIR)\libaprutil.res"
-	- at erase "$(INTDIR)\libaprutil_src.idb"
-	- at erase "$(INTDIR)\libaprutil_src.pdb"
-	- at erase "$(INTDIR)\sdbm.obj"
-	- at erase "$(INTDIR)\sdbm_hash.obj"
-	- at erase "$(INTDIR)\sdbm_lock.obj"
-	- at erase "$(INTDIR)\sdbm_pair.obj"
-	- at erase "$(INTDIR)\uuid.obj"
-	- at erase "$(INTDIR)\xlate.obj"
-	- at erase "$(OUTDIR)\libaprutil-1.dll"
-	- at erase "$(OUTDIR)\libaprutil-1.exp"
-	- at erase "$(OUTDIR)\libaprutil-1.lib"
-	- at erase "$(OUTDIR)\libaprutil-1.pdb"
-	- at erase ".\include\apr_ldap.h"
-	- at erase ".\include\apu.h"
-	- at erase ".\include\apu_want.h"
-	- at erase ".\include\private\apu_config.h"
-	- at erase ".\include\private\apu_select_dbm.h"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libaprutil.res" /i "./include" /i "../apr/include" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libaprutil.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib"  /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_brigade.obj" \
-	"$(INTDIR)\apr_buckets.obj" \
-	"$(INTDIR)\apr_buckets_alloc.obj" \
-	"$(INTDIR)\apr_buckets_eos.obj" \
-	"$(INTDIR)\apr_buckets_file.obj" \
-	"$(INTDIR)\apr_buckets_flush.obj" \
-	"$(INTDIR)\apr_buckets_heap.obj" \
-	"$(INTDIR)\apr_buckets_mmap.obj" \
-	"$(INTDIR)\apr_buckets_pipe.obj" \
-	"$(INTDIR)\apr_buckets_pool.obj" \
-	"$(INTDIR)\apr_buckets_refcount.obj" \
-	"$(INTDIR)\apr_buckets_simple.obj" \
-	"$(INTDIR)\apr_buckets_socket.obj" \
-	"$(INTDIR)\apr_crypto.obj" \
-	"$(INTDIR)\apr_md4.obj" \
-	"$(INTDIR)\apr_md5.obj" \
-	"$(INTDIR)\apr_passwd.obj" \
-	"$(INTDIR)\apr_sha1.obj" \
-	"$(INTDIR)\apr_siphash.obj" \
-	"$(INTDIR)\crypt_blowfish.obj" \
-	"$(INTDIR)\getuuid.obj" \
-	"$(INTDIR)\uuid.obj" \
-	"$(INTDIR)\apr_dbd.obj" \
-	"$(INTDIR)\apr_dbm.obj" \
-	"$(INTDIR)\apr_dbm_sdbm.obj" \
-	"$(INTDIR)\apr_base64.obj" \
-	"$(INTDIR)\apr_hooks.obj" \
-	"$(INTDIR)\apr_ldap_stub.obj" \
-	"$(INTDIR)\apr_ldap_url.obj" \
-	"$(INTDIR)\apr_memcache.obj" \
-	"$(INTDIR)\apr_date.obj" \
-	"$(INTDIR)\apu_dso.obj" \
-	"$(INTDIR)\apr_queue.obj" \
-	"$(INTDIR)\apr_redis.obj" \
-	"$(INTDIR)\apr_reslist.obj" \
-	"$(INTDIR)\apr_rmm.obj" \
-	"$(INTDIR)\apr_thread_pool.obj" \
-	"$(INTDIR)\apu_version.obj" \
-	"$(INTDIR)\sdbm.obj" \
-	"$(INTDIR)\sdbm_hash.obj" \
-	"$(INTDIR)\sdbm_lock.obj" \
-	"$(INTDIR)\sdbm_pair.obj" \
-	"$(INTDIR)\apr_strmatch.obj" \
-	"$(INTDIR)\apr_uri.obj" \
-	"$(INTDIR)\xlate.obj" \
-	"$(INTDIR)\apr_xml.obj" \
-	"$(INTDIR)\libaprutil.res" \
-	"..\apr\x64\Release\libapr-1.lib" \
-	"..\apr-iconv\x64\Release\libapriconv-1.lib" \
-	".\xml\x64\LibR\xml.lib"
-
-"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\libaprutil-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libaprutil-1.dll"
-   if exist .\x64\Release\libaprutil-1.dll.manifest mt.exe -manifest .\x64\Release\libaprutil-1.dll.manifest -outputresource:.\x64\Release\libaprutil-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "xml - x64 Debug" "libapriconv - x64 Debug" "libapr - x64 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libapriconv - x64 DebugCLEAN" "xml - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	- at erase "$(INTDIR)\apr_base64.obj"
-	- at erase "$(INTDIR)\apr_brigade.obj"
-	- at erase "$(INTDIR)\apr_buckets.obj"
-	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
-	- at erase "$(INTDIR)\apr_buckets_eos.obj"
-	- at erase "$(INTDIR)\apr_buckets_file.obj"
-	- at erase "$(INTDIR)\apr_buckets_flush.obj"
-	- at erase "$(INTDIR)\apr_buckets_heap.obj"
-	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
-	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
-	- at erase "$(INTDIR)\apr_buckets_pool.obj"
-	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
-	- at erase "$(INTDIR)\apr_buckets_simple.obj"
-	- at erase "$(INTDIR)\apr_buckets_socket.obj"
-	- at erase "$(INTDIR)\apr_crypto.obj"
-	- at erase "$(INTDIR)\apr_date.obj"
-	- at erase "$(INTDIR)\apr_dbd.obj"
-	- at erase "$(INTDIR)\apr_dbm.obj"
-	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
-	- at erase "$(INTDIR)\apr_hooks.obj"
-	- at erase "$(INTDIR)\apr_ldap_stub.obj"
-	- at erase "$(INTDIR)\apr_ldap_url.obj"
-	- at erase "$(INTDIR)\apr_md4.obj"
-	- at erase "$(INTDIR)\apr_md5.obj"
-	- at erase "$(INTDIR)\apr_memcache.obj"
-	- at erase "$(INTDIR)\apr_passwd.obj"
-	- at erase "$(INTDIR)\apr_queue.obj"
-	- at erase "$(INTDIR)\apr_redis.obj"
-	- at erase "$(INTDIR)\apr_reslist.obj"
-	- at erase "$(INTDIR)\apr_rmm.obj"
-	- at erase "$(INTDIR)\apr_sha1.obj"
-	- at erase "$(INTDIR)\apr_siphash.obj"
-	- at erase "$(INTDIR)\apr_strmatch.obj"
-	- at erase "$(INTDIR)\apr_thread_pool.obj"
-	- at erase "$(INTDIR)\apr_uri.obj"
-	- at erase "$(INTDIR)\apr_xml.obj"
-	- at erase "$(INTDIR)\apu_dso.obj"
-	- at erase "$(INTDIR)\apu_version.obj"
-	- at erase "$(INTDIR)\crypt_blowfish.obj"
-	- at erase "$(INTDIR)\getuuid.obj"
-	- at erase "$(INTDIR)\libaprutil.res"
-	- at erase "$(INTDIR)\libaprutil_src.idb"
-	- at erase "$(INTDIR)\libaprutil_src.pdb"
-	- at erase "$(INTDIR)\sdbm.obj"
-	- at erase "$(INTDIR)\sdbm_hash.obj"
-	- at erase "$(INTDIR)\sdbm_lock.obj"
-	- at erase "$(INTDIR)\sdbm_pair.obj"
-	- at erase "$(INTDIR)\uuid.obj"
-	- at erase "$(INTDIR)\xlate.obj"
-	- at erase "$(OUTDIR)\libaprutil-1.dll"
-	- at erase "$(OUTDIR)\libaprutil-1.exp"
-	- at erase "$(OUTDIR)\libaprutil-1.lib"
-	- at erase "$(OUTDIR)\libaprutil-1.pdb"
-	- at erase ".\include\apr_ldap.h"
-	- at erase ".\include\apu.h"
-	- at erase ".\include\apu_want.h"
-	- at erase ".\include\private\apu_config.h"
-	- at erase ".\include\private\apu_select_dbm.h"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libaprutil.res" /i "./include" /i "../apr/include" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libaprutil.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib"  
-LINK32_OBJS= \
-	"$(INTDIR)\apr_brigade.obj" \
-	"$(INTDIR)\apr_buckets.obj" \
-	"$(INTDIR)\apr_buckets_alloc.obj" \
-	"$(INTDIR)\apr_buckets_eos.obj" \
-	"$(INTDIR)\apr_buckets_file.obj" \
-	"$(INTDIR)\apr_buckets_flush.obj" \
-	"$(INTDIR)\apr_buckets_heap.obj" \
-	"$(INTDIR)\apr_buckets_mmap.obj" \
-	"$(INTDIR)\apr_buckets_pipe.obj" \
-	"$(INTDIR)\apr_buckets_pool.obj" \
-	"$(INTDIR)\apr_buckets_refcount.obj" \
-	"$(INTDIR)\apr_buckets_simple.obj" \
-	"$(INTDIR)\apr_buckets_socket.obj" \
-	"$(INTDIR)\apr_crypto.obj" \
-	"$(INTDIR)\apr_md4.obj" \
-	"$(INTDIR)\apr_md5.obj" \
-	"$(INTDIR)\apr_passwd.obj" \
-	"$(INTDIR)\apr_sha1.obj" \
-	"$(INTDIR)\apr_siphash.obj" \
-	"$(INTDIR)\crypt_blowfish.obj" \
-	"$(INTDIR)\getuuid.obj" \
-	"$(INTDIR)\uuid.obj" \
-	"$(INTDIR)\apr_dbd.obj" \
-	"$(INTDIR)\apr_dbm.obj" \
-	"$(INTDIR)\apr_dbm_sdbm.obj" \
-	"$(INTDIR)\apr_base64.obj" \
-	"$(INTDIR)\apr_hooks.obj" \
-	"$(INTDIR)\apr_ldap_stub.obj" \
-	"$(INTDIR)\apr_ldap_url.obj" \
-	"$(INTDIR)\apr_memcache.obj" \
-	"$(INTDIR)\apr_date.obj" \
-	"$(INTDIR)\apu_dso.obj" \
-	"$(INTDIR)\apr_queue.obj" \
-	"$(INTDIR)\apr_redis.obj" \
-	"$(INTDIR)\apr_reslist.obj" \
-	"$(INTDIR)\apr_rmm.obj" \
-	"$(INTDIR)\apr_thread_pool.obj" \
-	"$(INTDIR)\apu_version.obj" \
-	"$(INTDIR)\sdbm.obj" \
-	"$(INTDIR)\sdbm_hash.obj" \
-	"$(INTDIR)\sdbm_lock.obj" \
-	"$(INTDIR)\sdbm_pair.obj" \
-	"$(INTDIR)\apr_strmatch.obj" \
-	"$(INTDIR)\apr_uri.obj" \
-	"$(INTDIR)\xlate.obj" \
-	"$(INTDIR)\apr_xml.obj" \
-	"$(INTDIR)\libaprutil.res" \
-	"..\apr\x64\Debug\libapr-1.lib" \
-	"..\apr-iconv\x64\Debug\libapriconv-1.lib" \
-	".\xml\x64\LibD\xml.lib"
-
-"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\libaprutil-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libaprutil-1.dll"
-   if exist .\x64\Debug\libaprutil-1.dll.manifest mt.exe -manifest .\x64\Debug\libaprutil-1.dll.manifest -outputresource:.\x64\Debug\libaprutil-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("libaprutil.dep")
-!INCLUDE "libaprutil.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "libaprutil.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "libaprutil - Win32 Release" || "$(CFG)" == "libaprutil - Win32 Debug" || "$(CFG)" == "libaprutil - x64 Release" || "$(CFG)" == "libaprutil - x64 Debug"
-SOURCE=.\buckets\apr_brigade.c
-
-"$(INTDIR)\apr_brigade.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets.c
-
-"$(INTDIR)\apr_buckets.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_alloc.c
-
-"$(INTDIR)\apr_buckets_alloc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_eos.c
-
-"$(INTDIR)\apr_buckets_eos.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_file.c
-
-"$(INTDIR)\apr_buckets_file.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_flush.c
-
-"$(INTDIR)\apr_buckets_flush.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_heap.c
-
-"$(INTDIR)\apr_buckets_heap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_mmap.c
-
-"$(INTDIR)\apr_buckets_mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_pipe.c
-
-"$(INTDIR)\apr_buckets_pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_pool.c
-
-"$(INTDIR)\apr_buckets_pool.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_refcount.c
-
-"$(INTDIR)\apr_buckets_refcount.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_simple.c
-
-"$(INTDIR)\apr_buckets_simple.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\buckets\apr_buckets_socket.c
-
-"$(INTDIR)\apr_buckets_socket.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\apr_crypto.c
-
-"$(INTDIR)\apr_crypto.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\apr_md4.c
-
-"$(INTDIR)\apr_md4.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\apr_md5.c
-
-"$(INTDIR)\apr_md5.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\apr_passwd.c
-
-"$(INTDIR)\apr_passwd.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\apr_sha1.c
-
-"$(INTDIR)\apr_sha1.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\apr_siphash.c
-
-"$(INTDIR)\apr_siphash.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\crypt_blowfish.c
-
-"$(INTDIR)\crypt_blowfish.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\getuuid.c
-
-"$(INTDIR)\getuuid.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\crypto\uuid.c
-
-"$(INTDIR)\uuid.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbd\apr_dbd.c
-
-"$(INTDIR)\apr_dbd.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbd\apr_dbd_mysql.c
-SOURCE=.\dbd\apr_dbd_odbc.c
-SOURCE=.\dbd\apr_dbd_oracle.c
-SOURCE=.\dbd\apr_dbd_pgsql.c
-SOURCE=.\dbd\apr_dbd_sqlite2.c
-SOURCE=.\dbd\apr_dbd_sqlite3.c
-SOURCE=.\dbm\apr_dbm.c
-
-"$(INTDIR)\apr_dbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\apr_dbm_berkeleydb.c
-SOURCE=.\dbm\apr_dbm_gdbm.c
-SOURCE=.\dbm\apr_dbm_sdbm.c
-
-"$(INTDIR)\apr_dbm_sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\encoding\apr_base64.c
-
-"$(INTDIR)\apr_base64.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\hooks\apr_hooks.c
-
-"$(INTDIR)\apr_hooks.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\ldap\apr_ldap_init.c
-SOURCE=.\ldap\apr_ldap_option.c
-SOURCE=.\ldap\apr_ldap_rebind.c
-SOURCE=.\ldap\apr_ldap_stub.c
-
-"$(INTDIR)\apr_ldap_stub.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\ldap\apr_ldap_url.c
-
-"$(INTDIR)\apr_ldap_url.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\apr_ldap.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\memcache\apr_memcache.c
-
-"$(INTDIR)\apr_memcache.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apr_date.c
-
-"$(INTDIR)\apr_date.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apr_queue.c
-
-"$(INTDIR)\apr_queue.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apr_reslist.c
-
-"$(INTDIR)\apr_reslist.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apr_rmm.c
-
-"$(INTDIR)\apr_rmm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apr_thread_pool.c
-
-"$(INTDIR)\apr_thread_pool.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apu_dso.c
-
-"$(INTDIR)\apu_dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\apu_version.c
-
-"$(INTDIR)\apu_version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\redis\apr_redis.c
-
-"$(INTDIR)\apr_redis.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_redis.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\sdbm\sdbm.c
-
-"$(INTDIR)\sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\sdbm\sdbm_hash.c
-
-"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\sdbm\sdbm_lock.c
-
-"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dbm\sdbm\sdbm_pair.c
-
-"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\strmatch\apr_strmatch.c
-
-"$(INTDIR)\apr_strmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\uri\apr_uri.c
-
-"$(INTDIR)\apr_uri.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\xlate\xlate.c
-
-"$(INTDIR)\xlate.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\xml\apr_xml.c
-
-"$(INTDIR)\apr_xml.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\include\apr_ldap.hw
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr_ldap.hw > .\include\apr_ldap.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr_ldap.hw > .\include\apr_ldap.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr_ldap.hw > .\include\apr_ldap.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-InputPath=.\include\apr_ldap.hw
-
-".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr_ldap.hw > .\include\apr_ldap.h
-<< 
-	
-
-!ENDIF 
-
-SOURCE=.\include\apu.hw
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-InputPath=.\include\apu.hw
-
-".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu.hw > .\include\apu.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-InputPath=.\include\apu.hw
-
-".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu.hw > .\include\apu.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-InputPath=.\include\apu.hw
-
-".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu.hw > .\include\apu.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-InputPath=.\include\apu.hw
-
-".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu.hw > .\include\apu.h
-<< 
-	
-
-!ENDIF 
-
-SOURCE=.\include\private\apu_config.hw
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-InputPath=.\include\private\apu_config.hw
-
-".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_config.hw > .\include\private\apu_config.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-InputPath=.\include\private\apu_config.hw
-
-".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_config.hw > .\include\private\apu_config.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-InputPath=.\include\private\apu_config.hw
-
-".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_config.hw > .\include\private\apu_config.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-InputPath=.\include\private\apu_config.hw
-
-".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_config.hw > .\include\private\apu_config.h
-<< 
-	
-
-!ENDIF 
-
-SOURCE=.\include\private\apu_select_dbm.hw
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-InputPath=.\include\private\apu_select_dbm.hw
-
-".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-InputPath=.\include\private\apu_select_dbm.hw
-
-".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-InputPath=.\include\private\apu_select_dbm.hw
-
-".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-InputPath=.\include\private\apu_select_dbm.hw
-
-".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
-<< 
-	
-
-!ENDIF 
-
-SOURCE=.\include\apu_want.hw
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-InputPath=.\include\apu_want.hw
-
-".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu_want.hw > .\include\apu_want.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-InputPath=.\include\apu_want.hw
-
-".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu_want.hw > .\include\apu_want.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-InputPath=.\include\apu_want.hw
-
-".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu_want.hw > .\include\apu_want.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-InputPath=.\include\apu_want.hw
-
-".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apu_want.hw > .\include\apu_want.h
-<< 
-	
-
-!ENDIF 
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util"
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-"libapriconv - Win32 Release" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Release" 
-   cd "..\apr-util"
-
-"libapriconv - Win32 ReleaseCLEAN" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util"
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-"libapriconv - Win32 Debug" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Debug" 
-   cd "..\apr-util"
-
-"libapriconv - Win32 DebugCLEAN" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-"libapriconv - x64 Release" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - x64 Release" 
-   cd "..\apr-util"
-
-"libapriconv - x64 ReleaseCLEAN" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util"
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-"libapriconv - x64 Debug" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - x64 Debug" 
-   cd "..\apr-util"
-
-"libapriconv - x64 DebugCLEAN" : 
-   cd ".\..\apr-iconv"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "libaprutil - Win32 Release"
-
-"xml - Win32 Release" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" 
-   cd "..\..\.."
-
-"xml - Win32 ReleaseCLEAN" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\..\.."
-
-!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
-
-"xml - Win32 Debug" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" 
-   cd "..\..\.."
-
-"xml - Win32 DebugCLEAN" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\..\.."
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
-
-"xml - x64 Release" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" 
-   cd "..\..\.."
-
-"xml - x64 ReleaseCLEAN" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" RECURSE=1 CLEAN 
-   cd "..\..\.."
-
-!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
-
-"xml - x64 Debug" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" 
-   cd "..\..\.."
-
-"xml - x64 DebugCLEAN" : 
-   cd ".\xml\expat\lib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\..\.."
-
-!ENDIF 
-
-SOURCE=.\libaprutil.rc
-
-"$(INTDIR)\libaprutil.res" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
-	$(RSC) $(RSC_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on libaprutil.dsp
+!IF "$(CFG)" == ""
+CFG=libaprutil - Win32 Release
+!MESSAGE No configuration specified. Defaulting to libaprutil - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "libaprutil - Win32 Release" && "$(CFG)" != "libaprutil - Win32 Debug" && "$(CFG)" != "libaprutil - x64 Release" && "$(CFG)" != "libaprutil - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libaprutil.mak" CFG="libaprutil - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libaprutil - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libaprutil - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libaprutil - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libaprutil - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF "$(_HAVE_OSSL110)" == "1"
+SSLINC=/I ../openssl/include
+!ELSE 
+SSLINC=/I ../openssl/inc32
+!ENDIF 
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : ".\include\apu_want.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "xml - Win32 Release" "libapriconv - Win32 Release" "libapr - Win32 Release" ".\include\apu_want.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 ReleaseCLEAN" "libapriconv - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_base64.obj"
+	- at erase "$(INTDIR)\apr_brigade.obj"
+	- at erase "$(INTDIR)\apr_buckets.obj"
+	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
+	- at erase "$(INTDIR)\apr_buckets_eos.obj"
+	- at erase "$(INTDIR)\apr_buckets_file.obj"
+	- at erase "$(INTDIR)\apr_buckets_flush.obj"
+	- at erase "$(INTDIR)\apr_buckets_heap.obj"
+	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
+	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
+	- at erase "$(INTDIR)\apr_buckets_pool.obj"
+	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
+	- at erase "$(INTDIR)\apr_buckets_simple.obj"
+	- at erase "$(INTDIR)\apr_buckets_socket.obj"
+	- at erase "$(INTDIR)\apr_crypto.obj"
+	- at erase "$(INTDIR)\apr_date.obj"
+	- at erase "$(INTDIR)\apr_dbd.obj"
+	- at erase "$(INTDIR)\apr_dbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
+	- at erase "$(INTDIR)\apr_hooks.obj"
+	- at erase "$(INTDIR)\apr_ldap_stub.obj"
+	- at erase "$(INTDIR)\apr_ldap_url.obj"
+	- at erase "$(INTDIR)\apr_md4.obj"
+	- at erase "$(INTDIR)\apr_md5.obj"
+	- at erase "$(INTDIR)\apr_memcache.obj"
+	- at erase "$(INTDIR)\apr_passwd.obj"
+	- at erase "$(INTDIR)\apr_queue.obj"
+	- at erase "$(INTDIR)\apr_redis.obj"
+	- at erase "$(INTDIR)\apr_reslist.obj"
+	- at erase "$(INTDIR)\apr_rmm.obj"
+	- at erase "$(INTDIR)\apr_sha1.obj"
+	- at erase "$(INTDIR)\apr_siphash.obj"
+	- at erase "$(INTDIR)\apr_strmatch.obj"
+	- at erase "$(INTDIR)\apr_thread_pool.obj"
+	- at erase "$(INTDIR)\apr_uri.obj"
+	- at erase "$(INTDIR)\apr_xml.obj"
+	- at erase "$(INTDIR)\apu_dso.obj"
+	- at erase "$(INTDIR)\apu_version.obj"
+	- at erase "$(INTDIR)\crypt_blowfish.obj"
+	- at erase "$(INTDIR)\getuuid.obj"
+	- at erase "$(INTDIR)\libaprutil.res"
+	- at erase "$(INTDIR)\libaprutil_src.idb"
+	- at erase "$(INTDIR)\libaprutil_src.pdb"
+	- at erase "$(INTDIR)\sdbm.obj"
+	- at erase "$(INTDIR)\sdbm_hash.obj"
+	- at erase "$(INTDIR)\sdbm_lock.obj"
+	- at erase "$(INTDIR)\sdbm_pair.obj"
+	- at erase "$(INTDIR)\uuid.obj"
+	- at erase "$(INTDIR)\xlate.obj"
+	- at erase "$(OUTDIR)\libaprutil-1.dll"
+	- at erase "$(OUTDIR)\libaprutil-1.exp"
+	- at erase "$(OUTDIR)\libaprutil-1.lib"
+	- at erase "$(OUTDIR)\libaprutil-1.pdb"
+	- at erase ".\include\apu_want.h"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libaprutil.res" /i "./include" /i "../apr/include" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libaprutil.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=$(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib"  /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_brigade.obj" \
+	"$(INTDIR)\apr_buckets.obj" \
+	"$(INTDIR)\apr_buckets_alloc.obj" \
+	"$(INTDIR)\apr_buckets_eos.obj" \
+	"$(INTDIR)\apr_buckets_file.obj" \
+	"$(INTDIR)\apr_buckets_flush.obj" \
+	"$(INTDIR)\apr_buckets_heap.obj" \
+	"$(INTDIR)\apr_buckets_mmap.obj" \
+	"$(INTDIR)\apr_buckets_pipe.obj" \
+	"$(INTDIR)\apr_buckets_pool.obj" \
+	"$(INTDIR)\apr_buckets_refcount.obj" \
+	"$(INTDIR)\apr_buckets_simple.obj" \
+	"$(INTDIR)\apr_buckets_socket.obj" \
+	"$(INTDIR)\apr_crypto.obj" \
+	"$(INTDIR)\apr_md4.obj" \
+	"$(INTDIR)\apr_md5.obj" \
+	"$(INTDIR)\apr_passwd.obj" \
+	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
+	"$(INTDIR)\crypt_blowfish.obj" \
+	"$(INTDIR)\getuuid.obj" \
+	"$(INTDIR)\uuid.obj" \
+	"$(INTDIR)\apr_dbd.obj" \
+	"$(INTDIR)\apr_dbm.obj" \
+	"$(INTDIR)\apr_dbm_sdbm.obj" \
+	"$(INTDIR)\apr_base64.obj" \
+	"$(INTDIR)\apr_hooks.obj" \
+	"$(INTDIR)\apr_ldap_stub.obj" \
+	"$(INTDIR)\apr_ldap_url.obj" \
+	"$(INTDIR)\apr_memcache.obj" \
+	"$(INTDIR)\apr_date.obj" \
+	"$(INTDIR)\apu_dso.obj" \
+	"$(INTDIR)\apr_queue.obj" \
+	"$(INTDIR)\apr_redis.obj" \
+	"$(INTDIR)\apr_reslist.obj" \
+	"$(INTDIR)\apr_rmm.obj" \
+	"$(INTDIR)\apr_thread_pool.obj" \
+	"$(INTDIR)\apu_version.obj" \
+	"$(INTDIR)\sdbm.obj" \
+	"$(INTDIR)\sdbm_hash.obj" \
+	"$(INTDIR)\sdbm_lock.obj" \
+	"$(INTDIR)\sdbm_pair.obj" \
+	"$(INTDIR)\apr_strmatch.obj" \
+	"$(INTDIR)\apr_uri.obj" \
+	"$(INTDIR)\xlate.obj" \
+	"$(INTDIR)\apr_xml.obj" \
+	"$(INTDIR)\libaprutil.res" \
+	"..\apr\Release\libapr-1.lib" \
+	"..\apr-iconv\Release\libapriconv-1.lib"
+
+"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\libaprutil-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libaprutil-1.dll"
+   if exist .\Release\libaprutil-1.dll.manifest mt.exe -manifest .\Release\libaprutil-1.dll.manifest -outputresource:.\Release\libaprutil-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "xml - Win32 Debug" "libapriconv - Win32 Debug" "libapr - Win32 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - Win32 DebugCLEAN" "libapriconv - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_base64.obj"
+	- at erase "$(INTDIR)\apr_brigade.obj"
+	- at erase "$(INTDIR)\apr_buckets.obj"
+	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
+	- at erase "$(INTDIR)\apr_buckets_eos.obj"
+	- at erase "$(INTDIR)\apr_buckets_file.obj"
+	- at erase "$(INTDIR)\apr_buckets_flush.obj"
+	- at erase "$(INTDIR)\apr_buckets_heap.obj"
+	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
+	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
+	- at erase "$(INTDIR)\apr_buckets_pool.obj"
+	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
+	- at erase "$(INTDIR)\apr_buckets_simple.obj"
+	- at erase "$(INTDIR)\apr_buckets_socket.obj"
+	- at erase "$(INTDIR)\apr_crypto.obj"
+	- at erase "$(INTDIR)\apr_date.obj"
+	- at erase "$(INTDIR)\apr_dbd.obj"
+	- at erase "$(INTDIR)\apr_dbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
+	- at erase "$(INTDIR)\apr_hooks.obj"
+	- at erase "$(INTDIR)\apr_ldap_stub.obj"
+	- at erase "$(INTDIR)\apr_ldap_url.obj"
+	- at erase "$(INTDIR)\apr_md4.obj"
+	- at erase "$(INTDIR)\apr_md5.obj"
+	- at erase "$(INTDIR)\apr_memcache.obj"
+	- at erase "$(INTDIR)\apr_passwd.obj"
+	- at erase "$(INTDIR)\apr_queue.obj"
+	- at erase "$(INTDIR)\apr_redis.obj"
+	- at erase "$(INTDIR)\apr_reslist.obj"
+	- at erase "$(INTDIR)\apr_rmm.obj"
+	- at erase "$(INTDIR)\apr_sha1.obj"
+	- at erase "$(INTDIR)\apr_siphash.obj"
+	- at erase "$(INTDIR)\apr_strmatch.obj"
+	- at erase "$(INTDIR)\apr_thread_pool.obj"
+	- at erase "$(INTDIR)\apr_uri.obj"
+	- at erase "$(INTDIR)\apr_xml.obj"
+	- at erase "$(INTDIR)\apu_dso.obj"
+	- at erase "$(INTDIR)\apu_version.obj"
+	- at erase "$(INTDIR)\crypt_blowfish.obj"
+	- at erase "$(INTDIR)\getuuid.obj"
+	- at erase "$(INTDIR)\libaprutil.res"
+	- at erase "$(INTDIR)\libaprutil_src.idb"
+	- at erase "$(INTDIR)\libaprutil_src.pdb"
+	- at erase "$(INTDIR)\sdbm.obj"
+	- at erase "$(INTDIR)\sdbm_hash.obj"
+	- at erase "$(INTDIR)\sdbm_lock.obj"
+	- at erase "$(INTDIR)\sdbm_pair.obj"
+	- at erase "$(INTDIR)\uuid.obj"
+	- at erase "$(INTDIR)\xlate.obj"
+	- at erase "$(OUTDIR)\libaprutil-1.dll"
+	- at erase "$(OUTDIR)\libaprutil-1.exp"
+	- at erase "$(OUTDIR)\libaprutil-1.lib"
+	- at erase "$(OUTDIR)\libaprutil-1.pdb"
+	- at erase ".\include\apr_ldap.h"
+	- at erase ".\include\apu.h"
+	- at erase ".\include\apu_want.h"
+	- at erase ".\include\private\apu_config.h"
+	- at erase ".\include\private\apu_select_dbm.h"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libaprutil.res" /i "./include" /i "../apr/include" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libaprutil.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=$(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib"  
+LINK32_OBJS= \
+	"$(INTDIR)\apr_brigade.obj" \
+	"$(INTDIR)\apr_buckets.obj" \
+	"$(INTDIR)\apr_buckets_alloc.obj" \
+	"$(INTDIR)\apr_buckets_eos.obj" \
+	"$(INTDIR)\apr_buckets_file.obj" \
+	"$(INTDIR)\apr_buckets_flush.obj" \
+	"$(INTDIR)\apr_buckets_heap.obj" \
+	"$(INTDIR)\apr_buckets_mmap.obj" \
+	"$(INTDIR)\apr_buckets_pipe.obj" \
+	"$(INTDIR)\apr_buckets_pool.obj" \
+	"$(INTDIR)\apr_buckets_refcount.obj" \
+	"$(INTDIR)\apr_buckets_simple.obj" \
+	"$(INTDIR)\apr_buckets_socket.obj" \
+	"$(INTDIR)\apr_crypto.obj" \
+	"$(INTDIR)\apr_md4.obj" \
+	"$(INTDIR)\apr_md5.obj" \
+	"$(INTDIR)\apr_passwd.obj" \
+	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
+	"$(INTDIR)\crypt_blowfish.obj" \
+	"$(INTDIR)\getuuid.obj" \
+	"$(INTDIR)\uuid.obj" \
+	"$(INTDIR)\apr_dbd.obj" \
+	"$(INTDIR)\apr_dbm.obj" \
+	"$(INTDIR)\apr_dbm_sdbm.obj" \
+	"$(INTDIR)\apr_base64.obj" \
+	"$(INTDIR)\apr_hooks.obj" \
+	"$(INTDIR)\apr_ldap_stub.obj" \
+	"$(INTDIR)\apr_ldap_url.obj" \
+	"$(INTDIR)\apr_memcache.obj" \
+	"$(INTDIR)\apr_date.obj" \
+	"$(INTDIR)\apu_dso.obj" \
+	"$(INTDIR)\apr_queue.obj" \
+	"$(INTDIR)\apr_redis.obj" \
+	"$(INTDIR)\apr_reslist.obj" \
+	"$(INTDIR)\apr_rmm.obj" \
+	"$(INTDIR)\apr_thread_pool.obj" \
+	"$(INTDIR)\apu_version.obj" \
+	"$(INTDIR)\sdbm.obj" \
+	"$(INTDIR)\sdbm_hash.obj" \
+	"$(INTDIR)\sdbm_lock.obj" \
+	"$(INTDIR)\sdbm_pair.obj" \
+	"$(INTDIR)\apr_strmatch.obj" \
+	"$(INTDIR)\apr_uri.obj" \
+	"$(INTDIR)\xlate.obj" \
+	"$(INTDIR)\apr_xml.obj" \
+	"$(INTDIR)\libaprutil.res" \
+	"..\apr\Debug\libapr-1.lib" \
+	"..\apr-iconv\Debug\libapriconv-1.lib"
+
+"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\libaprutil-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libaprutil-1.dll"
+   if exist .\Debug\libaprutil-1.dll.manifest mt.exe -manifest .\Debug\libaprutil-1.dll.manifest -outputresource:.\Debug\libaprutil-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+OUTDIR=.\x64\Release
+INTDIR=.\x64\Release
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "xml - x64 Release" "libapriconv - x64 Release" "libapr - x64 Release" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 ReleaseCLEAN" "libapriconv - x64 ReleaseCLEAN" "xml - x64 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_base64.obj"
+	- at erase "$(INTDIR)\apr_brigade.obj"
+	- at erase "$(INTDIR)\apr_buckets.obj"
+	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
+	- at erase "$(INTDIR)\apr_buckets_eos.obj"
+	- at erase "$(INTDIR)\apr_buckets_file.obj"
+	- at erase "$(INTDIR)\apr_buckets_flush.obj"
+	- at erase "$(INTDIR)\apr_buckets_heap.obj"
+	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
+	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
+	- at erase "$(INTDIR)\apr_buckets_pool.obj"
+	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
+	- at erase "$(INTDIR)\apr_buckets_simple.obj"
+	- at erase "$(INTDIR)\apr_buckets_socket.obj"
+	- at erase "$(INTDIR)\apr_crypto.obj"
+	- at erase "$(INTDIR)\apr_date.obj"
+	- at erase "$(INTDIR)\apr_dbd.obj"
+	- at erase "$(INTDIR)\apr_dbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
+	- at erase "$(INTDIR)\apr_hooks.obj"
+	- at erase "$(INTDIR)\apr_ldap_stub.obj"
+	- at erase "$(INTDIR)\apr_ldap_url.obj"
+	- at erase "$(INTDIR)\apr_md4.obj"
+	- at erase "$(INTDIR)\apr_md5.obj"
+	- at erase "$(INTDIR)\apr_memcache.obj"
+	- at erase "$(INTDIR)\apr_passwd.obj"
+	- at erase "$(INTDIR)\apr_queue.obj"
+	- at erase "$(INTDIR)\apr_redis.obj"
+	- at erase "$(INTDIR)\apr_reslist.obj"
+	- at erase "$(INTDIR)\apr_rmm.obj"
+	- at erase "$(INTDIR)\apr_sha1.obj"
+	- at erase "$(INTDIR)\apr_siphash.obj"
+	- at erase "$(INTDIR)\apr_strmatch.obj"
+	- at erase "$(INTDIR)\apr_thread_pool.obj"
+	- at erase "$(INTDIR)\apr_uri.obj"
+	- at erase "$(INTDIR)\apr_xml.obj"
+	- at erase "$(INTDIR)\apu_dso.obj"
+	- at erase "$(INTDIR)\apu_version.obj"
+	- at erase "$(INTDIR)\crypt_blowfish.obj"
+	- at erase "$(INTDIR)\getuuid.obj"
+	- at erase "$(INTDIR)\libaprutil.res"
+	- at erase "$(INTDIR)\libaprutil_src.idb"
+	- at erase "$(INTDIR)\libaprutil_src.pdb"
+	- at erase "$(INTDIR)\sdbm.obj"
+	- at erase "$(INTDIR)\sdbm_hash.obj"
+	- at erase "$(INTDIR)\sdbm_lock.obj"
+	- at erase "$(INTDIR)\sdbm_pair.obj"
+	- at erase "$(INTDIR)\uuid.obj"
+	- at erase "$(INTDIR)\xlate.obj"
+	- at erase "$(OUTDIR)\libaprutil-1.dll"
+	- at erase "$(OUTDIR)\libaprutil-1.exp"
+	- at erase "$(OUTDIR)\libaprutil-1.lib"
+	- at erase "$(OUTDIR)\libaprutil-1.pdb"
+	- at erase ".\include\apr_ldap.h"
+	- at erase ".\include\apu.h"
+	- at erase ".\include\apu_want.h"
+	- at erase ".\include\private\apu_config.h"
+	- at erase ".\include\private\apu_select_dbm.h"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libaprutil.res" /i "./include" /i "../apr/include" /d "NDEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libaprutil.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=$(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib"  /opt:ref 
+LINK32_OBJS= \
+	"$(INTDIR)\apr_brigade.obj" \
+	"$(INTDIR)\apr_buckets.obj" \
+	"$(INTDIR)\apr_buckets_alloc.obj" \
+	"$(INTDIR)\apr_buckets_eos.obj" \
+	"$(INTDIR)\apr_buckets_file.obj" \
+	"$(INTDIR)\apr_buckets_flush.obj" \
+	"$(INTDIR)\apr_buckets_heap.obj" \
+	"$(INTDIR)\apr_buckets_mmap.obj" \
+	"$(INTDIR)\apr_buckets_pipe.obj" \
+	"$(INTDIR)\apr_buckets_pool.obj" \
+	"$(INTDIR)\apr_buckets_refcount.obj" \
+	"$(INTDIR)\apr_buckets_simple.obj" \
+	"$(INTDIR)\apr_buckets_socket.obj" \
+	"$(INTDIR)\apr_crypto.obj" \
+	"$(INTDIR)\apr_md4.obj" \
+	"$(INTDIR)\apr_md5.obj" \
+	"$(INTDIR)\apr_passwd.obj" \
+	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
+	"$(INTDIR)\crypt_blowfish.obj" \
+	"$(INTDIR)\getuuid.obj" \
+	"$(INTDIR)\uuid.obj" \
+	"$(INTDIR)\apr_dbd.obj" \
+	"$(INTDIR)\apr_dbm.obj" \
+	"$(INTDIR)\apr_dbm_sdbm.obj" \
+	"$(INTDIR)\apr_base64.obj" \
+	"$(INTDIR)\apr_hooks.obj" \
+	"$(INTDIR)\apr_ldap_stub.obj" \
+	"$(INTDIR)\apr_ldap_url.obj" \
+	"$(INTDIR)\apr_memcache.obj" \
+	"$(INTDIR)\apr_date.obj" \
+	"$(INTDIR)\apu_dso.obj" \
+	"$(INTDIR)\apr_queue.obj" \
+	"$(INTDIR)\apr_redis.obj" \
+	"$(INTDIR)\apr_reslist.obj" \
+	"$(INTDIR)\apr_rmm.obj" \
+	"$(INTDIR)\apr_thread_pool.obj" \
+	"$(INTDIR)\apu_version.obj" \
+	"$(INTDIR)\sdbm.obj" \
+	"$(INTDIR)\sdbm_hash.obj" \
+	"$(INTDIR)\sdbm_lock.obj" \
+	"$(INTDIR)\sdbm_pair.obj" \
+	"$(INTDIR)\apr_strmatch.obj" \
+	"$(INTDIR)\apr_uri.obj" \
+	"$(INTDIR)\xlate.obj" \
+	"$(INTDIR)\apr_xml.obj" \
+	"$(INTDIR)\libaprutil.res" \
+	"..\apr\x64\Release\libapr-1.lib" \
+	"..\apr-iconv\x64\Release\libapriconv-1.lib"
+
+"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Release\libaprutil-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Release
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libaprutil-1.dll"
+   if exist .\x64\Release\libaprutil-1.dll.manifest mt.exe -manifest .\x64\Release\libaprutil-1.dll.manifest -outputresource:.\x64\Release\libaprutil-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+OUTDIR=.\x64\Debug
+INTDIR=.\x64\Debug
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ELSE 
+
+ALL : "xml - x64 Debug" "libapriconv - x64 Debug" "libapr - x64 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libapr - x64 DebugCLEAN" "libapriconv - x64 DebugCLEAN" "xml - x64 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	- at erase "$(INTDIR)\apr_base64.obj"
+	- at erase "$(INTDIR)\apr_brigade.obj"
+	- at erase "$(INTDIR)\apr_buckets.obj"
+	- at erase "$(INTDIR)\apr_buckets_alloc.obj"
+	- at erase "$(INTDIR)\apr_buckets_eos.obj"
+	- at erase "$(INTDIR)\apr_buckets_file.obj"
+	- at erase "$(INTDIR)\apr_buckets_flush.obj"
+	- at erase "$(INTDIR)\apr_buckets_heap.obj"
+	- at erase "$(INTDIR)\apr_buckets_mmap.obj"
+	- at erase "$(INTDIR)\apr_buckets_pipe.obj"
+	- at erase "$(INTDIR)\apr_buckets_pool.obj"
+	- at erase "$(INTDIR)\apr_buckets_refcount.obj"
+	- at erase "$(INTDIR)\apr_buckets_simple.obj"
+	- at erase "$(INTDIR)\apr_buckets_socket.obj"
+	- at erase "$(INTDIR)\apr_crypto.obj"
+	- at erase "$(INTDIR)\apr_date.obj"
+	- at erase "$(INTDIR)\apr_dbd.obj"
+	- at erase "$(INTDIR)\apr_dbm.obj"
+	- at erase "$(INTDIR)\apr_dbm_sdbm.obj"
+	- at erase "$(INTDIR)\apr_hooks.obj"
+	- at erase "$(INTDIR)\apr_ldap_stub.obj"
+	- at erase "$(INTDIR)\apr_ldap_url.obj"
+	- at erase "$(INTDIR)\apr_md4.obj"
+	- at erase "$(INTDIR)\apr_md5.obj"
+	- at erase "$(INTDIR)\apr_memcache.obj"
+	- at erase "$(INTDIR)\apr_passwd.obj"
+	- at erase "$(INTDIR)\apr_queue.obj"
+	- at erase "$(INTDIR)\apr_redis.obj"
+	- at erase "$(INTDIR)\apr_reslist.obj"
+	- at erase "$(INTDIR)\apr_rmm.obj"
+	- at erase "$(INTDIR)\apr_sha1.obj"
+	- at erase "$(INTDIR)\apr_siphash.obj"
+	- at erase "$(INTDIR)\apr_strmatch.obj"
+	- at erase "$(INTDIR)\apr_thread_pool.obj"
+	- at erase "$(INTDIR)\apr_uri.obj"
+	- at erase "$(INTDIR)\apr_xml.obj"
+	- at erase "$(INTDIR)\apu_dso.obj"
+	- at erase "$(INTDIR)\apu_version.obj"
+	- at erase "$(INTDIR)\crypt_blowfish.obj"
+	- at erase "$(INTDIR)\getuuid.obj"
+	- at erase "$(INTDIR)\libaprutil.res"
+	- at erase "$(INTDIR)\libaprutil_src.idb"
+	- at erase "$(INTDIR)\libaprutil_src.pdb"
+	- at erase "$(INTDIR)\sdbm.obj"
+	- at erase "$(INTDIR)\sdbm_hash.obj"
+	- at erase "$(INTDIR)\sdbm_lock.obj"
+	- at erase "$(INTDIR)\sdbm_pair.obj"
+	- at erase "$(INTDIR)\uuid.obj"
+	- at erase "$(INTDIR)\xlate.obj"
+	- at erase "$(OUTDIR)\libaprutil-1.dll"
+	- at erase "$(OUTDIR)\libaprutil-1.exp"
+	- at erase "$(OUTDIR)\libaprutil-1.lib"
+	- at erase "$(OUTDIR)\libaprutil-1.pdb"
+	- at erase ".\include\apr_ldap.h"
+	- at erase ".\include\apu.h"
+	- at erase ".\include\apu_want.h"
+	- at erase ".\include\private\apu_config.h"
+	- at erase ".\include\private\apu_select_dbm.h"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libaprutil.res" /i "./include" /i "../apr/include" /d "_DEBUG" /d "APU_VERSION_ONLY" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libaprutil.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=$(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib"  
+LINK32_OBJS= \
+	"$(INTDIR)\apr_brigade.obj" \
+	"$(INTDIR)\apr_buckets.obj" \
+	"$(INTDIR)\apr_buckets_alloc.obj" \
+	"$(INTDIR)\apr_buckets_eos.obj" \
+	"$(INTDIR)\apr_buckets_file.obj" \
+	"$(INTDIR)\apr_buckets_flush.obj" \
+	"$(INTDIR)\apr_buckets_heap.obj" \
+	"$(INTDIR)\apr_buckets_mmap.obj" \
+	"$(INTDIR)\apr_buckets_pipe.obj" \
+	"$(INTDIR)\apr_buckets_pool.obj" \
+	"$(INTDIR)\apr_buckets_refcount.obj" \
+	"$(INTDIR)\apr_buckets_simple.obj" \
+	"$(INTDIR)\apr_buckets_socket.obj" \
+	"$(INTDIR)\apr_crypto.obj" \
+	"$(INTDIR)\apr_md4.obj" \
+	"$(INTDIR)\apr_md5.obj" \
+	"$(INTDIR)\apr_passwd.obj" \
+	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
+	"$(INTDIR)\crypt_blowfish.obj" \
+	"$(INTDIR)\getuuid.obj" \
+	"$(INTDIR)\uuid.obj" \
+	"$(INTDIR)\apr_dbd.obj" \
+	"$(INTDIR)\apr_dbm.obj" \
+	"$(INTDIR)\apr_dbm_sdbm.obj" \
+	"$(INTDIR)\apr_base64.obj" \
+	"$(INTDIR)\apr_hooks.obj" \
+	"$(INTDIR)\apr_ldap_stub.obj" \
+	"$(INTDIR)\apr_ldap_url.obj" \
+	"$(INTDIR)\apr_memcache.obj" \
+	"$(INTDIR)\apr_date.obj" \
+	"$(INTDIR)\apu_dso.obj" \
+	"$(INTDIR)\apr_queue.obj" \
+	"$(INTDIR)\apr_redis.obj" \
+	"$(INTDIR)\apr_reslist.obj" \
+	"$(INTDIR)\apr_rmm.obj" \
+	"$(INTDIR)\apr_thread_pool.obj" \
+	"$(INTDIR)\apu_version.obj" \
+	"$(INTDIR)\sdbm.obj" \
+	"$(INTDIR)\sdbm_hash.obj" \
+	"$(INTDIR)\sdbm_lock.obj" \
+	"$(INTDIR)\sdbm_pair.obj" \
+	"$(INTDIR)\apr_strmatch.obj" \
+	"$(INTDIR)\apr_uri.obj" \
+	"$(INTDIR)\xlate.obj" \
+	"$(INTDIR)\apr_xml.obj" \
+	"$(INTDIR)\libaprutil.res" \
+	"..\apr\x64\Debug\libapr-1.lib" \
+	"..\apr-iconv\x64\Debug\libapriconv-1.lib"
+
+"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\x64\Debug\libaprutil-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+# Begin Custom Macros
+OutDir=.\x64\Debug
+# End Custom Macros
+
+"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libaprutil-1.dll"
+   if exist .\x64\Debug\libaprutil-1.dll.manifest mt.exe -manifest .\x64\Debug\libaprutil-1.dll.manifest -outputresource:.\x64\Debug\libaprutil-1.dll;2
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("libaprutil.dep")
+!INCLUDE "libaprutil.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "libaprutil.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "libaprutil - Win32 Release" || "$(CFG)" == "libaprutil - Win32 Debug" || "$(CFG)" == "libaprutil - x64 Release" || "$(CFG)" == "libaprutil - x64 Debug"
+SOURCE=.\buckets\apr_brigade.c
+
+"$(INTDIR)\apr_brigade.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets.c
+
+"$(INTDIR)\apr_buckets.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_alloc.c
+
+"$(INTDIR)\apr_buckets_alloc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_eos.c
+
+"$(INTDIR)\apr_buckets_eos.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_file.c
+
+"$(INTDIR)\apr_buckets_file.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_flush.c
+
+"$(INTDIR)\apr_buckets_flush.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_heap.c
+
+"$(INTDIR)\apr_buckets_heap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_mmap.c
+
+"$(INTDIR)\apr_buckets_mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_pipe.c
+
+"$(INTDIR)\apr_buckets_pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_pool.c
+
+"$(INTDIR)\apr_buckets_pool.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_refcount.c
+
+"$(INTDIR)\apr_buckets_refcount.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_simple.c
+
+"$(INTDIR)\apr_buckets_simple.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\buckets\apr_buckets_socket.c
+
+"$(INTDIR)\apr_buckets_socket.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\apr_crypto.c
+
+"$(INTDIR)\apr_crypto.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\apr_md4.c
+
+"$(INTDIR)\apr_md4.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\apr_md5.c
+
+"$(INTDIR)\apr_md5.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\apr_passwd.c
+
+"$(INTDIR)\apr_passwd.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\apr_sha1.c
+
+"$(INTDIR)\apr_sha1.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\apr_siphash.c
+
+"$(INTDIR)\apr_siphash.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\crypt_blowfish.c
+
+"$(INTDIR)\crypt_blowfish.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\getuuid.c
+
+"$(INTDIR)\getuuid.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\crypto\uuid.c
+
+"$(INTDIR)\uuid.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbd\apr_dbd.c
+
+"$(INTDIR)\apr_dbd.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbd\apr_dbd_mysql.c
+SOURCE=.\dbd\apr_dbd_odbc.c
+SOURCE=.\dbd\apr_dbd_oracle.c
+SOURCE=.\dbd\apr_dbd_pgsql.c
+SOURCE=.\dbd\apr_dbd_sqlite2.c
+SOURCE=.\dbd\apr_dbd_sqlite3.c
+SOURCE=.\dbm\apr_dbm.c
+
+"$(INTDIR)\apr_dbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\apr_dbm_berkeleydb.c
+SOURCE=.\dbm\apr_dbm_gdbm.c
+SOURCE=.\dbm\apr_dbm_sdbm.c
+
+"$(INTDIR)\apr_dbm_sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\encoding\apr_base64.c
+
+"$(INTDIR)\apr_base64.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\hooks\apr_hooks.c
+
+"$(INTDIR)\apr_hooks.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\ldap\apr_ldap_init.c
+SOURCE=.\ldap\apr_ldap_option.c
+SOURCE=.\ldap\apr_ldap_rebind.c
+SOURCE=.\ldap\apr_ldap_stub.c
+
+"$(INTDIR)\apr_ldap_stub.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\ldap\apr_ldap_url.c
+
+"$(INTDIR)\apr_ldap_url.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\apr_ldap.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\memcache\apr_memcache.c
+
+"$(INTDIR)\apr_memcache.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apr_date.c
+
+"$(INTDIR)\apr_date.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apr_queue.c
+
+"$(INTDIR)\apr_queue.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apr_reslist.c
+
+"$(INTDIR)\apr_reslist.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apr_rmm.c
+
+"$(INTDIR)\apr_rmm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apr_thread_pool.c
+
+"$(INTDIR)\apr_thread_pool.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apu_dso.c
+
+"$(INTDIR)\apu_dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\apu_version.c
+
+"$(INTDIR)\apu_version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\redis\apr_redis.c
+
+"$(INTDIR)\apr_redis.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_redis.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\sdbm\sdbm.c
+
+"$(INTDIR)\sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\sdbm\sdbm_hash.c
+
+"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\sdbm\sdbm_lock.c
+
+"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dbm\sdbm\sdbm_pair.c
+
+"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\strmatch\apr_strmatch.c
+
+"$(INTDIR)\apr_strmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\uri\apr_uri.c
+
+"$(INTDIR)\apr_uri.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\xlate\xlate.c
+
+"$(INTDIR)\xlate.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\xml\apr_xml.c
+
+"$(INTDIR)\apr_xml.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\include\apr_ldap.hw
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+InputPath=.\include\apr_ldap.hw
+
+".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apr_ldap.hw > .\include\apr_ldap.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+InputPath=.\include\apr_ldap.hw
+
+".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apr_ldap.hw > .\include\apr_ldap.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+InputPath=.\include\apr_ldap.hw
+
+".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apr_ldap.hw > .\include\apr_ldap.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+InputPath=.\include\apr_ldap.hw
+
+".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apr_ldap.hw > .\include\apr_ldap.h
+<< 
+	
+
+!ENDIF 
+
+SOURCE=.\include\apu.hw
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+InputPath=.\include\apu.hw
+
+".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu.hw > .\include\apu.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+InputPath=.\include\apu.hw
+
+".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu.hw > .\include\apu.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+InputPath=.\include\apu.hw
+
+".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu.hw > .\include\apu.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+InputPath=.\include\apu.hw
+
+".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu.hw > .\include\apu.h
+<< 
+	
+
+!ENDIF 
+
+SOURCE=.\include\private\apu_config.hw
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_config.hw > .\include\private\apu_config.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_config.hw > .\include\private\apu_config.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_config.hw > .\include\private\apu_config.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_config.hw > .\include\private\apu_config.h
+<< 
+	
+
+!ENDIF 
+
+SOURCE=.\include\private\apu_select_dbm.hw
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+InputPath=.\include\private\apu_select_dbm.hw
+
+".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+InputPath=.\include\private\apu_select_dbm.hw
+
+".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+InputPath=.\include\private\apu_select_dbm.hw
+
+".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+InputPath=.\include\private\apu_select_dbm.hw
+
+".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\private\apu_select_dbm.hw > .\include\private\apu_select_dbm.h
+<< 
+	
+
+!ENDIF 
+
+SOURCE=.\include\apu_want.hw
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+InputPath=.\include\apu_want.hw
+
+".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu_want.hw > .\include\apu_want.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+InputPath=.\include\apu_want.hw
+
+".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu_want.hw > .\include\apu_want.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+InputPath=.\include\apu_want.hw
+
+".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu_want.hw > .\include\apu_want.h
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+InputPath=.\include\apu_want.hw
+
+".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	type .\include\apu_want.hw > .\include\apu_want.h
+<< 
+	
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+"libapr - Win32 Release" : 
+   cd ".\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
+   cd "..\apr-util"
+
+"libapr - Win32 ReleaseCLEAN" : 
+   cd ".\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util"
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+"libapr - Win32 Debug" : 
+   cd ".\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
+   cd "..\apr-util"
+
+"libapr - Win32 DebugCLEAN" : 
+   cd ".\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+"libapr - x64 Release" : 
+   cd ".\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
+   cd "..\apr-util"
+
+"libapr - x64 ReleaseCLEAN" : 
+   cd ".\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+"libapr - x64 Debug" : 
+   cd ".\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
+   cd "..\apr-util"
+
+"libapr - x64 DebugCLEAN" : 
+   cd ".\..\apr"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libaprutil - Win32 Release"
+
+"libapriconv - Win32 Release" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Release" 
+   cd "..\apr-util"
+
+"libapriconv - Win32 ReleaseCLEAN" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util"
+
+!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
+
+"libapriconv - Win32 Debug" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Debug" 
+   cd "..\apr-util"
+
+"libapriconv - Win32 DebugCLEAN" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Release"
+
+"libapriconv - x64 Release" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - x64 Release" 
+   cd "..\apr-util"
+
+"libapriconv - x64 ReleaseCLEAN" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - x64 Release" RECURSE=1 CLEAN 
+   cd "..\apr-util"
+
+!ELSEIF  "$(CFG)" == "libaprutil - x64 Debug"
+
+"libapriconv - x64 Debug" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - x64 Debug" 
+   cd "..\apr-util"
+
+"libapriconv - x64 DebugCLEAN" : 
+   cd ".\..\apr-iconv"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - x64 Debug" RECURSE=1 CLEAN 
+   cd "..\apr-util"
+
+!ENDIF 
+
+SOURCE=.\libaprutil.rc
+
+"$(INTDIR)\libaprutil.res" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
+	$(RSC) $(RSC_PROJ) $(SOURCE)
+
+
+
+!ENDIF 
+
diff --git a/test/Makefile.win b/test/Makefile.win
index ab4029a..fa3d2eb 100644
--- a/test/Makefile.win
+++ b/test/Makefile.win
@@ -90,10 +90,9 @@ APROUTDIR=$(OUTDIR)
 PROGRAM_DEPENDENCIES = \
 	$(APR_PATH)\$(APROUTDIR)\apr-1.lib \
 	$(API_PATH)\$(OUTDIR)\apriconv-1.lib \
-	..\xml\$(OUTDIR)\xml.lib \
 	..\$(OUTDIR)\aprutil-1.lib 
 STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
-STATIC_LIBS = odbc32.lib odbccp32.lib wldap32.lib 
+STATIC_LIBS = libexpatMT.lib odbc32.lib odbccp32.lib wldap32.lib 
 !ELSE
 PROGRAM_DEPENDENCIES = \
 	$(APR_PATH)\$(APROUTDIR)\libapr-1.lib \
diff --git a/xml/xml.dep b/xml/xml.dep
deleted file mode 100644
index c83857a..0000000
--- a/xml/xml.dep
+++ /dev/null
@@ -1,2 +0,0 @@
-# Microsoft Developer Studio Generated Dependency File, included by xml.mak
-
diff --git a/xml/xml.dsp b/xml/xml.dsp
deleted file mode 100644
index ab52253..0000000
--- a/xml/xml.dsp
+++ /dev/null
@@ -1,210 +0,0 @@
-# Microsoft Developer Studio Project File - Name="xml" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=xml - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "xml.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "xml.mak" CFG="xml - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - x64 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - x64 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "xml - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "LibR"
-# PROP BASE Intermediate_Dir "LibR"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "LibR"
-# PROP Intermediate_Dir "LibR"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"LibR\xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "LibD"
-# PROP BASE Intermediate_Dir "LibD"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "LibD"
-# PROP Intermediate_Dir "LibD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"LibD\xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - x64 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "x64\LibR"
-# PROP BASE Intermediate_Dir "x64\LibR"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "x64\LibR"
-# PROP Intermediate_Dir "x64\LibR"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"x64\LibR\xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - x64 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "x64\LibD"
-# PROP BASE Intermediate_Dir "x64\LibD"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "x64\LibD"
-# PROP Intermediate_Dir "x64\LibD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"x64\LibD\xml.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "xml - Win32 Release"
-# Name "xml - Win32 Debug"
-# Name "xml - x64 Release"
-# Name "xml - x64 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\expat\lib\xmlparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\xmlrole.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\xmltok.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\xmltok_impl.c
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\xmltok_ns.c
-# PROP Exclude_From_Build 1
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\expat\lib\ascii.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\asciitab.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\expat.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\iasciitab.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\latin1tab.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\nametab.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\utf8tab.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\winconfig.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\xmlrole.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\xmltok.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\expat\lib\xmltok_impl.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/xml/xml.mak b/xml/xml.mak
deleted file mode 100644
index 226a8bf..0000000
--- a/xml/xml.mak
+++ /dev/null
@@ -1,353 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on xml.dsp
-!IF "$(CFG)" == ""
-CFG=xml - Win32 Release
-!MESSAGE No configuration specified. Defaulting to xml - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "xml - Win32 Release" && "$(CFG)" != "xml - Win32 Debug" && "$(CFG)" != "xml - x64 Release" && "$(CFG)" != "xml - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "xml.mak" CFG="xml - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - x64 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - x64 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "xml - Win32 Release"
-
-OUTDIR=.\LibR
-INTDIR=.\LibR
-# Begin Custom Macros
-OutDir=.\LibR
-# End Custom Macros
-
-ALL : "$(OUTDIR)\xml.lib"
-
-
-CLEAN :
-	- at erase "$(INTDIR)\xml.idb"
-	- at erase "$(INTDIR)\xml.pdb"
-	- at erase "$(INTDIR)\xmlparse.obj"
-	- at erase "$(INTDIR)\xmlrole.obj"
-	- at erase "$(INTDIR)\xmltok.obj"
-	- at erase "$(OUTDIR)\xml.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\xmlparse.obj" \
-	"$(INTDIR)\xmlrole.obj" \
-	"$(INTDIR)\xmltok.obj"
-
-"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Debug"
-
-OUTDIR=.\LibD
-INTDIR=.\LibD
-# Begin Custom Macros
-OutDir=.\LibD
-# End Custom Macros
-
-ALL : "$(OUTDIR)\xml.lib"
-
-
-CLEAN :
-	- at erase "$(INTDIR)\xml.idb"
-	- at erase "$(INTDIR)\xml.pdb"
-	- at erase "$(INTDIR)\xmlparse.obj"
-	- at erase "$(INTDIR)\xmlrole.obj"
-	- at erase "$(INTDIR)\xmltok.obj"
-	- at erase "$(OUTDIR)\xml.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\xmlparse.obj" \
-	"$(INTDIR)\xmlrole.obj" \
-	"$(INTDIR)\xmltok.obj"
-
-"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "xml - x64 Release"
-
-OUTDIR=.\x64\LibR
-INTDIR=.\x64\LibR
-# Begin Custom Macros
-OutDir=.\x64\LibR
-# End Custom Macros
-
-ALL : "$(OUTDIR)\xml.lib"
-
-
-CLEAN :
-	- at erase "$(INTDIR)\xml.idb"
-	- at erase "$(INTDIR)\xml.pdb"
-	- at erase "$(INTDIR)\xmlparse.obj"
-	- at erase "$(INTDIR)\xmlrole.obj"
-	- at erase "$(INTDIR)\xmltok.obj"
-	- at erase "$(OUTDIR)\xml.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\xmlparse.obj" \
-	"$(INTDIR)\xmlrole.obj" \
-	"$(INTDIR)\xmltok.obj"
-
-"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "xml - x64 Debug"
-
-OUTDIR=.\x64\LibD
-INTDIR=.\x64\LibD
-# Begin Custom Macros
-OutDir=.\x64\LibD
-# End Custom Macros
-
-ALL : "$(OUTDIR)\xml.lib"
-
-
-CLEAN :
-	- at erase "$(INTDIR)\xml.idb"
-	- at erase "$(INTDIR)\xml.pdb"
-	- at erase "$(INTDIR)\xmlparse.obj"
-	- at erase "$(INTDIR)\xmlrole.obj"
-	- at erase "$(INTDIR)\xmltok.obj"
-	- at erase "$(OUTDIR)\xml.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\xmlparse.obj" \
-	"$(INTDIR)\xmlrole.obj" \
-	"$(INTDIR)\xmltok.obj"
-
-"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("xml.dep")
-!INCLUDE "xml.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "xml.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "xml - Win32 Release" || "$(CFG)" == "xml - Win32 Debug" || "$(CFG)" == "xml - x64 Release" || "$(CFG)" == "xml - x64 Debug"
-SOURCE=.\expat\lib\xmlparse.c
-
-"$(INTDIR)\xmlparse.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\expat\lib\xmlrole.c
-
-"$(INTDIR)\xmlrole.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\expat\lib\xmltok.c
-
-"$(INTDIR)\xmltok.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\expat\lib\xmltok_impl.c
-SOURCE=.\expat\lib\xmltok_ns.c
-
-!ENDIF 
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr-util.git



More information about the Pkg-apache-commits mailing list