On Thu, Dec 15, 2005 at 01:26:59PM -0500, Geoffrey Young wrote:
> 
> >      if ($self->{MP_MAINTAINER}) {
> >          $self->{MP_DEBUG} = 1;
> > -        if ($self->perl_config('gccversion')) {
> > -            #same as --with-maintainter-mode
> > -            $ccopts .= " $Wall -DAP_DEBUG";
> > -            $ccopts .= " -DAP_HAVE_DESIGNATED_INITIALIZER";
> > -        }
> 
> committed with a minor tweak - we don't want to remove Wall, just the httpd
> switches.  I think :)

OK thanks.  Now I see this causes a regression in the 2.0 build with 
MP_MAINTAINER=1! Sorry about that :(

The problem is really just that AP_HAVE_DESIGNATED_INITIALIZER does not 
get picked up through apxs because it was defined in the wrong place in 
httpd in the first place; it's in the obscure NOTEST_CPPFLAGS.

So this fixes that:

Index: lib/Apache2/Build.pm
===================================================================
--- lib/Apache2/Build.pm        (revision 357155)
+++ lib/Apache2/Build.pm        (working copy)
@@ -227,7 +227,8 @@
 
 sub apxs_extra_cppflags {
     my $who = caller_package(shift);
-    my $flags = $who->apxs('-q' => 'EXTRA_CPPFLAGS');
+    my $flags = $who->apxs('-q' => 'EXTRA_CPPFLAGS') ." ".
+        $who->apxs('-q' => 'NOTEST_CPPFLAGS');
     $flags =~ s/\"/\\\"/g;
     $flags;
 }

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to