You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2007/12/15 05:36:18 UTC
svn commit: r604390 - in /httpd/mod_ftp/trunk: include/mod_ftp.h
modules/ftp/mod_ftp.dsp
Author: wrowe
Date: Fri Dec 14 20:36:18 2007
New Revision: 604390
URL: http://svn.apache.org/viewvc?rev=604390&view=rev
Log:
In-tree builds were broken because loggers aren't in the
includes path, and mod_log_config.h is hiding there (note
that mod_ssl played this same mess).
So win32 and netware need to toggle
Modified:
httpd/mod_ftp/trunk/include/mod_ftp.h
httpd/mod_ftp/trunk/modules/ftp/mod_ftp.dsp
Modified: httpd/mod_ftp/trunk/include/mod_ftp.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/include/mod_ftp.h?rev=604390&r1=604389&r2=604390&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/include/mod_ftp.h (original)
+++ httpd/mod_ftp/trunk/include/mod_ftp.h Fri Dec 14 20:36:18 2007
@@ -69,7 +69,13 @@
#include "http_protocol.h"
#include "scoreboard.h"
+#ifdef FTP_BUILD
+#ifdef FTP_APXS_BUILD
#include "mod_log_config.h"
+#else
+#include "../../modules/loggers/mod_log_config.h"
+#endif
+#endif
#if APR_HAVE_UNISTD_H
#include <unistd.h>
Modified: httpd/mod_ftp/trunk/modules/ftp/mod_ftp.dsp
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/mod_ftp.dsp?rev=604390&r1=604389&r2=604390&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/mod_ftp.dsp (original)
+++ httpd/mod_ftp/trunk/modules/ftp/mod_ftp.dsp Fri Dec 14 20:36:18 2007
@@ -148,7 +148,7 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\include\ftp_config.h
+SOURCE=.\ftp_config.h
# End Source File
# Begin Source File
@@ -157,25 +157,25 @@
# End Group
# Begin Source File
-SOURCE="..\..\include\ftp_config.h.in"
+SOURCE=".\ftp_config.h.in"
!IF "$(CFG)" == "mod_ftp - Win32 Release"
# Begin Custom Build - Generating ftp_config.h
-InputPath="..\..\include\ftp_config.h.in"
+InputPath=".\ftp_config.h.in"
-"..\..\include\ftp_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- echo /* No configuration */ > ..\..\include\ftp_config.h
+".\ftp_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ echo /* No configuration */ > .\ftp_config.h
# End Custom Build
!ELSEIF "$(CFG)" == "mod_ftp - Win32 Debug"
# Begin Custom Build - Generating ftp_config.h
-InputPath="..\..\include\ftp_config.h.in"
+InputPath=".\ftp_config.h.in"
-"..\..\include\ftp_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- echo /* No configuration */ > ..\..\include\ftp_config.h
+".\ftp_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ echo /* No configuration */ > .\ftp_config.h
# End Custom Build
Re: svn commit: r604390 - in /httpd/mod_ftp/trunk: include/mod_ftp.h
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
For Netware, where ./configure.apxs doesn't work...
wrowe@apache.org wrote:
> Author: wrowe
> Date: Fri Dec 14 20:36:18 2007
> New Revision: 604390
>
> URL: http://svn.apache.org/viewvc?rev=604390&view=rev
> Log:
> In-tree builds were broken because loggers aren't in the
> includes path, and mod_log_config.h is hiding there (note
> that mod_ssl played this same mess).
>
> So win32 and netware need to toggle
> +".\ftp_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
> + echo /* No configuration */ > .\ftp_config.h
provided you don't want to toggle fchmod (which is easy enough
by stealing the code from configure.apxs). Also we simply need
-DFTP_APXS_BUILD for the out-of-tree compilation. Otherwise
the netware build should still work fine.
Bill