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

[dougm]

dougm       01/06/27 19:59:18

  Modified:    .        Makefile.PL
               lib/Apache Build.pm
  Log:
  give better apxs failure messages, die if server version cannot be found/parsed
  
  Revision  Changes    Path
  1.35      +4 -6      modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Makefile.PL       2001/04/20 17:42:57     1.34
  +++ Makefile.PL       2001/06/28 02:59:14     1.35
  @@ -2,13 +2,13 @@
   use strict;
   use warnings FATAL => 'all';
   
  -use lib qw(lib);
  +use lib qw(lib Apache-Test/lib);
   use Config;
   use Apache::Build ();
   use ModPerl::Code ();
   use ModPerl::MM ();
   
  -use lib qw(Apache-Test/lib);
  +use Apache::TestTrace;
   use Apache::TestMM qw(test);
   
   our $VERSION;
  @@ -53,10 +53,8 @@
   
       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';
  +        error 'Unable to determine server version, aborting.';
  +        exit;
       }
   
       printf "Configuring Apache/%s mod_perl/%s Perl/v%vd\n",
  
  
  
  1.45      +16 -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.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- Build.pm  2001/05/14 02:41:49     1.44
  +++ Build.pm  2001/06/28 02:59:17     1.45
  @@ -9,6 +9,7 @@
   use ExtUtils::Embed ();
   use ModPerl::Code ();
   use ModPerl::BuildOptions ();
  +use Apache::TestTrace;
   
   use constant is_win32 => $^O eq 'MSWin32';
   use constant IS_MOD_PERL_BUILD => grep { -e "$_/lib/mod_perl.pm" } qw(. ..);
  @@ -58,7 +59,18 @@
       return '' unless $apxs and -x $apxs;
   
       my $val = qx($apxs @_ 2>/dev/null);
  -    warn "ERROR: `$apxs query @_' failed\n" unless $val;
  +
  +    unless ($val) {
  +        error "'$apxs @_' failed:";
  +
  +        if (my $error = qx($apxs @_ 2>&1)) {
  +            error $error;
  +        }
  +        else {
  +            error 'unknown error';
  +        }
  +    }
  +
       $val;
   }
   
  @@ -459,7 +471,7 @@
       return $self->{ap_includedir}
         if $self->{ap_includedir} and -d $self->{ap_includedir};
   
  -    $d ||= $self->apxs('-q' => 'INCLUDEDIR') || $self->dir;
  +    return unless $d ||= $self->apxs('-q' => 'INCLUDEDIR') || $self->dir;
   
       if (-e "$d/include/ap_release.h") {
           return $self->{ap_includedir} = "$d/include";
  @@ -551,7 +563,8 @@
   
   sub httpd_version {
       my($self, $dir) = @_;
  -    $dir = $self->ap_includedir($dir);
  +
  +    return unless $dir = $self->ap_includedir($dir);
   
       if (my $v = $self->httpd_version_cache($dir)) {
           return $v;