Always build the odbc dbd driver on winodws, to be consistent with the apr-util default

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@704771 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 88bdf81ab3de9b5146a79c033b766d49282941db..194cd1cb695d1adaefe7a28d5974a2d5ab64525e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) Build the odbc dbd driver by default on Windows.
+     DBD_LIST is still used to build additional dbd drivers.
+     [Tom Donovan]
+
   *) 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>]

diff --git a/Makefile.win b/Makefile.win
index bea09bc0879394fb86f9def1635b40bb15c0c7b3..142af71f168f3557f6e388c41d69abaa4febc69d 100644 (file)
--- 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,22 @@ _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=\Apache2x
@@ -267,12 +256,10 @@ _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)
@@ -515,11 +502,9 @@ _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_access_compat.$(src_so)    "$(inst_so)" <.y
        copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so)       "$(inst_so)" <.y
        copy modules\aaa\$(LONG)\mod_auth_digest.$(src_so)      "$(inst_so)" <.y