svn commit: r652540 - in /httpd/mod_ftp/trunk: configure.apxs modules/ftp/config.m4 modules/ftp/ftp_config.h.in

[wr...@apache.org]

Author: wrowe
Date: Thu May  1 07:45:57 2008
New Revision: 652540

URL: http://svn.apache.org/viewvc?rev=652540&view=rev
Log:
Finish introduction of test for netinet/ip.h from r652538, for TOS constants

Modified:
    httpd/mod_ftp/trunk/configure.apxs
    httpd/mod_ftp/trunk/modules/ftp/config.m4
    httpd/mod_ftp/trunk/modules/ftp/ftp_config.h.in

Modified: httpd/mod_ftp/trunk/configure.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/configure.apxs?rev=652540&r1=652539&r2=652540&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/configure.apxs (original)
+++ httpd/mod_ftp/trunk/configure.apxs Thu May  1 07:45:57 2008
@@ -77,6 +77,10 @@
   found_features="$found_features\|HAVE_FCHMOD"
 fi
 
+if make local-clean conftest_netinet_ip_h; then \
+  found_features="$found_features\|HAVE_NETINET_IP_H"
+fi
+
 found_features="`echo \"$found_features\" | sed -e 's/^\\\\|//;'`"
 make local-distclean
 cd ..

Modified: httpd/mod_ftp/trunk/modules/ftp/config.m4
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/config.m4?rev=652540&r1=652539&r2=652540&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/config.m4 (original)
+++ httpd/mod_ftp/trunk/modules/ftp/config.m4 Thu May  1 07:45:57 2008
@@ -36,6 +36,7 @@
 APACHE_MODULE(ftp, [FTP Protocol support (mod_ftp)], $ftp_objs, , no, [
     AC_CHECK_FUNCS(fchmod)
     AC_CHECK_HEADERS(arpa/ftp.h)
+    AC_CHECK_HEADERS(netinet/ip.h)
 ])
 
 APACHE_MODULE(ftp_cmd_pwd, [Example FTP cmd extension (mod_ftp_cmd_pwd)], mod_ftp_cmd_pwd.lo, , no)

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_config.h.in
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_config.h.in?rev=652540&r1=652539&r2=652540&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_config.h.in (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_config.h.in Thu May  1 07:45:57 2008
@@ -6,3 +6,6 @@
 /* Define to 1 if you have the `fchmod' function. */
 #undef HAVE_FCHMOD
 
+/* Define to 1 if you have the `netinet/ip.h' header. */
+#undef HAVE_NETINET_IP_H
+