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

[stas]

stas        2004/01/17 23:21:43

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
  Log:
  restore the call to default_httpd from configure_httpd since when removing
  it, we have stopped respecting the APACHE env var. Instead remove the
  call to which('httpd'), which can be a bad guess. And at the same time
  remove a similar which('apxs') call. Both are now part of the interactive
  configuration, so they aren't lost
  
  Revision  Changes    Path
  1.200     +4 -2      
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.199
  retrieving revision 1.200
  diff -u -u -r1.199 -r1.200
  --- TestConfig.pm     18 Jan 2004 03:14:10 -0000      1.199
  +++ TestConfig.pm     18 Jan 2004 07:21:43 -0000      1.200
  @@ -323,6 +323,8 @@
               $vars->{httpd} = $httpd;
               last;
           }
  +
  +        $vars->{httpd} ||= $self->default_httpd;
       }
   
       if ($vars->{httpd}) {
  @@ -512,7 +514,7 @@
           return $build_config->{MP_APXS};
       }
   
  -    $ENV{APXS} || which('apxs');
  +    $ENV{APXS};
   }
   
   sub default_httpd {
  @@ -527,7 +529,7 @@
           }
       }
   
  -    $ENV{APACHE} || which($vars->{target});
  +    $ENV{APACHE};
   }
   
   my $localhost;