cvs commit: modperl-2.0/Apache-Test/lib/Apache TestConfigPerl.pm

[dougm]

dougm       01/04/04 10:42:12

  Modified:    Apache-Test/lib/Apache TestConfigPerl.pm
  Log:
  make sure ServerRoot is in @INC
  
  Revision  Changes    Path
  1.5       +7 -3      modperl-2.0/Apache-Test/lib/Apache/TestConfigPerl.pm
  
  Index: TestConfigPerl.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Apache-Test/lib/Apache/TestConfigPerl.pm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestConfigPerl.pm 2001/04/03 00:26:58     1.4
  +++ TestConfigPerl.pm 2001/04/04 17:42:11     1.5
  @@ -75,10 +75,14 @@
   my %startup_pl = (1 => 'PerlRequire', 2 => 'PerlSwitches');
   
   sub startup_pl_code {
  -    return <<'EOF';
  +    my $self = shift;
  +    my $serverroot = $self->{vars}->{serverroot};
  +
  +    return <<"EOF";
   BEGIN {
  -    for my $file (qw(modperl_inc.pl modperl_extra.pl)) {
  -        eval { require "conf/$file" };
  +    use lib '$serverroot';
  +    for my \$file (qw(modperl_inc.pl modperl_extra.pl)) {
  +        eval { require "conf/\$file" };
       }
   }