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 beb683ed58220cb13336018d178948032cdee359..39ff16cd3c31f886515177cb523b9d8e87afdb9e 100644 (file)
--- 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|^[^/]+/||;