X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=11fe390d8cafb658976172e9e81e1d83b8791c48;hb=074a414dea92037837ef040f5b0c0e75d0c075a0;hp=1c2a121bbe0def41fa2064cc472f001b5bfc4d9f;hpb=7b92a82b2c23a9003e5f736e85008111c904acc4;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index 1c2a121..11fe390 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,29 +2,34 @@ use strict;
 use warnings;
 use inc::Module::Install;
 
+# for co-developpers
+use Module::Install::XSUtil 0.17;
+
 system($^X, 'author/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
     or warn "Cannot generate Mouse::Tiny: $!";
 
 name     'Mouse';
 all_from 'lib/Mouse.pm';
 
-tests 't/*.t t/*/*.t';
-
 # Scalar::Util < 1.14 has a bug.
 # > Fixed looks_like_number(undef) to return false for perl >= 5.009002
 requires 'Scalar::Util' => 1.14;
 
-configure_requires 'ExtUtils::CBuilder';
-
 test_requires 'Test::More'      => 0.88;
 test_requires 'Test::Exception' => 0.27;
 # test_requires 'Test::Output'    => 0.16; # too many dependencies!
 
-
 include_deps 'Test::Exception'; # work around 0.27_0x (its use of diehook might be wrong)
 
 recommends 'MRO::Compat' if $] < 5.010;
 
+require 'lib/Mouse/Spec.pm'; # for the version
+
+if(Mouse::Spec->MouseVersion =~ /_/){ # DEVEL RELEASE
+    require Carp::Always; Carp::Always->import();
+    include_deps 'Carp::Always';
+}
+
 my $use_xs;
 
 for (@ARGV) {
@@ -37,19 +42,12 @@ if($] < 5.008_001){
 }
 
 if(!defined $use_xs){
-    $use_xs = eval {
-        require ExtUtils::CBuilder;
-        ExtUtils::CBuilder->new(quiet => 1)->have_compiler();
-    };
+    $use_xs = cc_available();
 }
 
 if($use_xs){
     print "Mouse configured with XS.\n",
-          "You can try --pp option to configure it with Pure Perl.\n";
-    ;
-
-    require Module::Install::XSUtil;
-    Module::Install::XSUtil->VERSION(0.15); # for co-developpers
+          "NOTE: You can try --pp option to configure Mouse with Pure Perl.\n";
 
     use_ppport(3.19);
     cc_warnings();
@@ -60,12 +58,10 @@ else{
 }
 
 if (author_context()) {
-    local @INC = ('lib', @INC);
-    require 'lib/Mouse/Spec.pm';
     my $require_version = Mouse::Spec->MooseVersion;
 
-    if (eval{ require Moose; Moose->VERSION($require_version) }) {
-        if (eval 'use Module::Install::AuthorTests; 1') {
+    if (eval { require Moose; Moose->VERSION($require_version) }) {
+        if (eval { require Module::Install::AuthorTests }) {
             do 'author/create-moose-compatibility-tests.pl';
             recursive_author_tests('xt');
         } else {
@@ -88,6 +84,8 @@ if (author_context()) {
     }
 }
 
+tests 't/*.t t/*/*.t';
+
 clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
 
 WriteAll check_nmake => 0;