diff options
| author | Thomas J. Donovan <tdonovan@apache.org> | 2008-10-15 03:14:11 +0000 |
|---|---|---|
| committer | Thomas J. Donovan <tdonovan@apache.org> | 2008-10-15 03:14:11 +0000 |
| commit | cd6621e93d45c13388f2c029f0eb17b40d9a6019 (patch) | |
| tree | 06398e6a69d55eae76b7ed22bc11a574205764dc /Makefile.win | |
| parent | 53ddbf41b5fc396d55673e0aea5b514f68d9fd1c (diff) | |
| download | httpd-cd6621e93d45c13388f2c029f0eb17b40d9a6019.tar.gz | |
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
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/Makefile.win b/Makefile.win index bea09bc087..142af71f16 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,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 |