dougm 00/06/11 20:25:04
Modified: . Makefile.PL
lib/Apache Build.pm
Log:
a few tweaks
Revision Changes Path
1.21 +2 -4 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile.PL 2000/05/26 18:35:15 1.20
+++ Makefile.PL 2000/06/12 03:25:04 1.21
@@ -52,7 +52,7 @@
$httpd_version, $VERSION, $^V;
for (@{ clean_files() }) {
- unlink;
+ print "unlink...$_\n" if -e $_ && unlink;
}
#ModPerl::MM will use Apache::BuildConfig in subdir/Makefile.PL's
@@ -61,10 +61,8 @@
sub post_configure {
- #didn't exist until configure()
- require Apache::BuildConfig;
#now have any data subdir/Makefile.PL's save, e.g. XS
- $build = Apache::BuildConfig->new;
+ $build = Apache::Build->build_config;
$build->write_src_makefile;
$build->save_ldopts;
1.20 +7 -2 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Build.pm 2000/06/09 04:30:41 1.19
+++ Build.pm 2000/06/12 03:25:04 1.20
@@ -520,7 +520,7 @@
my $typemap = $self->file_path('src/modules/perl/typemap');
if (-e $typemap) {
$xsubpp .= join ' ',
- '-typemap', $typemap;
+ ' -typemap', $typemap;
}
$xsubpp;
@@ -564,7 +564,7 @@
}
my @perl_config_pm =
- qw(cc ld ar rm ranlib lib_ext dlext cccdlflags lddlflags optimize
+ qw(cc ld ar rm ranlib lib_ext dlext cccdlflags lddlflags
perlpath privlibexp);
sub make_tools {
@@ -574,6 +574,11 @@
for (@perl_config_pm) {
print $fh $self->canon_make_attr($_, $self->perl_config($_));
+ }
+ unless ($self->{MP_DEBUG}) {
+ for (qw(optimize)) {
+ print $fh $self->canon_make_attr($_, $self->perl_config($_));
+ }
}
print $fh $self->canon_make_attr('RM_F' => #XXX
