Bug 621597: Make mod_perl.pl automatically include the lib/ directory and

all the architecture-specific directories underneath it.
r=dkl, a=mkanat

2 files changed, 8 insertions, 2 deletions

diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index 1e8003e6b..e45f1b8b9 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -1148,7 +1148,7 @@ max_allowed_packet=4M
                 </warning> 
                 
                 <programlisting>
-    PerlSwitches -I/var/www/html/bugzilla -I/var/www/html/bugzilla/lib -w -T
+    PerlSwitches -w -T
     PerlConfigRequire /var/www/html/bugzilla/mod_perl.pl
                 </programlisting>
             </step>
diff --git a/mod_perl.pl b/mod_perl.pl
index 2de5ca946..c567a5244 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -19,6 +19,13 @@ package Bugzilla::ModPerl;
 
 use strict;
 
+# This sets up our libpath without having to specify it in the mod_perl
+# configuration.
+use File::Basename;
+use lib dirname(__FILE__);
+use Bugzilla::Constants ();
+use lib Bugzilla::Constants::bz_locations()->{'ext_libpath'};
+
 # If you have an Apache2::Status handler in your Apache configuration,
 # you need to load Apache2::Status *here*, so that any later-loaded modules
 # can report information to Apache2::Status.
@@ -38,7 +45,6 @@ use Template::Config ();
 Template::Config->preload();
 
 use Bugzilla ();
-use Bugzilla::Constants ();
 use Bugzilla::CGI ();
 use Bugzilla::Extension ();
 use Bugzilla::Install::Requirements ();