From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 4 Nov 2010 22:58:47 +0000 (+0000)
Subject: Look for a deeper clue into the existance of srclib/apr[-2.0], where
X-Git-Tag: 2.3.9~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=476c2bc96715dcf722a180bcf21cdc4326e1aea6;p=thirdparty%2Fapache%2Fhttpd.git

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 f0e0006f69f..b4a1a6f425b 100644
--- 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!