From: Rainer Jung <rjung@apache.org>
Date: Sat, 6 Feb 2016 00:35:22 +0000 (+0000)
Subject: Add proxy_module to the list of symbols
X-Git-Tag: 2.5.0-alpha~2192
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f78bf69089d6abb5425f7618041184f8587ed79;p=thirdparty%2Fapache%2Fhttpd.git

Add proxy_module to the list of symbols
detected by Netware export/import awk
script.

We do not export proxy_module by putting it
into modules/proxy/NWGNUproxy explicitely,
because all accompanying proxy modules need
this symbol to access their config. So let
the awk script add proxy_module to the imp
file and then export it from mod_proxy and
import it to all other mod_proxy_xxx modules
via the imp file.


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

diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk
index 6b21a845917..c89d2de25ca 100644
--- a/build/make_nw_export.awk
+++ b/build/make_nw_export.awk
@@ -98,13 +98,12 @@ function add_symbol(sym_name) {
     add_symbol($NF)
 }
 
-/^[ \t]*PROXY_DECLARE_DATA (extern[ \t]+)?.*;/ {
+/^[ \t]*(extern[ \t]+(module[ \t]+)?)?PROXY_DECLARE_DATA .*;/ {
     gsub(/[*;\n\r]/, "")
     gsub(/\[.*\]/, "")
     add_symbol($NF)
 }
 
-
 END {
     printf("Added %d symbols to export list.\n", idx) > "/dev/stderr"
     # sort symbols with shell sort
diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index 5238b237721..8046880eec7 100644
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -222,7 +222,6 @@ endif
 #
 FILES_nlm_exports = \
 	@mod_proxy.imp \
-	proxy_module \
 	$(EOLIST)
 
 #