X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=20396d5b1b4e0c5c22903d39aaf1e64a9c8a8de3;hb=02eb9dec2f1c9fffd208999a210e530d93db07d1;hp=244942074373bf6ab6a6debeec69c584f9a8a67f;hpb=7b133c927969b2e9233a51c6be5caed54c88915e;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index 2449420..20396d5 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -12,11 +12,15 @@ tests 't/*.t t/*/*.t';
 # > Fixed looks_like_number(undef) to return false for perl >= 5.009002
 requires 'Scalar::Util' => 1.14;
 
-build_requires 'Test::Exception' => 0.21;
-build_requires 'Test::More' => 0.80;
+test_requires 'Test::Exception' => 0.21;
+test_requires 'Test::More'      => 0.80;
 
 if ($Module::Install::AUTHOR) {
-    if (eval "package foo; use Moose; 1;") {
+    local @INC = ('lib', @INC);
+    require 'lib/Mouse.pm'; # for moose_version()
+    my $require_version = Mouse->moose_version;
+
+    if (eval{ require Moose; Moose->VERSION($require_version) }) {
         if (eval 'use Module::Install::AuthorTests; 1') {
             create_moose_compatibility_test();
             recursive_author_tests('xt');
@@ -24,7 +28,7 @@ if ($Module::Install::AUTHOR) {
             print "you don't have a M::I::AuthorTests.\n";
         }
     } else {
-        print "you don't have a moose. skipping moose compatibility test\n";
+        print "you don't have Moose $require_version. skipping moose compatibility test\n";
     }
     system("author/generate-mouse-tiny.pl");
 }
@@ -87,8 +91,8 @@ sub create_moose_compatibility_test {
                         close $rfh;
                         $s;
                     };
-                    $src =~ s/Mouse::is_class_loaded/Class::MOP::is_class_loaded/g;
-                    $src =~ s/Mouse::load_class/Class::MOP::load_class/g;
+                    $src =~ s/Mouse::(?:Util::)?is_class_loaded/Class::MOP::is_class_loaded/g;
+                    $src =~ s/Mouse::(?:Util::)?load_class/Class::MOP::load_class/g;
                     $src =~ s/Mouse/Moose/g;
                     $src;
                 };