From: Thomas J. Donovan <tdonovan@apache.org>
Date: Sun, 9 Nov 2008 16:59:45 +0000 (+0000)
Subject: backport 704771 & 704883 from trunk
X-Git-Tag: 2.2.11~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0851d1970f16096bd6f9bb2ba4218cb58c4f21b;p=thirdparty%2Fapache%2Fhttpd.git

backport 704771 & 704883 from trunk
Windows: Always build the odbc dbd driver on windows,
to be consistent with the apr-util default.
DBD_LIST is still used to build additional dbd drivers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@712514 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Apache.dsw b/Apache.dsw
index ecb75b99947..dcf95b01985 100644
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -420,6 +420,24 @@ Package=<4>
 
 ###############################################################################
 
+Project: "apr_dbd_odbc"=".\srclib\apr-util\dbd\apr_dbd_odbc.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"=".\srclib\apr-util\dbd\apr_dbd_mysql.dsp" - Package Owner=<4>
 
 Package=<5>
diff --git a/CHANGES b/CHANGES
index c038ac32f9b..a3a7bca2c20 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,9 @@ Changes with Apache 2.2.11
   *) Worker MPM: Crosscheck that idle workers are still available before using
      them and thus preventing an overflow of the worker queue which causes
      a SegFault. PR 45605 [Denis Ustimenko <denusk gmail.com>]
+     
+  *) Windows: Always build the odbc dbd driver on windows, to be consistent 
+     with the apr-util default.
 
 Changes with Apache 2.2.10
 
diff --git a/Makefile.win b/Makefile.win
index f32eca0ab21..5988dd0dde3 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -24,7 +24,7 @@
 #
 # Provide a DBD_LIST argument after configuring LIB and INCLUDE with
 # the SDK paths of the corresponding client support libraries.
-# Note that at this time, none of these are supported on win32, per say.
+# The ODBC driver is always built on Windows.
 #
 #     DBD_LIST="sqlite3 pgsql oracle mysql freetds"
 #
@@ -130,33 +130,21 @@ _tryzlib:
 !ENDIF
 
 
-!IFDEF DBD_LIST
-
 _trydbd:
 !IF $(USEMAK) == 1
 	cd srclib\apr-util\dbd
-	for %d in ($(DBD_LIST)) do \
+	for %d in (odbc $(DBD_LIST)) do \
 	  $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..\..
 !ELSEIF $(USESLN) == 1
-	for %d in ($(DBD_LIST)) do \
+	for %d in (odbc $(DBD_LIST)) do \
 	  devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbd_%d
 !ELSE
-	@for %d in ($(DBD_LIST)) do \
+	@for %d in (odbc $(DBD_LIST)) do \
 	  msdev Apache.dsw /USEENV /MAKE \
 		"apr_dbd_%d - Win32 $(LONG)" /NORECURSE $(CTARGET)
 !ENDIF
 
-!ELSE
-#     no DBD_LIST
-
-_trydbd:
-	@echo -----
-	@echo apr_dbd drivers will not build unless DBD_LIST is set to the list
-	@echo of all the client modules available in the LIB and INCLUDE path.
-
-!ENDIF
-
 
 !IF "$(INSTDIR)" == ""
 INSTDIR=\Apache22
@@ -267,12 +255,12 @@ _build:
 	cd ldap
 	 $(MAKE) $(MAKEOPT) -f apr_ldap.mak        CFG="apr_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..
-!IFDEF DBD_LIST
+
 	cd dbd
-	  for %d in ($(DBD_LIST)) do \
+	  for %d in (odbc $(DBD_LIST)) do \
 	    $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak   CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..
-!ENDIF
+
 	cd ..\..
 	cd srclib\pcre
 	 $(MAKE) $(MAKEOPT) -f dftables.mak        CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -488,11 +476,11 @@ _copybin:
 	copy srclib\apr-iconv\$(LONG)\libapriconv-1.$(src_dll) 	"$(inst_dll)" <.y
 	copy srclib\apr-util\$(LONG)\libaprutil-1.$(src_dll) 	"$(inst_dll)" <.y
 	copy srclib\apr-util\ldap\$(LONG)\apr_ldap-1.$(src_dll) "$(inst_dll)" <.y
-!IFDEF DBD_LIST
-	for %d in ($(DBD_LIST)) do ( \
+
+	for %d in (odbc $(DBD_LIST)) do ( \
 	  copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y \
 	)
-!ENDIF
+
 	copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_auth_digest.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authn_alias.$(src_so) 	"$(inst_so)" <.y
diff --git a/STATUS b/STATUS
index 00946212a51..55177720bc1 100644
--- a/STATUS
+++ b/STATUS
@@ -85,15 +85,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * Windows: Always build the odbc dbd driver on windows, to be consistent 
-     with the apr-util default.
-     Trunk version of patch:
-        http://svn.apache.org/viewvc?rev=704771&view=rev
-        http://svn.apache.org/viewvc?rev=704883&view=rev
-     Backport version for 2.2.x of patch:
-        http://people.apache.org/~tdonovan/diffs/windows_odbc_22x.patch
-        http://people.apache.org/~tdonovan/diffs/windows_odbc_22x_dsw.patch
-     +1: tdonovan, wrowe, mturk
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]