stas 2003/03/21 23:21:37
Modified: . Changes Makefile.PL
ModPerl-Registry Makefile.PL
lib/ModPerl MM.pm WrapXS.pm
xs Makefile.PL
xs/APR Makefile.PL
xs/APR/APR Makefile.PL
xs/APR/Const Makefile.PL
xs/APR/PerlIO Makefile.PL
xs/Apache Makefile.PL
xs/Apache/Const Makefile.PL
xs/ModPerl Makefile.PL
xs/ModPerl/Const Makefile.PL
Added: lib/ModPerl BuildMM.pm
Log:
- provide a workaround for ExtUtils::MakeMaker::mv_all_methods, so
ModPerl::BuildMM and ModPerl::MM can override EU::MM methods behind
the scenes.
- adding ModPerl::BuildMM, which is now used for building mod_perl.
ModPerl::MM will be used for 3rd party modules. ModPerl::BuildMM
reuses ModPerl::MM where possible.
Revision Changes Path
1.154 +8 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- Changes 22 Mar 2003 03:19:11 -0000 1.153
+++ Changes 22 Mar 2003 07:21:36 -0000 1.154
@@ -10,6 +10,14 @@
=item 1.99_09-dev
+provide a workaround for ExtUtils::MakeMaker::mv_all_methods, so
+ModPerl::BuildMM and ModPerl::MM can override EU::MM methods behind
+the scenes. [Stas]
+
+adding ModPerl::BuildMM, which is now used for building mod_perl.
+ModPerl::MM will be used for 3rd party modules. ModPerl::BuildMM
+reuses ModPerl::MM where possible. [Stas]
+
drop the glue code for apr_generate_random_bytes, since it's not
available on all platforms. [Stas]
1.96 +5 -5 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- Makefile.PL 18 Mar 2003 05:37:10 -0000 1.95
+++ Makefile.PL 22 Mar 2003 07:21:36 -0000 1.96
@@ -31,7 +31,7 @@
use Apache::TestTrace;
use ModPerl::TestRun ();
use ModPerl::Code ();
-use ModPerl::MM ();
+use ModPerl::BuildMM ();
use constant WIN32 => Apache::Build::WIN32;
@@ -59,7 +59,7 @@
configure();
-local %ModPerl::MM::PM = (
+local %ModPerl::BuildMM::PM = (
'lib/typemap' => 'blib/lib/Apache2/typemap',
'lib/Apache2.pm' => 'blib/lib/Apache2.pm',
);
@@ -69,7 +69,7 @@
my @xs_h_files = map catfile("xs", $_),
qw(modperl_xs_sv_convert.h modperl_xs_typedefs.h modperl_xs_util.h);
-ModPerl::MM::WriteMakefile(
+ModPerl::BuildMM::WriteMakefile(
NAME => 'mod_perl',
VERSION => $VERSION,
DIR => get_dirs_with_makefile(@remote_makefile_dirs),
@@ -79,7 +79,7 @@
MAKE_F => '$(MAKE) ' . (WIN32 ? '/f' : '-f'),
MODPERL_LIBMAKE => '$(MAKE) -f $(MODPERL_MAKEFILE)',
PERL => $build->perl_config('perlpath'),
- MOD_INSTALL => ModPerl::MM::mod_install(),
+ MOD_INSTALL => ModPerl::BuildMM::mod_install(),
MODPERL_AP_INCLUDEDIR => $build->apxs('-q' => 'INCLUDEDIR'),
MODPERL_XS_H_FILES => join(" \\\n\t", @xs_h_files),
},
@@ -177,7 +177,7 @@
debug "unlink...$_" if -e $_ && unlink;
}
- #ModPerl::MM will use Apache::BuildConfig in subdir/Makefile.PL's
+ #ModPerl::BuildMM will use Apache::BuildConfig in subdir/Makefile.PL's
$build->save;
for my $util (qw(Report Smoke)) {
1.8 +2 -2 modperl-2.0/ModPerl-Registry/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/Makefile.PL,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.PL 7 Feb 2003 00:08:34 -0000 1.7
+++ Makefile.PL 22 Mar 2003 07:21:36 -0000 1.8
@@ -4,7 +4,7 @@
use lib map {($_, "../$_") } qw(lib Apache-Test/lib);
-use ModPerl::MM ();
+use ModPerl::BuildMM ();
use Apache::TestSmokePerl ();
# enable 'make test|clean'
@@ -24,7 +24,7 @@
# t/SMOKE
Apache::TestSmokePerl->generate_script;
-ModPerl::MM::WriteMakefile(
+ModPerl::BuildMM::WriteMakefile(
NAME => 'ModPerl::Registry',
VERSION_FROM => 'lib/ModPerl/RegistryCooker.pm',
PREREQ_PM => \%require,
1.24 +60 -68 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- MM.pm 14 Mar 2003 01:51:50 -0000 1.23
+++ MM.pm 22 Mar 2003 07:21:36 -0000 1.24
@@ -9,24 +9,54 @@
our %PM; #add files to installation
+# MM methods that this package overrides
+no strict 'refs';
+my $stash = \%{__PACKAGE__ . '::MY::'};
+my @methods = grep *{$stash->{$_}}{CODE}, keys %$stash;
+my $eu_mm_mv_all_methods_overriden = 0;
+
+use strict 'refs';
+
+sub override_eu_mm_mv_all_methods {
+ my @methods = @_;
+
+ my $orig_sub = \&ExtUtils::MakeMaker::mv_all_methods;
+ no warnings 'redefine';
+ *ExtUtils::MakeMaker::mv_all_methods = sub {
+ # do the normal move
+ $orig_sub->(@_);
+ # for all the overloaded methods mv_all_method installs a stab
+ # eval "package MY; sub $method { shift->SUPER::$method([EMAIL PROTECTED]);
}";
+ # therefore we undefine our methods so on the recursive invocation of
+ # Makefile.PL they will be undef, unless defined in Makefile.PL
+ # and my_import will override these methods properly
+ for my $sym (@methods) {
+ my $name = "MY::$sym";
+ undef &$name if defined &$name;
+ }
+ };
+}
+
#to override MakeMaker MOD_INSTALL macro
sub mod_install {
- # XXX: adding -MApache2 here so 3rd party modules could use this macro,
- # taking into account that we can't do -MApache2 when installing
- # mod_perl itself, when installed for the first time.
- # may be should have different macros for core build and modules build
- q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" .
- q{-e "BEGIN { eval {require Apache2} } use ModPerl::MM; \\}."\n" .
- q{ModPerl::MM::install([EMAIL PROTECTED],'$(VERBINST)',0,'$(UNINST)');"}."\n";
-
- # the original was:
- # q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) -MModPerl::MM \\}."\n" .
- # q{-e "ModPerl::MM::install([EMAIL
PROTECTED],'$(VERBINST)',0,'$(UNINST)');"}."\n";
+ # adding -MApache2 here so 3rd party modules could use this macro,
+ q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) -MApache2 -MModPerl::MM \\}."\n" .
+ q{-e "ModPerl::MM::install([EMAIL
PROTECTED],'$(VERBINST)',0,'$(UNINST)');"}."\n";
}
sub add_dep {
my($string, $targ, $add) = @_;
- $$string =~ s/($targ\s+::)/$1 $add /;
+ $$string =~ s/($targ\s+::)/$1 $add/;
+}
+
+sub add_dep_before {
+ my($string, $targ, $before_targ, $add) = @_;
+ $$string =~ s/($targ\s+::.*?) ($before_targ)/$1 $add $2/;
+}
+
+sub add_dep_after {
+ my($string, $targ, $after_targ, $add) = @_;
+ $$string =~ s/($targ\s+::.*?$after_targ)/$1 $add/;
}
sub build_config {
@@ -55,19 +85,31 @@
#so alias them each time WriteMakefile is called in a subdir
sub my_import {
+ my $package = shift;
no strict 'refs';
- my $stash = \%{__PACKAGE__ . '::MY::'};
+ my $stash = \%{$package . '::MY::'};
for my $sym (keys %$stash) {
next unless *{$stash->{$sym}}{CODE};
my $name = "MY::$sym";
- undef &$name if defined &$name;
+ # the method is defined in Makefile.PL
+ next if defined &$name;
+ # do the override behind the scenes
*$name = *{$stash->{$sym}}{CODE};
}
}
sub WriteMakefile {
+
+ # override ExtUtils::MakeMaker::mv_all_methods
+ # can't do that on loading since ModPerl::MM is also use()'d
+ # by ModPerl::BuildMM which itself overrides it
+ unless ($eu_mm_mv_all_methods_overriden) {
+ override_eu_mm_mv_all_methods(@methods);
+ $eu_mm_mv_all_methods_overriden++;
+ }
+
my $build = build_config();
- my_import();
+ my_import(__PACKAGE__);
my $inc = $build->inc;
if (my $glue_inc = $build->{MP_XS_GLUE_DIR}) {
@@ -101,9 +143,6 @@
ExtUtils::MakeMaker::WriteMakefile(@opts, @_);
}
-my %always_dynamic = map { $_, 1 }
- qw(ModPerl::Const Apache::Const APR::Const APR APR::PerlIO);
-
sub ModPerl::MM::MY::constants {
my $self = shift;
@@ -115,29 +154,6 @@
$self->{INST_LIB} .= '/Apache2';
}
- #"discover" xs modules. since there is no list hardwired
- #any module can be unpacked in the mod_perl-2.xx directory
- #and built static
-
- #this stunt also make it possible to leave .xs files where
- #they are, unlike 1.xx where *.xs live in src/modules/perl
- #and are copied to subdir/ if DYNAMIC=1
-
- if ($build->{MP_STATIC_EXTS}) {
- #skip .xs -> .so if we are linking static
- my $name = $self->{NAME};
- unless ($always_dynamic{$name}) {
- if (my($xs) = keys %{ $self->{XS} }) {
- $self->{HAS_LINK_CODE} = 0;
- print "$name will be linked static\n";
- #propagate static xs module to src/modules/perl/Makefile
- $build->{XS}->{$name} =
- join '/', Cwd::fastcwd(), $xs;
- $build->save;
- }
- }
- }
-
$self->MM::constants;
}
@@ -148,7 +164,7 @@
my $build = build_config();
my $pm = $self->{PM};
- while (my($k,$v) = each %PM) {
+ while (my($k, $v) = each %PM) {
if (-e $k) {
$pm->{$k} = $v;
}
@@ -159,15 +175,11 @@
#gets installed into Apache2/
if ($build->{MP_INST_APACHE2}) {
while (my($k, $v) = each %$pm) {
- #up one from the Apache2/ subdir
- #so it can be found for 'use Apache2 ()'
- next if $v =~ /Apache2\.pm$/;
-
- #move everything else to the Apache2/ subdir
+ #move everything to the Apache2/ subdir
#unless already specified with \$(INST_LIB)
#or already in Apache2/
unless ($v =~ /Apache2/) {
- $v =~ s,(blib/lib),$1/Apache2,;
+ $v =~ s|(blib/lib)|$1/Apache2|;
}
$pm->{$k} = $v;
@@ -175,26 +187,6 @@
}
'';
-}
-
-sub ModPerl::MM::MY::libscan {
- my($self, $path) = @_;
-
- if (Apache::Build::WIN32() and $path eq 'PerlIO') {
- return ''; #XXX: APR::PerlIO does not link on win32
- }
-
- my $apr_config = build_config()->get_apr_config();
-
- if ($path =~ m/(Thread|Global)Mutex/) {
- return unless $apr_config->{HAS_THREADS};
- }
-
- return '' if $path =~ m/\.(pl|cvsignore)$/;
- return '' if $path =~ m:\bCVS/:;
- return '' if $path =~ m/~$/;
-
- $path;
}
1;
1.50 +2 -2 modperl-2.0/lib/ModPerl/WrapXS.pm
Index: WrapXS.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/WrapXS.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- WrapXS.pm 13 Mar 2003 00:47:54 -0000 1.49
+++ WrapXS.pm 22 Mar 2003 07:21:36 -0000 1.50
@@ -307,9 +307,9 @@
$noedit_warning
use lib qw(../../../lib); #for Apache::BuildConfig
-use ModPerl::MM ();
+use ModPerl::BuildMM ();
-ModPerl::MM::WriteMakefile(
+ModPerl::BuildMM::WriteMakefile(
'NAME' => '$class',
'VERSION' => '0.01',
'depend' => $deps,
1.1 modperl-2.0/lib/ModPerl/BuildMM.pm
Index: BuildMM.pm
===================================================================
package ModPerl::BuildMM;
use strict;
use warnings;
use ModPerl::MM;
use ExtUtils::MakeMaker ();
use Cwd ();
use Apache::Build ();
use File::Spec;
our %PM; #add files to installation
# MM methods that this package overrides
no strict 'refs';
my $stash = \%{__PACKAGE__ . '::MY::'};
my @methods = grep *{$stash->{$_}}{CODE}, keys %$stash;
ModPerl::MM::override_eu_mm_mv_all_methods(@methods);
use strict 'refs';
#to override MakeMaker MOD_INSTALL macro
sub mod_install {
q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) -MModPerl::BuildMM \\}."\n" .
q{-e "ModPerl::MM::install([EMAIL
PROTECTED],'$(VERBINST)',0,'$(UNINST)');"}."\n";
}
sub build_config {
my $key = shift;
my $build = Apache::Build->build_config;
return $build unless $key;
$build->{$key};
}
#the parent WriteMakefile moves MY:: methods into a different class
#so alias them each time WriteMakefile is called in a subdir
sub my_import {
no strict 'refs';
my $stash = \%{__PACKAGE__ . '::MY::'};
for my $sym (keys %$stash) {
next unless *{$stash->{$sym}}{CODE};
my $name = "MY::$sym";
undef &$name if defined &$name;
*$name = *{$stash->{$sym}}{CODE};
}
}
sub WriteMakefile {
my %args = @_;
my $build = build_config();
ModPerl::MM::my_import(__PACKAGE__);
my $inc = $build->inc;
if (my $glue_inc = $build->{MP_XS_GLUE_DIR}) {
for (split /\s+/, $glue_inc) {
$inc .= " -I$_";
}
}
my $libs = join ' ', $build->apache_libs, $build->modperl_libs;
my $ccflags = $build->perl_ccopts . $build->ap_ccopts;
my @opts = (
INC => $inc,
CCFLAGS => $ccflags,
OPTIMIZE => $build->perl_config('optimize'),
LDDLFLAGS => $build->perl_config('lddlflags'),
LIBS => $libs,
dynamic_lib => { OTHERLDFLAGS => $build->otherldflags },
);
my @typemaps;
my $pwd = Cwd::fastcwd();
for ('xs', $pwd, "$pwd/..") {
my $typemap = $build->file_path("$_/typemap");
if (-e $typemap) {
push @typemaps, $typemap;
}
}
push @opts, TYPEMAPS => [EMAIL PROTECTED] if @typemaps;
ExtUtils::MakeMaker::WriteMakefile(@opts, %args);
}
my %always_dynamic = map { $_, 1 }
qw(ModPerl::Const Apache::Const APR::Const APR APR::PerlIO);
sub ModPerl::BuildMM::MY::constants {
my $self = shift;
my $build = build_config();
#install everything relative to the Apache2/ subdir
if ($build->{MP_INST_APACHE2}) {
$self->{INST_ARCHLIB} .= '/Apache2';
$self->{INST_LIB} .= '/Apache2';
}
#"discover" xs modules. since there is no list hardwired
#any module can be unpacked in the mod_perl-2.xx directory
#and built static
#this stunt also make it possible to leave .xs files where
#they are, unlike 1.xx where *.xs live in src/modules/perl
#and are copied to subdir/ if DYNAMIC=1
if ($build->{MP_STATIC_EXTS}) {
#skip .xs -> .so if we are linking static
my $name = $self->{NAME};
unless ($always_dynamic{$name}) {
if (my($xs) = keys %{ $self->{XS} }) {
$self->{HAS_LINK_CODE} = 0;
print "$name will be linked static\n";
#propagate static xs module to src/modules/perl/Makefile
$build->{XS}->{$name} =
join '/', Cwd::fastcwd(), $xs;
$build->save;
}
}
}
$self->MM::constants;
}
sub ModPerl::BuildMM::MY::post_initialize {
my $self = shift;
my $build = build_config();
my $pm = $self->{PM};
while (my($k, $v) = each %PM) {
if (-e $k) {
$pm->{$k} = $v;
}
}
#not everything in MakeMaker uses INST_LIB
#so we have do fixup a few PMs to make sure *everything*
#gets installed into Apache2/
if ($build->{MP_INST_APACHE2}) {
while (my($k, $v) = each %$pm) {
#up one from the Apache2/ subdir
#so it can be found for 'use Apache2 ()'
next if $v =~ /Apache2\.pm$/;
#move everything else to the Apache2/ subdir
#unless already specified with \$(INST_LIB)
#or already in Apache2/
unless ($v =~ /Apache2/) {
$v =~ s|(blib/lib)|$1/Apache2|;
}
$pm->{$k} = $v;
}
}
'';
}
sub ModPerl::BuildMM::MY::libscan {
my($self, $path) = @_;
if (Apache::Build::WIN32() and $path eq 'PerlIO') {
return ''; #XXX: APR::PerlIO does not link on win32
}
my $apr_config = build_config()->get_apr_config();
if ($path =~ m/(Thread|Global)Mutex/) {
return unless $apr_config->{HAS_THREADS};
}
return '' if $path =~ m/\.(pl|cvsignore)$/;
return '' if $path =~ m:\bCVS/:;
return '' if $path =~ m/~$/;
$path;
}
1;
1.3 +5 -3 modperl-2.0/xs/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Makefile.PL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.PL 6 Apr 2002 04:42:00 -0000 1.2
+++ Makefile.PL 22 Mar 2003 07:21:37 -0000 1.3
@@ -1,5 +1,7 @@
use lib qw(../lib);
-use ModPerl::MM ();
+use ModPerl::BuildMM ();
-ModPerl::MM::WriteMakefile(NAME => "ModPerl::XS",
- VERSION => '0.01');
+ModPerl::BuildMM::WriteMakefile(
+ NAME => "ModPerl::XS",
+ VERSION => '0.01'
+);
1.3 +5 -3 modperl-2.0/xs/APR/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/Makefile.PL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.PL 6 Apr 2002 04:42:00 -0000 1.2
+++ Makefile.PL 22 Mar 2003 07:21:37 -0000 1.3
@@ -1,5 +1,7 @@
use lib qw(../lib);
-use ModPerl::MM ();
+use ModPerl::BuildMM ();
-ModPerl::MM::WriteMakefile(NAME => "APR",
- VERSION => '0.01');
+ModPerl::BuildMM::WriteMakefile(
+ NAME => "APR",
+ VERSION => '0.01'
+);
1.8 +3 -3 modperl-2.0/xs/APR/APR/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/APR/Makefile.PL,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.PL 15 Dec 2002 08:49:24 -0000 1.7
+++ Makefile.PL 22 Mar 2003 07:21:37 -0000 1.8
@@ -1,8 +1,8 @@
use lib qw(../lib);
-use ModPerl::MM ();
+use ModPerl::BuildMM ();
use Config;
-my $prefix = ModPerl::MM::build_config()->apxs(-q => 'PREFIX');
+my $prefix = ModPerl::BuildMM::build_config()->apxs(-q => 'PREFIX');
# XXX: this works only with libapr 0.9.2+ (not on win32)
my @libs = grep $_, map { -x $_ && qx{$_ --link-ld} }
@@ -11,7 +11,7 @@
my $define = @libs ? '-DMP_HAVE_APR_LIBS' : '';
-ModPerl::MM::WriteMakefile(
+ModPerl::BuildMM::WriteMakefile(
'NAME' => 'APR',
'VERSION_FROM' => 'APR.pm',
'LIBS' => [EMAIL PROTECTED],
1.2 +2 -2 modperl-2.0/xs/APR/Const/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/Const/Makefile.PL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.PL 11 Apr 2001 22:50:53 -0000 1.1
+++ Makefile.PL 22 Mar 2003 07:21:37 -0000 1.2
@@ -1,7 +1,7 @@
use lib qw(../lib);
-use ModPerl::MM ();
+use ModPerl::BuildMM ();
-ModPerl::MM::WriteMakefile(
+ModPerl::BuildMM::WriteMakefile(
NAME => 'APR::Const',
VERSION_FROM => 'Const.pm',
);
1.2 +2 -2 modperl-2.0/xs/APR/PerlIO/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/PerlIO/Makefile.PL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.PL 17 Dec 2001 16:20:27 -0000 1.1
+++ Makefile.PL 22 Mar 2003 07:21:37 -0000 1.2
@@ -1,7 +1,7 @@
use lib qw(../lib);
-use ModPerl::MM ();
+use ModPerl::BuildMM ();
-ModPerl::MM::WriteMakefile(
+ModPerl::BuildMM::WriteMakefile(
NAME => 'APR::PerlIO',
VERSION_FROM => 'PerlIO.pm',
OBJECT => 'PerlIO.o apr_perlio.o');
1.3 +5 -3 modperl-2.0/xs/Apache/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/Makefile.PL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.PL 6 Apr 2002 04:42:00 -0000 1.2
+++ Makefile.PL 22 Mar 2003 07:21:37 -0000 1.3
@@ -1,5 +1,7 @@
use lib qw(../lib);
-use ModPerl::MM ();
+use ModPerl::BuildMM ();
-ModPerl::MM::WriteMakefile(NAME => "Apache",
- VERSION => '0.01');
+ModPerl::BuildMM::WriteMakefile(
+ NAME => "Apache",
+ VERSION => '0.01'
+);
1.2 +2 -2 modperl-2.0/xs/Apache/Const/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/Const/Makefile.PL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.PL 11 Apr 2001 22:50:10 -0000 1.1
+++ Makefile.PL 22 Mar 2003 07:21:37 -0000 1.2
@@ -1,7 +1,7 @@
use lib qw(../lib);
-use ModPerl::MM ();
+use ModPerl::BuildMM ();
-ModPerl::MM::WriteMakefile(
+ModPerl::BuildMM::WriteMakefile(
NAME => 'Apache::Const',
VERSION_FROM => 'Const.pm',
);
1.3 +5 -3 modperl-2.0/xs/ModPerl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/ModPerl/Makefile.PL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.PL 6 Apr 2002 04:42:00 -0000 1.2
+++ Makefile.PL 22 Mar 2003 07:21:37 -0000 1.3
@@ -1,5 +1,7 @@
use lib qw(../lib);
-use ModPerl::MM ();
+use ModPerl::BuildMM ();
-ModPerl::MM::WriteMakefile(NAME => "ModPerl",
- VERSION => '0.01');
+ModPerl::BuildMM::WriteMakefile(
+ NAME => "ModPerl",
+ VERSION => '0.01'
+);
1.3 +2 -2 modperl-2.0/xs/ModPerl/Const/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/ModPerl/Const/Makefile.PL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.PL 21 Oct 2001 23:01:54 -0000 1.2
+++ Makefile.PL 22 Mar 2003 07:21:37 -0000 1.3
@@ -1,5 +1,5 @@
use lib qw(../lib);
-use ModPerl::MM ();
+use ModPerl::BuildMM ();
my $srcdir = '../../../src/modules/perl';
#link these two into Const.so so constants can be used outside of httpd
@@ -13,7 +13,7 @@
$src{$cfile} = "$srcdir/$cfile";
}
-ModPerl::MM::WriteMakefile(
+ModPerl::BuildMM::WriteMakefile(
NAME => 'ModPerl::Const',
VERSION_FROM => 'Const.pm',
OBJECT => "Const.o @obj",
