From 2c33712dc066463ab9741a009e56d9a5c2ffedf6 Mon Sep 17 00:00:00 2001
From: Dylan Hardison <dylan@mozilla.com>
Date: Tue, 23 Feb 2016 16:23:20 -0500
Subject: Bug 1246528 - Use Makefile.PL and allow Bugzilla use cpanm-compatible
 local dependencies r=dkl,a=dylan

---
 contrib/recode.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'contrib/recode.pl')

diff --git a/contrib/recode.pl b/contrib/recode.pl
index e6da47b92..edd9fe423 100755
--- a/contrib/recode.pl
+++ b/contrib/recode.pl
@@ -10,7 +10,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -88,17 +88,18 @@ if (exists $switch{'charset'}) {
 }
 
 if ($switch{'guess'}) {
-    if (!eval { require Encode::Detect::Detector }) {
+    if (!Bugzilla->has_feature('detect_charset')) {
         my $root = ROOT_USER;
         print STDERR <<EOT;
 Using --guess requires that Encode::Detect be installed. To install
 Encode::Detect, run the following command:
 
-  $^X install-module.pl Encode::Detect
+   cpanm --installdeps --with-feature=detect_charset -l local .
 
 EOT
         exit;
     }
+    require Encode::Detect;
 }
 
 my %overrides;
-- 
cgit v1.2.3-24-g4f1b