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

[stas]

stas        2003/03/23 19:11:04

  Modified:    lib/Apache Build.pm
  Log:
  $build->inc in ModPerl::MM needs to return only production include dirs,
  not the build ones
  
  Revision  Changes    Path
  1.115     +17 -1     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.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- Build.pm  24 Mar 2003 03:00:19 -0000      1.114
  +++ Build.pm  24 Mar 2003 03:11:04 -0000      1.115
  @@ -1210,9 +1210,25 @@
   
   sub includes {
       my $self = shift;
  +
  +    my @inc = ();
  +
  +    unless (IS_MOD_PERL_BUILD) {
  +        # XXX: what if apxs is not available? win32?
  +        my $ap_inc = $self->apxs('-q' => 'INCLUDEDIR');
  +        if ($ap_inc && -d $ap_inc) {
  +            push @inc, $ap_inc;
  +        } else {
  +            # this is fatal
  +            die "Can't find the mod_perl include dir";
  +        }
  +
  +        return [EMAIL PROTECTED];
  +    }
  +
       my $src  = $self->dir;
       my $os = WIN32 ? 'win32' : 'unix';
  -    my @inc = $self->file_path("src/modules/perl", "xs");
  +    push @inc, $self->file_path("src/modules/perl", "xs");
   
       push @inc, $self->mp_include_dir;