From: Karen Etheridge <ether@cpan.org>
Date: Wed, 23 Apr 2014 16:12:59 +0000 (-0700)
Subject: META_MERGE section cannot be dynamic - so always recommend Cpanel::JSON::XS (META... 
X-Git-Tag: v1.002001~8
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=521afaac4e85a8eb24154bb02a5a2b30a0e3d034;p=p5sagit%2FJSON-MaybeXS.git

META_MERGE section cannot be dynamic - so always recommend Cpanel::JSON::XS (META.json is correct in the 1.002000 release)
---

diff --git a/Makefile.PL b/Makefile.PL
index 958be3d..1c6e7e0 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,8 +4,8 @@ use 5.008001;
 use ExtUtils::MakeMaker;
 (do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
 
-# we require Cpanel::JSON::XS, except if JSON::XS is already installed we only
-# reocmmend it.
+# we require Cpanel::JSON::XS, except if JSON::XS is already installed.
+# (we also always recommend Cpanel::JSON::XS, just to make sure.)
 my $require_cpanel_json_xs = can_xs() && !eval { require JSON::XS; 1; };
 
 my %WriteMakefileArgs = (
@@ -26,9 +26,7 @@ my %WriteMakefileArgs = (
   META_MERGE => {
     'meta-spec' => { version => 2 },
     dynamic_config => 1,
-    ($require_cpanel_json_xs
-      ? ()
-      : (prereqs => { runtime => { recommends => { 'Cpanel::JSON::XS' => '2.3310' } } })),
+    prereqs => { runtime => { recommends => { 'Cpanel::JSON::XS' => '2.3310' } } },
 
     resources => {
       repository => {