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

[dougm]

dougm       01/03/26 14:07:13

  Modified:    .        Makefile.PL
               lib/Apache Build.pm
  Log:
  fix apxs locator when BuildConfig.pm does not exist
  
  Revision  Changes    Path
  1.28      +1 -1      modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Makefile.PL       2001/03/26 16:17:01     1.27
  +++ Makefile.PL       2001/03/26 22:07:12     1.28
  @@ -1,6 +1,6 @@
   use 5.006;
   use strict;
  -use warnings;
  +use warnings FATAL => 'all';
   
   use lib qw(lib);
   use Apache::Build ();
  
  
  
  1.37      +3 -3      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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Build.pm  2001/03/13 01:50:19     1.36
  +++ Build.pm  2001/03/26 22:07:12     1.37
  @@ -33,10 +33,10 @@
   
   sub apxs {
       my $self = shift;
  -    my $build = $self->build_config;
  +    $self = $self->build_config unless ref $self;
       my $apxs;
       my @trys = ($Apache::Build::APXS,
  -                $build->{MP_APXS},
  +                $self->{MP_APXS},
                   $ENV{MP_APXS});
   
       unless (IS_MOD_PERL_BUILD) {
  @@ -463,7 +463,7 @@
           return $self->{ap_includedir} = "$d/include";
       }
   
  -    $self->{ap_includedir} = Apache::Build->apxs('-q' => 'INCLUDEDIR');
  +    $self->{ap_includedir} = $self->apxs('-q' => 'INCLUDEDIR');
   }
   
   #--- parsing apache *.h files ---