cvs commit: modperl-2.0/lib/Apache Build.pm

[dougm]

dougm       02/05/29 18:52:55

  Modified:    lib/Apache Build.pm
  Log:
  darwin does not like ranlib on mod_perl.so
  
  Revision  Changes    Path
  1.95      +9 -4      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.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- Build.pm  29 May 2002 03:26:40 -0000      1.94
  +++ Build.pm  30 May 2002 01:52:55 -0000      1.95
  @@ -20,6 +20,7 @@
   use constant HAS_ITHREADS =>
       $Config{useithreads} && ($Config{useithreads} eq 'define');
   
  +use constant DARWIN => $^O eq 'darwin';
   use constant WIN32 => $^O eq 'MSWin32';
   use constant MSVC  => WIN32() && ($Config{cc} eq 'cl');
   
  @@ -863,10 +864,14 @@
   
   sub dynamic_link_default {
       my $self = shift;
  -    return $self->dynamic_link_header_default . <<'EOF';
  -     -o $@
  -     $(MODPERL_RANLIB) $@
  -EOF
  +
  +    my $link = $self->dynamic_link_header_default . "\t" . '-o $@';
  +
  +    my $ranlib = "\t" . '$(MODPERL_RANLIB) $@';
  +
  +    $link .= "\n" . $ranlib unless DARWIN;
  +
  +    $link;
   }
   
   sub dynamic_link_MSWin32 {