cvs commit: modperl/t/modules src.t

[dougm]

dougm       01/07/10 08:45:35

  Modified:    .        Makefile.PL
               t/modules src.t
  Log:
  more for the latest win32 patch from randy
  
  Revision  Changes    Path
  1.192     +3 -2      modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.191
  retrieving revision 1.192
  diff -u -r1.191 -r1.192
  --- Makefile.PL       2001/07/09 15:03:06     1.191
  +++ Makefile.PL       2001/07/10 15:45:21     1.192
  @@ -358,8 +358,9 @@
   if ($vcpp and $win32_args{APACHE_SRC}) {
     $EVERYTHING = 1;
     my $fixed_apsrc = win32_fix_path($win32_args{APACHE_SRC}); 
  -  $APACHE_SRC =  -d "$fixed_apsrc/include" ?
  -    $fixed_apsrc  : $fixed_apsrc . '/src';
  +  $APACHE_SRC =  -d "$fixed_apsrc/include" ? $fixed_apsrc  : 
  +    (-d "$fixed_apsrc/src/include" ? $fixed_apsrc . '/src' :
  +     die "Cannot find the Apache include directory under $fixed_apsrc");
     $win32_auto = 1;
   }
   
  
  
  
  1.4       +1 -1      modperl/t/modules/src.t
  
  Index: src.t
  ===================================================================
  RCS file: /home/cvs/modperl/t/modules/src.t,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- src.t     2001/07/09 15:03:25     1.3
  +++ src.t     2001/07/10 15:45:32     1.4
  @@ -5,7 +5,7 @@
   
   my $i = 0;
   
  -# skip_test if WIN32;
  +skip_test if (WIN32 and !Apache::src->mmn_eq);
   
   print "1..6\n";