From 79137f662b8d3c297b114e0dcc9c2d17ded44b48 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <mkanat%bugzilla.org>
Date: Mon, 26 Mar 2007 04:30:51 +0000
Subject: [PATCH] Bug 375357: GD::Graph requires GD::Text (not vice-versa)
 Patch By Max Kanat-Alexander <mkanat@bugzilla.org> (module owner) a=mkanat

---
 webtools/bugzilla/Bugzilla/Install/Requirements.pm | 10 +++++-----
 webtools/bugzilla/checksetup.pl                    |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/webtools/bugzilla/Bugzilla/Install/Requirements.pm b/webtools/bugzilla/Bugzilla/Install/Requirements.pm
index 03d3c237e90..7cc51a5e61c 100644
--- a/webtools/bugzilla/Bugzilla/Install/Requirements.pm
+++ b/webtools/bugzilla/Bugzilla/Install/Requirements.pm
@@ -121,14 +121,14 @@ sub OPTIONAL_MODULES {
         feature => 'Graphical Reports'
     },
     {
-        package => 'GDGraph',
-        module  => 'GD::Graph',
+        package => 'GDTextUtil',
+        module  => 'GD::Text',
         version => 0,
         feature => 'Graphical Reports'
     },
-    { 
-        package => 'GDTextUtil',
-        module  => 'GD::Text',
+    {
+        package => 'GDGraph',
+        module  => 'GD::Graph',
         version => 0,
         feature => 'Graphical Reports'
     },
diff --git a/webtools/bugzilla/checksetup.pl b/webtools/bugzilla/checksetup.pl
index 81eab9b8761..91055588b2c 100755
--- a/webtools/bugzilla/checksetup.pl
+++ b/webtools/bugzilla/checksetup.pl
@@ -44,6 +44,9 @@
 
 use strict;
 use 5.008;
+# If we've installed modules into the local directory, we want to
+# be sure that the local directory comes first in @INC.
+use lib '.';
 use File::Basename;
 use Getopt::Long qw(:config bundling);
 use Pod::Usage;