Bug 375357: GD::Graph requires GD::Text (not vice-versa)

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> (module owner) a=mkanat

2 files changed, 8 insertions, 5 deletions

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 03d3c237e..7cc51a5e6 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/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/checksetup.pl b/checksetup.pl
index 81eab9b87..91055588b 100755
--- a/checksetup.pl
+++ b/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;