From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 4 Nov 2010 21:55:29 +0000 (+0000)
Subject: Revert r1031167
X-Git-Tag: 2.3.9~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01ea19aa0274ce46c95399928eacc7915af374ac;p=apache

Revert r1031167

Not the advertised fix, and premature as it is.


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

diff --git a/Makefile.win b/Makefile.win
index db48f9a84f..f0e0006f69 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -63,7 +63,7 @@ default: _apacher
 CTARGET=/build
 !ENDIF
 
-!IF !EXIST("srclib\apr") || (!(EXIST("srclib\apr\include\apu.hw") || !EXIST("srclib\apr-util")) && !EXIST("srclib\apr-iconv"))
+!IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util") || !EXIST("srclib\apr-iconv")
 !MESSAGE Please check out or download and unpack the Apache Portability Runtime
 !MESSAGE sources (apr, apr-iconv and apr-util) into your srclib dir.
 !MESSAGE Apache cannot build without these libraries!
@@ -475,7 +475,6 @@ _build:
 	 $(MAKE) $(MAKEOPT) -f mod_remoteip.mak    CFG="mod_remoteip - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_setenvif.mak    CFG="mod_setenvif - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_unique_id.mak   CFG="mod_unique_id - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-	 $(MAKE) $(MAKEOPT) -f mod_usage_track.mak CFG="mod_usage_track - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_usertrack.mak   CFG="mod_usertrack - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_version.mak     CFG="mod_version - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..
@@ -712,7 +711,6 @@ _copybin:
 	copy modules\metadata\$(LONG)\mod_remoteip.$(src_so) 	"$(inst_so)" <.y
 	copy modules\metadata\$(LONG)\mod_setenvif.$(src_so) 	"$(inst_so)" <.y
 	copy modules\metadata\$(LONG)\mod_unique_id.$(src_so) 	"$(inst_so)" <.y
-	copy modules\metadata\$(LONG)\mod_usage_track.$(src_so)	"$(inst_so)" <.y
 	copy modules\metadata\$(LONG)\mod_usertrack.$(src_so) 	"$(inst_so)" <.y
 	copy modules\metadata\$(LONG)\mod_version.$(src_so) 	"$(inst_so)" <.y
 	copy modules\proxy\$(LONG)\mod_proxy.$(src_so) 		"$(inst_so)" <.y