Author: gozer
Date: Fri Feb  3 15:11:05 2006
New Revision: 374777

URL: http://svn.apache.org/viewcvs?rev=374777&view=rev
Log:
httpd-2.2 introduces yet a new & slightly different way to hide
it's version information in ap_release.h


Modified:
    perl/modperl/trunk/lib/Apache2/Build.pm

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=374777&r1=374776&r2=374777&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Fri Feb  3 15:11:05 2006
@@ -1377,8 +1377,14 @@
             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";
+
+            my ($define, $macro, $dev) = (split /\s+/, scalar(<$fh>));
+            
+            if ($macro =~ /AP_SERVER_DEVBUILD_BOOLEAN/ && $dev eq '1') {
+                $dev = "-dev";
+            }
+
+            $version = join '.', $major, $minor, "$patch$dev";
             $version =~ s/\"//g;
             last;
         }


Reply via email to