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

[stas]

stas        2004/08/05 17:54:35

  Modified:    lib/Apache Build.pm
  Log:
  improve the diagnostics of failing to find modperl include dir
  
  Revision  Changes    Path
  1.167     +7 -5      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.166
  retrieving revision 1.167
  diff -u -u -r1.166 -r1.167
  --- Build.pm  1 Aug 2004 19:44:00 -0000       1.166
  +++ Build.pm  6 Aug 2004 00:54:35 -0000       1.167
  @@ -81,7 +81,7 @@
   
       my $include_dir = $self->apxs(-q => 'INCLUDEDIR');
   
  -    unless (-e $include_dir) {
  +    unless (-d $include_dir) {
           return "include/ directory not found in $prefix";
       }
   
  @@ -1667,12 +1667,14 @@
           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];
           }
   
  -        return [EMAIL PROTECTED];
  +        # this is fatal
  +        my $reason = $ap_inc
  +            ? "path $ap_inc doesn't exist"
  +            : "apxs -q INCLUDEDIR didn't return a value";
  +        die "Can't find the mod_perl include dir (reason: $reason)";
       }
   
       my $src = $self->dir;