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 2009/09/17 20:06:44 UTC
svn commit: r816312 - in /httpd/mod_ftp/trunk: build/Makefile.apxs
configure.apxs modules/ftp/config.m4 modules/ftp/ftp_internal.h
Author: wrowe
Date: Thu Sep 17 18:06:43 2009
New Revision: 816312
URL: http://svn.apache.org/viewvc?rev=816312&view=rev
Log:
Keep order the same as the build/Makefile.apxs test list
Modified:
httpd/mod_ftp/trunk/build/Makefile.apxs
httpd/mod_ftp/trunk/configure.apxs
httpd/mod_ftp/trunk/modules/ftp/config.m4
httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h
Modified: httpd/mod_ftp/trunk/build/Makefile.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/build/Makefile.apxs?rev=816312&r1=816311&r2=816312&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/build/Makefile.apxs (original)
+++ httpd/mod_ftp/trunk/build/Makefile.apxs Thu Sep 17 18:06:43 2009
@@ -21,6 +21,7 @@
conftest_netinet_ip_h.c \
conftest_struct_msghdr_msg_control.c \
conftest_struct_msghdr_msg_accrights.c \
+ conftest_sys_stat_h.c \
conftest_SOL_IP.c \
*.loT
TARGETS = conftest_fchmod \
@@ -28,6 +29,7 @@
conftest_netinet_ip_h \
conftest_struct_msghdr_msg_control \
conftest_struct_msghdr_msg_accrights \
+ conftest_sys_stat_h \
conftest_SOL_IP \
PROGRAM_LDADD =
@@ -47,6 +49,9 @@
conftest_netinet_ip_h: conftest_netinet_ip_h.lo
@echo "success" > $@
+conftest_sys_stat_h: conftest_sys_stat.lo
+ @echo "success" > $@
+
conftest_SOL_IP: conftest_SOL_IP.lo
@echo "success" > $@
@@ -69,6 +74,9 @@
@echo "#include <sys/socket.h>" >> $@
@echo "#include <netinet/ip.h>" >> $@
+conftest_sys_stat_h.c:
+ @echo "#include <sys/stat.h>" > $@
+
conftest_SOL_IP.c:
@echo "#include <sys/types.h>" > $@
@echo "#include <sys/socket.h>" >> $@
Modified: httpd/mod_ftp/trunk/configure.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/configure.apxs?rev=816312&r1=816311&r2=816312&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/configure.apxs (original)
+++ httpd/mod_ftp/trunk/configure.apxs Thu Sep 17 18:06:43 2009
@@ -71,14 +71,14 @@
echo "Detecting features"
echo "Detecting features" > ../config.apxs.log
-if make local-clean conftest_arpa_ftp_h >>../config.apxs.log 2>&1; then
+if make local-clean conftest_fchmod >>../config.apxs.log 2>&1; then
found_features="$found_features \
- -e \"s/^#undef \(HAVE_ARPA_FTP_H\)[ \t]*/#define \1 1/;\""
+ -e \"s/^#undef \(HAVE_FCHMOD\)[ \t]*/#define \1 1/;\""
fi
-if make local-clean conftest_fchmod >>../config.apxs.log 2>&1; then
+if make local-clean conftest_arpa_ftp_h >>../config.apxs.log 2>&1; then
found_features="$found_features \
- -e \"s/^#undef \(HAVE_FCHMOD\)[ \t]*/#define \1 1/;\""
+ -e \"s/^#undef \(HAVE_ARPA_FTP_H\)[ \t]*/#define \1 1/;\""
fi
if make local-clean conftest_netinet_ip_h >>../config.apxs.log 2>&1; then
Modified: httpd/mod_ftp/trunk/modules/ftp/config.m4
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/config.m4?rev=816312&r1=816311&r2=816312&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/config.m4 (original)
+++ httpd/mod_ftp/trunk/modules/ftp/config.m4 Thu Sep 17 18:06:43 2009
@@ -39,6 +39,7 @@
AC_CHECK_FUNCS(fchmod)
AC_CHECK_HEADERS(arpa/ftp.h)
AC_CHECK_HEADERS(netinet/ip.h)
+ AC_CHECK_HEADERS(sys/stat.h)
AC_CHECK_DECL(SOL_IP, , , [
#include <sys/types.h>
#include <sys/socket.h>
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h?rev=816312&r1=816311&r2=816312&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h Thu Sep 17 18:06:43 2009
@@ -82,7 +82,7 @@
#include <sys/types.h>
#endif
-#if APR_HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif