summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2010-11-04 22:58:47 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2010-11-04 22:58:47 +0000
commit476c2bc96715dcf722a180bcf21cdc4326e1aea6 (patch)
tree09998bb83510b34cbc7f3f0b177bd339a9aa2a9c
parent7ce2d7adfb0cb0f86d07a59c61545793adff31bb (diff)
downloadhttpd-476c2bc96715dcf722a180bcf21cdc4326e1aea6.tar.gz
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
-rw-r--r--Makefile.win2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.win b/Makefile.win
index f0e0006f69..b4a1a6f425 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!