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

[geoff]

geoff       2004/01/26 08:10:49

  Modified:    lib/Apache Build.pm
  Log:
  support new ap_release.h format in 2.1
  
  Revision  Changes    Path
  1.155     +12 -0     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.154
  retrieving revision 1.155
  diff -u -r1.154 -r1.155
  --- Build.pm  17 Dec 2003 22:27:33 -0000      1.154
  +++ Build.pm  26 Jan 2004 16:10:49 -0000      1.155
  @@ -1023,9 +1023,21 @@
               $version = $1;
               last;
           }
  +        elsif(/^\#define\s+AP_SERVER_MAJORVERSION_NUMBER\s+(\d+)/) {
  +            # new 2.1 config
  +            my $major = $1;
  +            my $minor = (split /\s+/, scalar(<$fh>))[-1];
  +            my $patch = (split /\s+/, scalar(<$fh>))[-1];
  +            my $string = (split /\s+/, scalar(<$fh>))[-1];
  +            $version = join '.', $major, $minor, "$patch$string";
  +            $version =~ s/\"//g;
  +            last;
  +        }
       }
   
       close $fh;
  +
  +    debug "parsed version $version from ap_release.h";
   
       $self->httpd_version_cache($dir, $version);
   }