[Bast-commits] r3755 - local-lib/1.000/trunk

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2007-09-17 21:20:58 +0100 (Mon, 17 Sep 2007)
New Revision: 3755

Modified:
   local-lib/1.000/trunk/Makefile.PL
Log:
diffs from apeiron

Modified: local-lib/1.000/trunk/Makefile.PL
===================================================================
--- local-lib/1.000/trunk/Makefile.PL	2007-09-17 01:45:10 UTC (rev 3754)
+++ local-lib/1.000/trunk/Makefile.PL	2007-09-17 20:20:58 UTC (rev 3755)
@@ -18,13 +18,23 @@
     push(@ARGV,$ENV{PERL_MM_OPT});
 
     system($^X, '-MExtUtils::MakeMaker 6.31', '-e1');
-    my $r = $? >> 8;
+    my $eumm = $? >> 8;
 
+    system($^X, '-MCPAN 1.80', '-e1');
+    my $cpan = $? >> 8;
+    my $cpan_command = '';
+
     # XXX - remove the force on EUMM once its test suite survive PERL_MM_OPT
 
-    if ($r) { # non-zero exit
-      system($^X, '-MCPAN', '-e', 'force("install","ExtUtils::MakeMaker");');
+    if ($eumm) { # non-zero exit
+      $cpan_command .= 'force("install","ExtUtils::MakeMaker"); ';
     }
+    if ($cpan) {
+      $cpan_command .= 'install("CPAN"); ';
+    }
+    if(length $cpan_command) {
+      system($^X, '-MCPAN', '-e', $cpan_command);
+    }
 
   }
 }
@@ -34,12 +44,6 @@
 name 'local-lib';
 all_from 'lib/local/lib.pm';
 
-include('CPAN');
-include('CPAN::HandleConfig');
-include('CPAN::Debug');
-include('CPAN::Version');
-include('CPAN::Tarzip');
-
 requires 'ExtUtils::MakeMaker' => '6.31'; # version INSTALL_BASE was added
 requires 'ExtUtils::CBuilder'; # this and ParseXS are needed for MB C_support
 requires 'ExtUtils::ParseXS';