cvs commit: modperl Changes Makefile.PL

[do...@apache.org]

dougm       01/09/09 14:56:46

  Modified:    .        Changes Makefile.PL
  Log:
  warn if Perl is configured with -Duseshrplib and a libperl.so is found
  in a place where it should not be, example: /lib /usr/lib or /usr/local/lib
  
  Revision  Changes    Path
  1.622     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.621
  retrieving revision 1.622
  diff -u -r1.621 -r1.622
  --- Changes	2001/09/09 18:48:47	1.621
  +++ Changes	2001/09/09 21:56:46	1.622
  @@ -10,6 +10,9 @@
   
   =item 1.26_01-dev
   
  +warn if Perl is configured with -Duseshrplib and a libperl.so is found
  +in a place where it should not be, example: /lib /usr/lib or /usr/local/lib
  +
   fix potential segv in Apache::URI->rpath
   [Vyacheslav Zamyatin <sl...@w-m.ru>]
   
  
  
  
  1.196     +29 -0     modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.195
  retrieving revision 1.196
  diff -u -r1.195 -r1.196
  --- Makefile.PL	2001/07/17 15:54:05	1.195
  +++ Makefile.PL	2001/09/09 21:56:46	1.196
  @@ -2410,6 +2410,7 @@
       malloc_check();
       uselargefiles_check();
       dynaloader_check();
  +    shrplib_check();
   
       if ($USE_APXS and $Config{libs} =~ /($thrlib)/) {
           my $lib = $1;
  @@ -2560,4 +2561,32 @@
    /* Added by Wayne Scott 
   
   EOF
  +}
  +
  +sub shrplib_check {
  +    return unless $Config{'useshrplib'} and
  +      $Config{'useshrplib'} eq 'define';
  +
  +    my $libperl = $Config{'libperl'} || 'libperl.so';
  +
  +    for my $dir (qw(/lib /usr/lib /usr/local/lib)) {
  +        next unless -e "$dir/$libperl";
  +
  +        my $coredir = "$Config{'archlibexp'}/CORE";
  +        my $corelib = "$coredir/$libperl";
  +
  +        phat_warn(<<EOF);
  +$dir/$libperl might override
  +$corelib
  +
  +This may cause build or runtime errors with mod_perl.
  +Consider removing $dir/$libperl, it should not be there.
  +
  +If your vendor has installed $libperl there, complain to them and install
  +Perl from source if needed.
  +
  +$libperl should only exist in Perl version/arch directories, for example:
  +$coredir
  +EOF
  +    }
   }