httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r822513 - in /httpd/mod_ftp/trunk: Makefile-ftp.win README-FTP build/mkconfNW-ftp.awk
Date Tue, 06 Oct 2009 21:28:20 GMT
Author: wrowe
Date: Tue Oct  6 21:28:20 2009
New Revision: 822513

URL: http://svn.apache.org/viewvc?rev=822513&view=rev
Log:
Fixing line endings

Modified:
    httpd/mod_ftp/trunk/Makefile-ftp.win
    httpd/mod_ftp/trunk/README-FTP
    httpd/mod_ftp/trunk/build/mkconfNW-ftp.awk   (props changed)

Modified: httpd/mod_ftp/trunk/Makefile-ftp.win
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/Makefile-ftp.win?rev=822513&r1=822512&r2=822513&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile-ftp.win (original)
+++ httpd/mod_ftp/trunk/Makefile-ftp.win Tue Oct  6 21:28:20 2009
@@ -53,7 +53,9 @@
 APACHE2_HOME=$(INSTDIR)
 !ENDIF
 
-!IF EXIST("$(APACHE2_HOME)\lib\libapr-1.lib")
+!IF EXIST("$(APACHE2_HOME)\lib\libapr-2.lib")
+APACHE2_APRSFX=-2
+!ELSEIF EXIST("$(APACHE2_HOME)\lib\libapr-1.lib")
 APACHE2_APRSFX=-1
 !ELSEIF EXIST("$(APACHE2_HOME)\lib\libapr.lib")
 APACHE2_APRSFX=

Modified: httpd/mod_ftp/trunk/README-FTP
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/README-FTP?rev=822513&r1=822512&r2=822513&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/README-FTP (original)
+++ httpd/mod_ftp/trunk/README-FTP Tue Oct  6 21:28:20 2009
@@ -49,6 +49,11 @@
 
     # ADD LINK32 libapr.lib libaprutil.lib ...
 
+If using httpd development version 2.3 plus APR 2.0, replace both 
+of these entries with the single (combined) entry;
+
+    # ADD LINK32 libapr-2.lib ...
+
 To build on windows out-of-tree as a DSO, simply
 
     set APACHE2_HOME=c:\path\to\Apache2.2

Propchange: httpd/mod_ftp/trunk/build/mkconfNW-ftp.awk
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message