diff -r -u parrot-current/config/inter/libparrot.pm parrot-andy/config/inter/libparrot.pm --- parrot-current/config/inter/libparrot.pm 2009-04-17 09:00:40.000000000 -0400 +++ parrot-andy/config/inter/libparrot.pm 2009-05-11 10:53:08.000000000 -0400 @@ -43,38 +43,6 @@ $parrot_is_shared = 0 unless $conf->data->get('has_dynamic_linking'); - # Parrot can't necessarily handle a pre-existing installed shared - # libparrot.so. At this point, we don't know the actual name - # of the shared parrot library. So we try some candidates. - # See RT #52288: the check for old_versions should be improved - my @libs = ('libparrot.so'); - my @libpaths = ('/usr/local/lib', '/usr/lib', $conf->data->get('libdir')); - if ($^O eq 'MSWin32') { - push @libpaths, (split /;/, $ENV{PATH}); - @libs = ('libparrot.dll', 'libparrot.lib', 'libparrot.dll.a'); - } - if ($^O eq 'cygwin') { - @libs = ('libparrot.dll.a'); - } - if (defined $ENV{LD_LIBRARY_PATH}) { - push @libpaths, (split /:/, $ENV{LD_LIBRARY_PATH}); - } - if (defined $ENV{LD_RUN_PATH}) { - push @libpaths, (split /:/, $ENV{LD_RUN_PATH}); - } - if (defined $ENV{DYLD_LIBRARY_PATH}) { - push @libpaths, (split /:/, $ENV{DYLD_LIBRARY_PATH}); - } - foreach my $f (@libs) { - foreach my $d (@libpaths) { - my $oldversion = File::Spec->catfile($d, $f); - if (-e $oldversion) { - warn("\nWarning: Building a shared parrot library may conflict " . - "with your previously-installed $oldversion\n"); - } - } - } - if ( $conf->options->get('ask') &&