From: Karen Etheridge Date: Tue, 28 Jun 2016 21:53:36 +0000 (-0700) Subject: no need to check Cpanel::JSON::XS version - always add the prereq anyway X-Git-Tag: v1.003006_001~5 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0e267deee2acdae85e4083876bc71d8ef570945d;p=p5sagit%2FJSON-MaybeXS.git no need to check Cpanel::JSON::XS version - always add the prereq anyway --- diff --git a/Makefile.PL b/Makefile.PL index c355ff8..58b5e07 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -85,7 +85,7 @@ 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 }) + if eval { require Cpanel::JSON::XS; 1 } or (not eval { require JSON::XS; 1; } and can_xs()); # JSON::XS 3 changed its boolean handling - update it