cvs commit: modperl-2.0/lib/ModPerl MM.pm

[dougm]

dougm       01/10/21 16:37:30

  Modified:    lib/Apache Build.pm
               lib/ModPerl MM.pm
  Log:
  need to include $Config{ccflags} in CCFLAGS passed to MakeMaker
  
  Revision  Changes    Path
  1.64      +6 -2      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.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- Build.pm  2001/10/21 06:57:07     1.63
  +++ Build.pm  2001/10/21 23:37:30     1.64
  @@ -194,6 +194,10 @@
       $ccopts;
   }
   
  +sub perl_ccopts {
  +    shift->strip_lfs(" $Config{ccflags} ");
  +}
  +
   sub ccopts_hpux {
       my $cflags = shift;
       #return if $Config{cc} eq 'gcc'; #XXX?
  @@ -204,8 +208,8 @@
   sub ccopts {
       my($self) = @_;
   
  -    my $cflags = $self->strip_lfs(ExtUtils::Embed::ccopts()) .
  -      $self->ap_ccopts;
  +    my $cflags = $self->perl_ccopts . ExtUtils::Embed::perl_inc() .
  +                 $self->ap_ccopts;
   
       my $fixup = \&{"ccopts_$^O"};
       if (defined &$fixup) {
  
  
  
  1.11      +2 -1      modperl-2.0/lib/ModPerl/MM.pm
  
  Index: MM.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MM.pm     2001/04/11 22:46:57     1.10
  +++ MM.pm     2001/10/21 23:37:30     1.11
  @@ -63,7 +63,8 @@
           }
       }
   
  -    my @opts = (INC => $inc, CCFLAGS => $build->ap_ccopts);
  +    my $ccflags = $build->perl_ccopts . $build->ap_ccopts;
  +    my @opts = (INC => $inc, CCFLAGS => $ccflags);
   
       my @typemaps;
       my $pwd = Cwd::fastcwd();