perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: modperl-2.0 Makefile.PL
Date Thu, 15 Jul 2004 07:15:30 GMT
randyk      2004/07/15 00:15:30

  Modified:    .        Makefile.PL
  Log:
  Submitted by:	Markus Wichitill <mawic (at) gmx.de>
  Reviewed by:	stas, randyk
  On Win32, add to the PATH the apr bin directory (or the directory
  containing apache.exe, if the latter isn't available) when running
  the tests, so that the needed dlls to run Apache can be found.
  
  Revision  Changes    Path
  1.147     +15 -3     modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.146
  retrieving revision 1.147
  diff -u -r1.146 -r1.147
  --- Makefile.PL	15 Jul 2004 06:35:11 -0000	1.146
  +++ Makefile.PL	15 Jul 2004 07:15:30 -0000	1.147
  @@ -597,11 +597,23 @@
   
   sub MY::test {
   
  -    my $env = Apache::TestConfig->passenv_makestr();
  -
  -    my $preamble = Apache::TestConfig::WIN32 ? "" : <<EOF;
  +    my $preamble;
  +    if (Apache::TestConfig::WIN32) {
  +        my $ap_bindir = $build->apr_bindir() || '';
  +        unless ($ap_bindir) {
  +            $ap_bindir = File::Spec->catdir($build->{MP_AP_PREFIX}, 'bin')
  +                if $build->{MP_AP_PREFIX};
  +        }
  +        $preamble = <<EOF;
  +PATH = \$(PATH);$ap_bindir
  +EOF
  +    }
  +    else {
  +        my $env = Apache::TestConfig->passenv_makestr();
  +        $preamble = <<EOF;
   PASSENV = $env
   EOF
  +    }
   
       return $preamble . <<'EOF';
   TEST_VERBOSE = 0
  
  
  

Mime
View raw message