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

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'
     },

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;