X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=d0674514261850feac133a7f5bd1bf48043fb1e0;hb=cdd450c566dcfefb6ee4f0cc3c6255e0c289f854;hp=9123430638c1393d696f9c4fbdf86f0eda583a9f;hpb=528fa9beced8334403259f6cf5e4fed40afe6d6c;p=p5sagit%2Flocal-lib.git

diff --git a/Makefile.PL b/Makefile.PL
index 9123430..d067451 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -88,6 +88,9 @@ DEATH
     system($^X, '-MExtUtils::Install 1.43', '-e1');
     my $eui = $? >> 8;
 
+    system($^X, '-MModule::Build 0.36', '-e1');
+    my $mb = $? >> 8;
+
     system($^X, '-MCPAN 1.82', '-e1');
     my $cpan = $? >> 8;
     my $cpan_command = '';
@@ -134,6 +137,9 @@ DEATH
     if ($eui) {
       $cpan_command .= 'install("ExtUtils::Install"); ';
     }
+    if ($mb) {
+      $cpan_command .= 'install("Module::Build"); ';
+    }
     if ($cpan) {
       $cpan_command .= 'force("install","CPAN"); ';
     }
@@ -176,8 +182,6 @@ 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.36'; # PERL_MB_OPT
 my $required_CPAN = '1.82';
 requires 'CPAN' => $required_CPAN; # sudo support + CPAN::HandleConfig
@@ -204,25 +208,27 @@ delete $ENV{PERL5_CPAN_IS_RUNNING} if $no_cpan_env;
     # It will already be installed by the time we reach here if bootstrapping,
     # otherwise, if we're running from CPAN then it will be installed soon
     # enough, and we'll come back here..
-    if (!$@) {
-        CPAN::HandleConfig->load;
-        for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
-            if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
-                die <<"DEATH";
+    if (!$@ ) {
+        CPAN::HandleConfig->require_myconfig_or_config;
+        if ( $CPAN::Config ) {
+            for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
+                if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
+                    die <<"DEATH";
 WHOA THERE! It looks like you've got $CPAN::Config->{$eumm_setting} set. This is
 known to cause problems with local::lib. Please either remove this setting or
 clear out your .cpan directory.
 DEATH
+                }
             }
-        }
 
-        for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
-            if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
-                die <<"DEATH";
+            for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
+                if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
+                    die <<"DEATH";
 WHOA THERE! It looks like you've got $CPAN::Config->{$mb_setting} set. This is
 known to cause problems with local::lib. Please either remove this setting or
 clear out your .cpan directory.
 DEATH
+                }
             }
         }
     }
@@ -245,4 +251,10 @@ END
   auto_install;
 }
 chdir($cwd);
+resources(
+  # r/w: p5sagit@git.shadowcat.co.uk:local-lib.git
+  repository => 'git://git.shadowcat.co.uk/p5sagit/local-lib.git',
+  homepage => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/local-lib.git',
+  bugtracker => 'http://rt.cpan.org/Public/Dist/Display.html?Name=local-lib',
+);
 WriteAll;