Checking in changes prior to tagging of version 0.45. Changelog diff is:

[gitmo/Mouse.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index b8519a4..6e438d7 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -3,7 +3,7 @@ use warnings;
 use inc::Module::Install;
 
 # for co-developpers
-use Module::Install::XSUtil 0.17;
+use Module::Install::XSUtil 0.19;
 
 system($^X, 'tool/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
     or warn "Cannot generate Mouse::Tiny: $!";
@@ -25,34 +25,23 @@ if($] < 5.010) {
     recommends 'Class::C3';
 }
 
-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;
-
-if($] < 5.008_001){
-    $use_xs = 0;
+if(eval{ require MouseX::AttributeHelpers }){
+    if(!eval{ MouseX::AttributeHelpers->VERSION(0.06) }){
+        requires 'MouseX::AttributeHelpers' => 0.06;
+    }
 }
 
-for (@ARGV) {
-    /^--pp$/ and $use_xs = 0;
-    /^--xs$/ and $use_xs = 1;
-}
+require 'lib/Mouse/Spec.pm'; # for the version
 
-if(!defined $use_xs){
-    $use_xs = cc_available();
-}
+# cc_available recognizes the '--pp' and '--xs' options
+my $use_xs = ($] >= 5.008_001 && cc_available());
 
 if($use_xs){
     print "Mouse configured with XS.\n",
           "NOTE: You can try --pp option to configure Mouse with Pure Perl.\n";
 
-    use_ppport(3.19);
     cc_warnings();
+    use_ppport(3.19);
     cc_src_paths('xs-src');
 }
 else{