From: Nick Kew <niq@apache.org>
Date: Tue, 22 Jun 2010 17:12:44 +0000 (+0000)
Subject: Support AP_DECLARE_MODULE declaration syntax in apxs
X-Git-Tag: 2.3.7~138
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57df737005090f0720d3ca65dcbbd42674b0e404;p=thirdparty%2Fapache%2Fhttpd.git

Support AP_DECLARE_MODULE declaration syntax in apxs


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

diff --git a/support/apxs.in b/support/apxs.in
index beb683ed582..39ff16cd3c3 100644
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -513,7 +513,7 @@ if ($opt_i or $opt_e) {
                 open(FP, "<$base.c");
                 my $content = join('', <FP>);
                 close(FP);
-                if ($content =~ m|.*module\s+(?:AP_MODULE_DECLARE_DATA\s+)?([a-zA-Z0-9_]+)_module\s*=\s*.*|s) {
+                if ($content =~ m|.*AP_DECLARE_MODULE\s*\(\s*([a-zA-Z0-9_]+)\s*\)\s*=.*|s || $content =~ m|.*module\s+(?:AP_MODULE_DECLARE_DATA\s+)?([a-zA-Z0-9_]+)_module\s*=\s*.*|s) {
                     $name = "$1";
                     $filename = "$base.c";
                     $filename =~ s|^[^/]+/||;