Author: stas Date: Wed Apr 6 08:34:38 2005 New Revision: 160304 URL: http://svn.apache.org/viewcvs?view=rev&rev=160304 Log: Make sure that CPAN shell doesn't triple over usage of $ExtUtils::MakeMaker::VERSION
Modified: perl/modperl/trunk/Changes perl/modperl/trunk/lib/ModPerl/BuildMM.pm Modified: perl/modperl/trunk/Changes URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&r1=160303&r2=160304 ============================================================================== --- perl/modperl/trunk/Changes (original) +++ perl/modperl/trunk/Changes Wed Apr 6 08:34:38 2005 @@ -18,6 +18,9 @@ 1.99_XX. Please read the below changes carefully. *************************************************** +Make sure that CPAN shell doesn't triple over usage of +$ExtUtils::MakeMaker::VERSION [Randy Kobes] + make sure not to use apr_os_thread_current in debug mode when libapr wasn't built with threads support [Stas] Modified: perl/modperl/trunk/lib/ModPerl/BuildMM.pm URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/BuildMM.pm?view=diff&r1=160303&r2=160304 ============================================================================== --- perl/modperl/trunk/lib/ModPerl/BuildMM.pm (original) +++ perl/modperl/trunk/lib/ModPerl/BuildMM.pm Wed Apr 6 08:34:38 2005 @@ -189,8 +189,8 @@ # create a dependency on pm_to_blib subdirs linkext targets to # allow 'make -j' require ExtUtils::MakeMaker; - my $pm_to_blib = ($ExtUtils::MakeMaker::VERSION >= 6.22 && - $ExtUtils::MakeMaker::VERSION <= 6.25 ) + my $mm_ver = $ExtUtils::MakeMaker::VERSION; + my $pm_to_blib = ($mm_ver >= 6.22 && $mm_ver <= 6.25) ? "pm_to_blib.ts" : "pm_to_blib"; my @target = ("glue_pods: $pm_to_blib subdirs linkext");