dougm 02/05/21 10:42:39
Modified: lib/Apache Build.pm
lib/ModPerl MM.pm
Log:
get MP_STATIC_EXTS=1 working again
Revision Changes Path
1.90 +6 -3 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- Build.pm 21 May 2002 16:59:02 -0000 1.89
+++ Build.pm 21 May 2002 17:42:39 -0000 1.90
@@ -744,7 +744,7 @@
'$(MODPERL_PRIVLIBEXP)/ExtUtils/xsubpp',
'-typemap', '$(MODPERL_PRIVLIBEXP)/ExtUtils/typemap';
- my $typemap = $self->file_path('src/modules/perl/typemap');
+ my $typemap = $self->file_path('lib/typemap');
if (-e $typemap) {
$xsubpp .= join ' ',
' -typemap', $typemap;
@@ -764,8 +764,11 @@
my @xs_targ;
while (my($name, $xs) = each %{ $self->{XS} }) {
- #Foo/Bar.xs => Bar.c
- (my $c = $xs) =~ s:.*/(\w+)\.xs$:$1.c:;
+ #Foo/Bar.xs => Foo_Bar.c
+ (my $c = $xs) =~ s:.*?WrapXS/::;
+ $c =~ s:/:_:g;
+ $c =~ s:\.xs$:.c:;
+
push @files, $c;
push @xs_targ, <<EOF;
1.20 +2 -1 modperl-2.0/lib/ModPerl/MM.pm
Index: MM.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MM.pm 14 May 2002 18:22:06 -0000 1.19
+++ MM.pm 21 May 2002 17:42:39 -0000 1.20
@@ -92,7 +92,8 @@
ExtUtils::MakeMaker::WriteMakefile(@opts, @_);
}
-my %always_dynamic = map { $_, 1 } qw(ModPerl::Const Apache::Const APR::Const);
+my %always_dynamic = map { $_, 1 }
+ qw(ModPerl::Const Apache::Const APR::Const APR APR::PerlIO);
sub ModPerl::MM::MY::constants {
my $self = shift;
