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 Sun, 07 Apr 2002 02:56:52 GMT
dougm       02/04/06 18:56:52

  Modified:    .        Makefile.PL
               lib/Apache Build.pm
  Log:
  more hints if includes cannot be found
  
  Revision  Changes    Path
  1.72      +5 -1      modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- Makefile.PL	7 Apr 2002 02:45:32 -0000	1.71
  +++ Makefile.PL	7 Apr 2002 02:56:52 -0000	1.72
  @@ -137,7 +137,11 @@
       my $httpd_version = $build->httpd_version;
       unless ($httpd_version) {
           error 'Unable to determine server version, aborting.';
  -        unless ($build->{MP_APXS} || $build->{MP_AP_PREFIX}) {
  +        if ($build->{MP_APXS} || $build->{MP_AP_PREFIX}) {
  +            my $what = $build->{MP_APXS} ? 'MP_APXS' : 'MP_AP_PREFIX';
  +            error "Invalid $what specified?";
  +        }
  +        else {
               error 'Please specify MP_APXS or MP_AP_PREFIX.';
           }
           exit(1);
  
  
  
  1.79      +6 -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.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- Build.pm	6 Apr 2002 16:24:51 -0000	1.78
  +++ Build.pm	7 Apr 2002 02:56:52 -0000	1.79
  @@ -636,7 +636,12 @@
           return $v;
       }
   
  -    open my $fh, "$dir/ap_release.h" or return undef;
  +    my $header = "$dir/ap_release.h";
  +    open my $fh, $header or do {
  +        error "Unable to open $header: $!";
  +        return undef;
  +    };
  +
       my $version;
   
       while(<$fh>) {
  
  
  

Mime
View raw message