cvs commit: modperl-2.0/lib/Apache Build.pm

[dougm]

dougm       02/05/20 15:27:30

  Modified:    lib/Apache Build.pm
  Log:
  use Apache::TestConfig::which instead of duplicating
  
  Revision  Changes    Path
  1.85      +2 -7      modperl-2.0/lib/Apache/Build.pm
  
  Index: Build.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- Build.pm  19 May 2002 19:46:08 -0000      1.84
  +++ Build.pm  20 May 2002 22:27:30 -0000      1.85
  @@ -13,6 +13,7 @@
   use ModPerl::Code ();
   use ModPerl::BuildOptions ();
   use Apache::TestTrace;
  +use Apache::TestConfig ();
   
   use constant REQUIRE_ITHREADS => grep { $^O eq $_ } qw(MSWin32);
   use constant HAS_ITHREADS =>
  @@ -96,7 +97,7 @@
           #these extra tries are for things built outside of mod_perl
           #e.g. libapreq
           push @trys,
  -        which('apxs'),
  +        Apache::TestConfig::which('apxs'),
           '/usr/local/apache/bin/apxs';
       }
   
  @@ -133,12 +134,6 @@
       my $cflags = __PACKAGE__->apxs('-q' => 'CFLAGS');
       $cflags =~ s/\"/\\\"/g;
       $cflags;
  -}
  -
  -sub which {
  -    foreach (map { File::Spec->catfile($_, $_[0]) } File::Spec->path) {
  -     return $_ if -x;
  -    }
   }
   
   #--- Perl Config stuff ---