X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=Makefile.PL;h=e960218313e99fb4cf8e870ee81890b74d532563;hp=994104e13f0cc49fe49687e5b8a3a84dad2ce77c;hb=aff73a9e6d34b45a21123586c0893921df98181b;hpb=125dc1a8a40b3e76d89abbc96589e42c0b9d7c1a

diff --git a/Makefile.PL b/Makefile.PL
index 994104e..e960218 100755
--- 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: $!";
@@ -27,32 +27,20 @@ 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;
+#if(Mouse::Spec->MouseVersion =~ /_/){ # DEVEL RELEASE
+#    require Carp::Always; Carp::Always->import();
+#    include_deps 'Carp::Always';
+#}
 
-if($] < 5.008_001){
-    $use_xs = 0;
-}
-
-for (@ARGV) {
-    /^--pp$/ and $use_xs = 0;
-    /^--xs$/ and $use_xs = 1;
-}
-
-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{