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 6b21a8459173d4eeaeb8c81e3bc5bdfa87dde195..c89d2de25caf1284da117c438f548eb4507e350e 100644 (file)
--- 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 5238b2377217c5cd58505e2d26012e4a3d3c7377..8046880eec788c542fa18c7a8d0796721669a0cf 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -222,7 +222,6 @@ endif
 #
 FILES_nlm_exports = \
        @mod_proxy.imp \
-       proxy_module \
        $(EOLIST)
 
 #