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

[stas]

stas        2003/03/23 20:48:45

  Modified:    lib/ModPerl MM.pm
  Log:
  3rd party modules MM: fixup INC and TYPEMAPS entries
  
  Revision  Changes    Path
  1.25      +2 -18     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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- MM.pm     22 Mar 2003 07:21:36 -0000      1.24
  +++ MM.pm     24 Mar 2003 04:48:45 -0000      1.25
  @@ -111,34 +111,18 @@
       my $build = build_config();
       my_import(__PACKAGE__);
   
  -    my $inc = $build->inc;
  -    if (my $glue_inc = $build->{MP_XS_GLUE_DIR}) {
  -        for (split /\s+/, $glue_inc) {
  -            $inc .= " -I$_";
  -        }
  -    }
  -
       my $libs = join ' ', $build->apache_libs, $build->modperl_libs;
       my $ccflags = $build->perl_ccopts . $build->ap_ccopts;
   
       my @opts = (
  -        INC       => $inc,
  +        INC       => $build->inc,
           CCFLAGS   => $ccflags,
           OPTIMIZE  => $build->perl_config('optimize'),
           LDDLFLAGS => $build->perl_config('lddlflags'),
           LIBS      => $libs,
  +        TYPEMAPS  => $build->typemaps,
           dynamic_lib => { OTHERLDFLAGS => $build->otherldflags },
       );
  -
  -    my @typemaps;
  -    my $pwd = Cwd::fastcwd();
  -    for ('xs', $pwd, "$pwd/..") {
  -        my $typemap = $build->file_path("$_/typemap");
  -        if (-e $typemap) {
  -            push @typemaps, $typemap;
  -        }
  -    }
  -    push @opts, TYPEMAPS => [EMAIL PROTECTED] if @typemaps;
   
       ExtUtils::MakeMaker::WriteMakefile(@opts, @_);
   }