svn commit: r189910 - in /perl/modperl/trunk: Changes lib/Apache2/Build.pm

[go...@apache.org]

Author: gozer
Date: Fri Jun 10 00:16:23 2005
New Revision: 189910

URL: http://svn.apache.org/viewcvs?rev=189910&view=rev
Log:
Fix the "No library found" warnings when building on win32 without
apxs and MP_AP_PREFIX 
Submitted-by: Nick *** <do...@abv.bg>


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

Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=189910&r1=189909&r2=189910&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Fri Jun 10 00:16:23 2005
@@ -12,6 +12,9 @@
 
 =item 2.0.1-dev
 
+Fix the "No library found" warnings when building on win32 without
+apxs and MP_AP_PREFIX [Nick *** <do...@abv.bg>]
+
 The pure-perl ModPerl::Util::unload_package implementation was
 accidently deleting sub-stashes [Gozer]
 

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=189910&r1=189909&r2=189910&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Fri Jun 10 00:16:23 2005
@@ -1546,7 +1546,7 @@
 
 sub apache_libs_MSWin32 {
     my $self = shift;
-    my $prefix = $self->apxs(-q => 'PREFIX');
+    my $prefix = $self->apxs(-q => 'PREFIX') || $self->dir;
     my @libs = map { "$prefix/lib/lib$_.lib" } qw(apr aprutil httpd);
     "@libs";
 }