From: Karen Etheridge <ether@cpan.org>
Date: Fri, 1 May 2020 15:37:37 +0000 (-0700)
Subject: now always require Cpanel::JSON::XS, as long as a compiler is available
X-Git-Tag: v1.004001~9
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c24268124a1efc8276fe37f049d6168355c94bc2;p=p5sagit%2FJSON-MaybeXS.git

now always require Cpanel::JSON::XS, as long as a compiler is available

(..and not overridden by PUREPERL_ONLY)
We used to only require Cpanel::JSON::XS if JSON::XS wasn't already installed.
---

diff --git a/Makefile.PL b/Makefile.PL
index 04b7ebc..37a8e07 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -66,14 +66,11 @@ my %META = (
 my %MM_ARGS = ();
 
 if (! parse_args()->{PUREPERL_ONLY}) {
-  # we require Cpanel::JSON::XS, except if JSON::XS is already installed.
+  # we require Cpanel::JSON::XS whenever a compiler is available.
   # (we also always recommend Cpanel::JSON::XS, just to make sure.)
   $MM_ARGS{PREREQ_PM}{'Cpanel::JSON::XS'} = '2.3310'
     if eval { require Cpanel::JSON::XS; 1 }
-      or (
-        not eval { require JSON::XS; 1; }
-        and can_compile_loadable_object(quiet => 1)
-      );
+      or can_compile_loadable_object(quiet => 1);
 
   # JSON::XS 3 changed its boolean handling - update it
   # if JSON::XS is installed and < 3.0