You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by td...@apache.org on 2008/10/15 05:14:11 UTC
svn commit: r704771 - in /httpd/httpd/trunk: CHANGES Makefile.win
Author: tdonovan
Date: Tue Oct 14 20:14:11 2008
New Revision: 704771
URL: http://svn.apache.org/viewvc?rev=704771&view=rev
Log:
Always build the odbc dbd driver on winodws, to be consistent with the apr-util default
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/Makefile.win
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=704771&r1=704770&r2=704771&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Oct 14 20:14:11 2008
@@ -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>]
Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=704771&r1=704770&r2=704771&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Tue Oct 14 20:14:11 2008
@@ -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 @@
!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 @@
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 @@
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