svn commit: r397021 - /perl/modperl/trunk/lib/Apache2/Build.pm

[ra...@apache.org]

Author: randyk
Date: Tue Apr 25 16:40:23 2006
New Revision: 397021

URL: http://svn.apache.org/viewcvs?rev=397021&view=rev
Log:
Recognize on Win32 that libapr.lib and libaprutil.lib for Apache/2.2 have been renamed to libapr-1.lib and libaprutil-1.lib, respectively.

Modified:
    perl/modperl/trunk/lib/Apache2/Build.pm

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=397021&r1=397020&r2=397021&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Tue Apr 25 16:40:23 2006
@@ -1656,7 +1656,11 @@
 sub apache_libs_MSWin32 {
     my $self = shift;
     my $prefix = $self->apxs(-q => 'PREFIX') || $self->dir;
-    my @libs = map { "$prefix/lib/lib$_.lib" } qw(apr aprutil httpd);
+    my $lib = catdir $prefix, 'lib';
+    opendir(my $dir, $lib) or die qq{Cannot opendir $lib: $!};
+    my @libs = map {catfile($lib, $_)}
+        grep /^lib(apr|aprutil|httpd)\b\S*?\.lib$/, readdir $dir;
+    closedir $dir;
     "@libs";
 }