httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steve...@apache.org
Subject svn commit: r1635221 - in /httpd/apreq/trunk: CHANGES win32/Configure.pl
Date Wed, 29 Oct 2014 17:38:24 GMT
Author: stevehay
Date: Wed Oct 29 17:38:23 2014
New Revision: 1635221

URL: http://svn.apache.org/r1635221
Log:
Fix httpd-2.4.x build for Win32

Modified:
    httpd/apreq/trunk/CHANGES
    httpd/apreq/trunk/win32/Configure.pl

Modified: httpd/apreq/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=1635221&r1=1635220&r2=1635221&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Wed Oct 29 17:38:23 2014
@@ -3,6 +3,9 @@
 
 @section v2_14 Changes with libapreq2-2.14 (in development)
 
+- Build [stevehay]
+  Fix httpd-2.4.x build for Win32.
+
 - Build [Richard M Kandarian]
   Fix debug build for Win32.
 

Modified: httpd/apreq/trunk/win32/Configure.pl
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/Configure.pl?rev=1635221&r1=1635220&r2=1635221&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/Configure.pl (original)
+++ httpd/apreq/trunk/win32/Configure.pl Wed Oct 29 17:38:23 2014
@@ -41,12 +41,12 @@ my $prog = apache_prog_name($apache);
 my @httpd_ver = httpd_version($prog);
 my $devnull = devnull();
 my %map = (
-    apr => $httpd_ver[1] == 2 ? 'libapr-1.lib' : 'libapr.lib',
-    apu => $httpd_ver[1] == 2 ? 'libaprutil-1.lib' : 'libaprutil.lib'
+    apr => $httpd_ver[1] >= 2 ? 'libapr-1.lib' : 'libapr.lib',
+    apu => $httpd_ver[1] >= 2 ? 'libaprutil-1.lib' : 'libaprutil.lib'
 );
 
 foreach my $what (qw(apr apu)) {
-    my $ap = ($httpd_ver[1] == 2) ?
+    my $ap = ($httpd_ver[1] >= 2) ?
         "$what-1-config.bat" : "$what-config.bat";
     my $cfg = catfile $apache, 'bin', $ap;
     my $lib;



Mime
View raw message