Integrate mainline 5.05_61

[p5sagit/p5-mst-13.2.git] / lib / ExtUtils / MM_Unix.pm

diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 8d5646b..7c9657a 100644 (file)
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -389,7 +389,9 @@ sub cflags {
     }
 
     my $pollute = '';
-    if ($Config{usemymalloc} and $self->{PERL_MALLOC_OK}) {
+    if ($Config{usemymalloc} and not $Config{bincompat5005}
+       and not $Config{ccflags} =~ /-DPERL_POLLUTE_MALLOC\b/
+       and $self->{PERL_MALLOC_OK}) {
        $pollute = '$(PERL_MALLOC_DEF)';
     }
 
@@ -1792,7 +1794,7 @@ usually solves this kind of problem.
        $self->prefixify($install_variable,$configure_prefix,$replace_prefix);
     }
     my $funkylibdir = $self->catdir($configure_prefix,"lib","perl5");
-    $funkylibdir = '' unless -d $funklibdir;
+    $funkylibdir = '' unless -d $funkylibdir;
     $search_prefix = $funkylibdir || $self->catdir($configure_prefix,"lib");
     if ($self->{LIB}) {
        $self->{INSTALLPRIVLIB} = $self->{INSTALLSITELIB} = $self->{LIB};
@@ -1817,7 +1819,7 @@ usually solves this kind of problem.
        }
     }
     my $funkymandir = $self->catdir($configure_prefix,"lib","perl5","man");
-    $funkymandir = '' unless -d $funkmandir;
+    $funkymandir = '' unless -d $funkymandir;
     $search_prefix = $funkymandir || $self->catdir($configure_prefix,"man");
     if (-d $self->catdir($self->{PREFIX},"lib","perl5", "man")) {
        $replace_prefix = $self->catdir(qq[\$\(PREFIX\)],"lib", "perl5", "man");