You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2010/06/22 19:12:45 UTC
svn commit: r956956 - /httpd/httpd/trunk/support/apxs.in
Author: niq
Date: Tue Jun 22 17:12:44 2010
New Revision: 956956
URL: http://svn.apache.org/viewvc?rev=956956&view=rev
Log:
Support AP_DECLARE_MODULE declaration syntax in apxs
Modified:
httpd/httpd/trunk/support/apxs.in
Modified: httpd/httpd/trunk/support/apxs.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/apxs.in?rev=956956&r1=956955&r2=956956&view=diff
==============================================================================
--- httpd/httpd/trunk/support/apxs.in (original)
+++ httpd/httpd/trunk/support/apxs.in Tue Jun 22 17:12:44 2010
@@ -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|^[^/]+/||;