perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: modperl-2.0/lib/Apache Build.pm
Date Wed, 04 Apr 2001 05:27:59 GMT
dougm       01/04/03 22:27:59

  Modified:    .        Makefile.PL
               lib/Apache Build.pm
  Log:
  do a better job of finding ap_release.h to parse the server version and give more diagnostics
if it fails
  
  Revision  Changes    Path
  1.31      +6 -0      modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Makefile.PL	2001/04/02 09:17:40	1.30
  +++ Makefile.PL	2001/04/04 05:27:59	1.31
  @@ -52,6 +52,12 @@
       }
   
       my $httpd_version = $build->httpd_version;
  +    unless ($httpd_version) {
  +        $build->phat_warn(<<EOF);
  +Unable to determine server version, attempting to continue..
  +EOF
  +        $httpd_version = 'unknown';
  +    }
   
       printf "Configuring Apache/%s mod_perl/%s Perl/v%vd\n",
         $httpd_version, $VERSION, $^V;
  
  
  
  1.40      +11 -9     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.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- Build.pm	2001/04/02 07:37:36	1.39
  +++ Build.pm	2001/04/04 05:27:59	1.40
  @@ -418,11 +418,13 @@
           }
       }
   
  -    unless ($dir and -d $dir) {
  -        for (@INC) {
  -            last if -d ($dir = "$_/auto/Apache/include");
  -        }
  -    }
  +# we not longer install Apache headers, so dont bother looking in @INC
  +# might end up finding 1.x headers anyhow
  +#    unless ($dir and -d $dir) {
  +#        for (@INC) {
  +#            last if -d ($dir = "$_/auto/Apache/include");
  +#        }
  +#    }
   
       return $self->{dir} = $dir;
   }
  @@ -450,16 +452,16 @@
   sub ap_includedir  {
       my($self, $d) = @_;
   
  -    $d ||= $self->dir;
  -
       return $self->{ap_includedir}
         if $self->{ap_includedir} and -d $self->{ap_includedir};
  +
  +    $d ||= $self->apxs('-q' => 'INCLUDEDIR') || $self->dir;
   
  -    if (-e "$d/include/httpd.h") {
  +    if (-e "$d/include/ap_release.h") {
           return $self->{ap_includedir} = "$d/include";
       }
   
  -    $self->{ap_includedir} = $self->apxs('-q' => 'INCLUDEDIR');
  +    $self->{ap_includedir} = $d;
   }
   
   #--- parsing apache *.h files ---
  
  
  

Mime
View raw message