make bump

[p5sagit/JSON-MaybeXS.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 8bb9ae0..b18aa4b 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -74,8 +74,21 @@ for (qw(configure build test runtime)) {
 # (we also always recommend Cpanel::JSON::XS, just to make sure.)
 $WriteMakefileArgs{PREREQ_PM}{'Cpanel::JSON::XS'} = '2.3310'
     if not parse_args()->{PUREPERL_ONLY}
-        and not eval { require JSON::XS; 1; }
-        and can_xs();
+        and ((eval { require Cpanel::JSON::XS; 1 } and not eval { Cpanel::JSON::XS->VERSION('2.3310'); 1 })
+            or (not eval { require JSON::XS; 1; } and can_xs()));
+
+# avoid "JSON::XS::Boolean::* redefined" warnings caused by incompatibilities
+# between JSON::XS 2.x and 3.0 --
+# if JSON::XS is installed and < 3.0
+# and Cpanel::JSON::JSON is (or is about to be) >= 3.0,
+# then update JSON::XS to eliminate the incompatibility
+$WriteMakefileArgs{PREREQ_PM}{'JSON::XS'} = '3.00'
+    if not parse_args()->{PUREPERL_ONLY}
+        and eval { require JSON::XS; 1 } and not eval { JSON::XS->VERSION('3.0'); 1 }
+        and (eval { require Cpanel::JSON::XS; Cpanel::JSON::XS->VERSION('3.0'); 1 }
+            # we presume here that if we are installing Cpanel::JSON::XS, we
+            # are installing the latest version
+            or exists $WriteMakefileArgs{PREREQ_PM}{'Cpanel::JSON::XS'});
 
 $WriteMakefileArgs{MIN_PERL_VERSION} = delete $WriteMakefileArgs{PREREQ_PM}{perl} || 0;