From: t0m <t0m@bd8105ee-0ff8-0310-8827-fb3f25b6796d>
Date: Sun, 2 Aug 2009 23:45:11 +0000 (+0000)
Subject: Damn slow lorries
X-Git-Tag: 1.006009~67
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2Flocal-lib.git;a=commitdiff_plain;h=e9227729ee8aebe46ebfb26f3daed2a0c4899c9f

Damn slow lorries

git-svn-id: http://dev.catalyst.perl.org/repos/bast/local-lib/1.000/trunk@7168 bd8105ee-0ff8-0310-8827-fb3f25b6796d
---

diff --git a/Changes b/Changes
index 2a15a96..eb4c813 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for local::lib
 
+        - Add dependency on Extutils::Install 1.43 and install in --bootstrap
+          otherwise we fail to build with latest MakeMaker on OpenSolaris (t0m)
+
 1.004003 2009-16-16
         - Stop Makefile.PL exploding if your CPAN is too old to have
           CPAN::HandleConfig. Needed when installing local::lib via CPAN
diff --git a/Makefile.PL b/Makefile.PL
index d232325..504cc49 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -46,6 +46,9 @@ DEATH
     system($^X, '-MExtUtils::MakeMaker 6.31', '-e1');
     my $eumm = $? >> 8;
 
+    system($^X, '-MExtUtils::Install 1.43', '-e1');
+    my $eui = $? >> 8;
+
     system($^X, '-MCPAN 1.80', '-e1');
     my $cpan = $? >> 8;
     my $cpan_command = '';
@@ -76,6 +79,9 @@ DEATH
     if ($eumm) { # non-zero exit
       $cpan_command .= 'force("install","ExtUtils::MakeMaker"); ';
     }
+    if ($eui) {
+      $cpan_command .= 'install("ExtUtils::Install"); ';
+    }
     if ($cpan) {
       $cpan_command .= 'force("install","CPAN"); ';
     }
@@ -96,6 +102,7 @@ name 'local-lib';
 all_from 'lib/local/lib.pm';
 
 requires 'ExtUtils::MakeMaker' => '6.31'; # version INSTALL_BASE was added
+requires 'ExtUtils::Install' => '1.43'; # ditto
 requires 'ExtUtils::CBuilder'; # this and ParseXS are needed for MB C_support
 requires 'ExtUtils::ParseXS';
 requires 'Module::Build' => '0.28'; # lib -> lib/perl5 change