cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm

[dougm]

dougm       02/04/05 18:39:31

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
  Log:
  try MP_AP_PREFIX in modperl build config for httpd location hint
  
  Revision  Changes    Path
  1.128     +9 -0      
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
  
  Index: TestConfig.pm
  ===================================================================
  RCS file: 
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- TestConfig.pm     5 Apr 2002 19:54:12 -0000       1.127
  +++ TestConfig.pm     6 Apr 2002 02:39:31 -0000       1.128
  @@ -473,6 +473,15 @@
   sub default_httpd {
       my $vars = shift->{vars};
   
  +    if (my $build_config = modperl_build_config()) {
  +        if (my $p = $build_config->{MP_AP_PREFIX}) {
  +            for my $bindir (qw(bin sbin)) {
  +                my $httpd = "$p/$bindir/$vars->{target}";
  +                return $httpd if -e $httpd;
  +            }
  +        }
  +    }
  +
       $ENV{APACHE} || which($vars->{target});
   }