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

[dougm]

dougm       01/10/21 17:10:13

  Modified:    lib/Apache Build.pm
               lib/ModPerl MM.pm
  Log:
  add .def files to otherldflags for MakeMaker
  
  Revision  Changes    Path
  1.65      +20 -11    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.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- Build.pm  2001/10/21 23:37:30     1.64
  +++ Build.pm  2001/10/22 00:10:13     1.65
  @@ -748,6 +748,12 @@
       }
   }
   
  +sub export_files_MSWin32 {
  +    my $self = shift;
  +    map "-def:$self->{cwd}/xs/modperl$_.def",
  +        ("", "_inline", "_ithreads");
  +}
  +
   sub dynamic_link_header_default {
       return <<'EOF';
   $(MODPERL_LIBNAME).$(MODPERL_DLEXT): $(MODPERL_PIC_OBJS)
  @@ -768,8 +774,7 @@
   
   sub dynamic_link_MSWin32 {
       my $self = shift;
  -    my @defs = map "-def:$self->{cwd}/xs/modperl$_.def",
  -        ("", "_inline", "_ithreads");
  +    my @defs = $self->export_files_MSWin32;
       return $self->dynamic_link_header_default .
              "@defs" . <<'EOF';
        -out:$@
  @@ -910,16 +915,20 @@
   
   sub otherldflags {
       my $self = shift;
  -    my @ldflags = ();
  +    my $flags = \&{"otherldflags_$^O"};
  +    return "" unless defined &$flags;
  +    $flags->($self);
  +}
   
  -    if ($^O eq 'aix') {
  -        if (my $file = find_in_inc('mod_perl.exp')) {
  -            push @ldflags, '-bI:' . $file;
  -        }
  -        my $httpdexp = $self->apxs('-q' => 'LIBEXECDIR') . '/httpd.exp';
  -        push @ldflags, "-bI:$httpdexp" if -e $httpdexp;
  -    }
  -    return join(' ', @ldflags);
  +#XXX: install *.def / search @INC
  +sub otherldflags_MSWin32 {
  +    my $self = shift;
  +    my(@defs) = $self->export_files_MSWin32;
  +    return "@defs";
  +}
  +
  +sub otherldflags_aix {
  +    ""; #XXX: -bI:*.exp files
   }
   
   sub typemaps {
  
  
  
  1.13      +1 -0      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MM.pm     2001/10/21 23:43:42     1.12
  +++ MM.pm     2001/10/22 00:10:13     1.13
  @@ -70,6 +70,7 @@
           INC     => $inc,
           CCFLAGS => $ccflags,
           LIBS    => $libs,
  +        dynamic_lib => { OTHERLDFLAGS => $build->otherldflags },
       );
   
       my @typemaps;