From: Guenter Knauf <fuankg@apache.org>
Date: Thu, 9 Aug 2012 11:15:45 +0000 (+0000)
Subject: NetWare build tweaks.
X-Git-Tag: 2.4.3~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80bd011f46b74a0d3ed3852a85b9c37ccd74e1cc;p=apache

NetWare build tweaks.
mwccnlm: search directory of referencing file first for #includes.
(backport r1370592, 1370615)
Make use of CFLAGS from environment.
Added default maxerrors value 1 so that the compiler breaks
after 1st error; can be overwritten with CC_MAX_ERRORS var.
(backport 1370616)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1371164 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index d3fa660500..52295608fd 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -230,7 +230,7 @@ endif
 # The default flags are as follows:
 #
 # -c                    compile only, no link
-# -nosyspath            treat #include <...> like #include "..."
+# -gccinc               search directory of referencing file first for #includes
 # -Cpp_exceptions off   disable C++ exceptions
 # -RTTI off             disable C++ run-time typing information
 # -align 4              align on 4 byte bounderies
@@ -238,7 +238,13 @@ endif
 # -proc PII             generate code base on Pentium II instruction set
 # -inst mmx             use MMX extensions (Not used)
 
-CFLAGS = -c -nosyspath -Cpp_exceptions off -RTTI off -align 4 -w nocmdline -proc PII
+CFLAGS += -c -w nocmdline -gccinc -Cpp_exceptions off -RTTI off -align 4 -proc PII
+
+ifdef CC_MAX_ERRORS
+CFLAGS += -maxerrors $(CC_MAX_ERRORS)
+else
+CFLAGS += -maxerrors 1
+endif
 
 ifeq "$(REQUIRE_PROTOTYPES)" "1"
 CFLAGS += -r
diff --git a/modules/proxy/NWGNUproxylbm_busy b/modules/proxy/NWGNUproxylbm_busy
index 394af7a6e2..c1b91f6b4f 100644
--- a/modules/proxy/NWGNUproxylbm_busy
+++ b/modules/proxy/NWGNUproxylbm_busy
@@ -19,6 +19,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(AP_WORK)/include \
+			$(AP_WORK)/modules/proxy \
 			$(AP_WORK)/modules/http \
 			$(NWOS) \
 			$(EOLIST)
diff --git a/modules/proxy/NWGNUproxylbm_hb b/modules/proxy/NWGNUproxylbm_hb
index 80f2f82224..19563da6df 100644
--- a/modules/proxy/NWGNUproxylbm_hb
+++ b/modules/proxy/NWGNUproxylbm_hb
@@ -19,6 +19,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(AP_WORK)/include \
+			$(AP_WORK)/modules/proxy \
 			$(AP_WORK)/modules/http \
 			$(NWOS) \
 			$(EOLIST)
diff --git a/modules/proxy/NWGNUproxylbm_req b/modules/proxy/NWGNUproxylbm_req
index 0170056cba..6a2c4cd0fb 100644
--- a/modules/proxy/NWGNUproxylbm_req
+++ b/modules/proxy/NWGNUproxylbm_req
@@ -19,6 +19,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(AP_WORK)/include \
+			$(AP_WORK)/modules/proxy \
 			$(AP_WORK)/modules/http \
 			$(NWOS) \
 			$(EOLIST)
diff --git a/modules/proxy/NWGNUproxylbm_traf b/modules/proxy/NWGNUproxylbm_traf
index 1960453bd8..1927d6263c 100644
--- a/modules/proxy/NWGNUproxylbm_traf
+++ b/modules/proxy/NWGNUproxylbm_traf
@@ -19,6 +19,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(AP_WORK)/include \
+			$(AP_WORK)/modules/proxy \
 			$(AP_WORK)/modules/http \
 			$(NWOS) \
 			$(EOLIST)