Look for a deeper clue into the existance of srclib/apr[-2.0], where

we won't have apr-util in that tree.

(The real patch, redux)

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

diff --git a/Makefile.win b/Makefile.win
index f0e0006f69f5de174ee2e3a7c1ba14ad3f5c0a75..b4a1a6f425b44a8aa1d0e44d8810610959e016d4 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -63,7 +63,7 @@ default: _apacher
 CTARGET=/build
 !ENDIF
 
-!IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util") || !EXIST("srclib\apr-iconv")
+!IF !EXIST("srclib\apr") || (!(EXIST("srclib\apr\include\apu.hw") || !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!