Return-Path: Delivered-To: apmail-httpd-apreq-cvs-archive@www.apache.org Received: (qmail 10719 invoked from network); 30 Oct 2003 01:22:01 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 30 Oct 2003 01:22:01 -0000 Received: (qmail 16255 invoked by uid 500); 30 Oct 2003 01:21:45 -0000 Delivered-To: apmail-httpd-apreq-cvs-archive@httpd.apache.org Received: (qmail 16247 invoked by uid 500); 30 Oct 2003 01:21:45 -0000 Mailing-List: contact apreq-cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: apreq-dev@httpd.apache.org List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list apreq-cvs@httpd.apache.org Received: (qmail 16234 invoked by uid 500); 30 Oct 2003 01:21:45 -0000 Delivered-To: apmail-httpd-apreq-2-cvs@apache.org Received: (qmail 16231 invoked from network); 30 Oct 2003 01:21:45 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 30 Oct 2003 01:21:45 -0000 Received: (qmail 10696 invoked by uid 1221); 30 Oct 2003 01:22:00 -0000 Date: 30 Oct 2003 01:22:00 -0000 Message-ID: <20031030012200.10695.qmail@minotaur.apache.org> From: joes@apache.org To: httpd-apreq-2-cvs@apache.org Subject: cvs commit: httpd-apreq-2/glue/perl Makefile.PL X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N joes 2003/10/29 17:22:00 Modified: build xsbuilder.pl glue/perl Makefile.PL Log: Fix dynaloader version mismatch by overriding ExtUtils::XSBuilder::WrapXS::pm_text Revision Changes Path 1.17 +30 -1 httpd-apreq-2/build/xsbuilder.pl Index: xsbuilder.pl =================================================================== RCS file: /home/cvs/httpd-apreq-2/build/xsbuilder.pl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xsbuilder.pl 29 Oct 2003 17:58:00 -0000 1.16 +++ xsbuilder.pl 30 Oct 2003 01:22:00 -0000 1.17 @@ -186,7 +186,7 @@ package My::WrapXS; pop @dirs; # drop mod_h directories- WrapXS takes care of those use base qw/ExtUtils::XSBuilder::WrapXS/; -our $VERSION = '0.1'; +our $VERSION = $version; __PACKAGE__ -> $_ for @ARGV; sub parsesource_objects {[My::ParseSource->new]} @@ -217,6 +217,35 @@ while (<$pod>) { print $fh $_; } +} +sub pm_text { + my($self, $module, $isa, $code) = @_; + + return <{noedit_warning_hash} + +package $module; +require DynaLoader ; +use strict ; +use vars qw{\$VERSION \@ISA} ; +$isa +push \@ISA, 'DynaLoader' ; +\$VERSION = '$version'; +bootstrap $module \$VERSION ; + +# XXX How do we test for the appropriate modperl version? +# The modperl package isn't necessarily loaded, but Apache2 +# is. Perhaps Apache2 should always include a VERSION? + +die __PACKAGE__ . ": httpd must load mod_apreq.so first" + if __PACKAGE__->env ne "Apache::RequestRec"; + +$code + +1; +__END__ +EOF + } sub makefilepl_text { my($self, $class, $deps,$typemap) = @_; 1.9 +0 -1 httpd-apreq-2/glue/perl/Makefile.PL Index: Makefile.PL =================================================================== RCS file: /home/cvs/httpd-apreq-2/glue/perl/Makefile.PL,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.PL 28 Oct 2003 14:00:06 -0000 1.8 +++ Makefile.PL 30 Oct 2003 01:22:00 -0000 1.9 @@ -30,7 +30,6 @@ ModPerl::MM::WriteMakefile( NAME => 'libapreq2', - VERSION => '0.1', DIR => [qw(xs)], clean => { FILES => "xs t/logs t/TEST @scripts" }, realclean => { FILES => "xsbuilder/tables" },