[GNUnet-SVN] r32484 - libmicrohttpd

[gnunet]

Author: Karlson2k
Date: 2014-02-26 18:55:13 +0100 (Wed, 26 Feb 2014)
New Revision: 32484

Modified:
   libmicrohttpd/configure.ac
Log:
Check for sockaddr_in.sin_len using conditional include

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2014-02-26 17:55:08 UTC (rev 32483)
+++ libmicrohttpd/configure.ac  2014-02-26 17:55:13 UTC (rev 32484)
@@ -92,16 +92,6 @@
 
 AC_C_BIGENDIAN
 
-AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
-   [ AC_DEFINE(HAVE_SOCKADDR_IN_SIN_LEN, 1, [Do we have sockaddr_in.sin_len?])
-   ],
-   [],
-   [
-      #include <sys/types.h>
-      #include <sys/socket.h>
-      #include <netinet/in.h>
-   ])
-
 AC_CHECK_PROG(HAVE_CURL_BINARY,[curl],true,false)
 AM_CONDITIONAL(HAVE_CURL_BINARY,$HAVE_CURL_BINARY)
 AC_CHECK_PROG(HAVE_MAKEINFO_BINARY,[makeinfo],true,false)
@@ -244,6 +234,22 @@
 
 AC_CHECK_HEADERS([search.h], AM_CONDITIONAL(HAVE_TSEARCH, true), 
AM_CONDITIONAL(HAVE_TSEARCH, false))
 
+AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
+   [ AC_DEFINE(HAVE_SOCKADDR_IN_SIN_LEN, 1, [Do we have sockaddr_in.sin_len?])
+   ],
+   [],
+   [
+    #ifdef HAVE_SYS_TYPES_H
+      #include <sys/types.h>
+    #endif
+    #ifdef HAVE_SYS_SOCKET_H
+      #include <sys/socket.h>
+    #endif
+    #ifdef HAVE_NETINET_IN_H
+      #include <netinet/in.h>
+    #endif
+   ])
+
 # Check for pipe/socketpair signaling
 AC_MSG_CHECKING([[whether to disable pipes signaling]])
 AC_ARG_ENABLE([[pipes]],