simplify JSON::XS prereq

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

diff --git a/Makefile.PL b/Makefile.PL
index a898ce4..c355ff8 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -22,7 +22,7 @@ my %WriteMakefileArgs = (
         web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=JSON-MaybeXS',
       },
     },
-    x_contributors => [ # manually added, from git shortlog -e -s
+    x_contributors => [ # manually added, from git shortlog -e -s -n
       'Clinton Gormley <develop@traveljury.com>',
       'Graham Knop <haarg@haarg.org>',
       'John SJ Anderson <genehack@genehack.org>',
@@ -30,6 +30,7 @@ my %WriteMakefileArgs = (
       'Kieren Diment <diment@gmail.com>',
       'Matt S Trout <mst@shadowcat.co.uk>',
     ],
+    keywords => [ qw(json serializer serialiser data) ],
   },
 
   META_ADD => {
@@ -46,7 +47,7 @@ my %WriteMakefileArgs = (
         requires => {
           'Scalar::Util' => '0',
           'Carp' => '0',
-          'JSON::PP' => '2.27202',
+          'JSON::PP' => '2.27300',
           # we may also add a runtime prereq for Cpanel::JSON::XS, on the
           # installer's machine
           perl => '5.006',
@@ -78,25 +79,20 @@ for (qw(configure build test runtime)) {
 
 # dynamic prereqs get added here.
 
-# we require Cpanel::JSON::XS, except if JSON::XS is already installed.
-# (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 ((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'});
+my $args = parse_args();
+
+if (not $args->{PUREPERL_ONLY}) {
+    # we require Cpanel::JSON::XS, except if JSON::XS is already installed.
+    # (we also always recommend Cpanel::JSON::XS, just to make sure.)
+    $WriteMakefileArgs{PREREQ_PM}{'Cpanel::JSON::XS'} = '2.3310'
+        if (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());
+
+    # JSON::XS 3 changed its boolean handling - update it
+    # if JSON::XS is installed and < 3.0
+    $WriteMakefileArgs{PREREQ_PM}{'JSON::XS'} = '3.00'
+        if eval { require JSON::XS; 1 } and not eval { JSON::XS->VERSION('3.0'); 1 };
+}
 
 $WriteMakefileArgs{MIN_PERL_VERSION} = delete $WriteMakefileArgs{PREREQ_PM}{perl} || 0;