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 d3fa66050076d0026949649402b524b0c2020edc..52295608fdaf9c9a75e0a84ff2b8adc3b12552f4 100644 (file)
--- 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 394af7a6e20107287ed1ece750756049acd8a30a..c1b91f6b4f0e0e7719605347af33fabb6d879d2e 100644 (file)
--- 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 80f2f82224c8b94219c9b0f378a6c6fe1eb439b2..19563da6df4a9590f8f8145d5184900f42957479 100644 (file)
--- 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 0170056cba6b1717b6b670bae1a51cf6045216a1..6a2c4cd0fb0cf30c517b06f49417a1effd3d66df 100644 (file)
--- 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 1960453bd8a76c332e24542ec78c83c54fbad6cf..1927d6263c1749c44f34b64065863faa9ccb0cf8 100644 (file)
--- 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)