William A. Rowe, Jr. wrote:
The two files below are part of the httpd-2.2.9-win32-src.zip file package,
which has been uploaded to httpd.apache.org/dev/dist/ (and should show up
sometime shortly when the server syncs). The README-win32.txt will also
be added to the binary distribution (msi) for dbd driver instructions.
We would also place this .patch in patches/apply-to-2.2.9/ for clarity.
Actually the patch is even simpler, my mistake (I discovered that the extra
changes to apr.hw are simply unnecessary).
Final proposed patch attached.
Index: Makefile.win
===================================================================
--- Makefile.win (revision 666274)
+++ Makefile.win (working copy)
@@ -134,11 +134,10 @@
_trydbd:
!IF $(USEMAK) == 1
- cd srclib\apr-util\dbd & \
- for %d in ($(DBD_LIST)) do \
- $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(LONG)" RECURSE=0 $(CTARGET)
- cd ..
-
+ cd srclib\apr-util\dbd
+ for %d in ($(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 \
devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbd_%d
@@ -265,9 +264,16 @@
cd ..\..\..
$(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- cd ldap
- $(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
- cd ..\..\..
+ 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 \
+ $(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)
$(MAKE) $(MAKEOPT) -f pcre.mak CFG="pcre - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -484,7 +491,7 @@
copy srclib\apr-util\ldap\$(LONG)\apr_ldap-1.$(src_dll) "$(inst_dll)" <.y
!IFDEF DBD_LIST
for %d in ($(DBD_LIST)) do ( \
- copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y && \
+ copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y \
)
!ENDIF
!IF EXIST("srclib\zlib\zlib1.$(src_dll)")
Index: srclib/apr/include/apr.hw
===================================================================
--- srclib/apr/include/apr.hw (revision 661875)
+++ srclib/apr/include/apr.hw (working copy)
@@ -280,7 +277,7 @@
#define APR_HAVE_IN_ADDR 1
#define APR_HAVE_INET_ADDR 1
#define APR_HAVE_INET_NETWORK 0
-#define APR_HAVE_IPV6 1
+#define APR_HAVE_IPV6 0
#define APR_HAVE_MEMMOVE 1
#define APR_HAVE_SETRLIMIT 0
#define APR_HAVE_SIGACTION 0
