summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-01-08 16:48:46 -0800
committerH. Peter Anvin <hpa@zytor.com>2007-01-08 16:48:46 -0800
commit4d02d827fb36787f4a35b731b97d08ecddcb2950 (patch)
tree5f5d9a0bb05b183907eb63c278d3dc791d839b96
parent982c1f2697f6051be22dfaf9311c6ab3eae44f91 (diff)
downloadtftp-hpa-4d02d827fb36787f4a35b731b97d08ecddcb2950.tar.gz
Make sure we include <sys/socket.h> when checking for socklen_t
socklen_t is often only defined when <sys/socket.h> is included, but this is not autoconf default; make sure we include it first.
-rw-r--r--configure.in15
1 files changed, 12 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index c40d4c8..4b6ef76 100644
--- a/configure.in
+++ b/configure.in
@@ -33,8 +33,6 @@ CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
AC_C_CONST
AC_C_INLINE
-AC_SYS_LARGEFILE
-
PA_ADD_CFLAGS(-W)
PA_ADD_CFLAGS(-Wall)
PA_ADD_CFLAGS(-Wpointer-arith)
@@ -81,6 +79,8 @@ AC_CHECK_HEADERS(sys/socket.h)
AC_CHECK_HEADERS(winsock2.h)
AC_CHECK_HEADERS(winsock.h)
+AC_SYS_LARGEFILE
+
AC_TYPE_OFF_T
AC_TYPE_PID_T
AC_TYPE_MODE_T
@@ -91,7 +91,16 @@ AC_CHECK_TYPES(uint16_t)
AC_CHECK_TYPES(uint32_t)
AC_CHECK_TYPES(u_short)
AC_CHECK_TYPES(u_long)
-AC_CHECK_TYPES(socklen_t)
+
+dnl
+dnl <sys/socket.h> isn't among the list of standard headers that autoconf checks,
+dnl but POSIX requires <sys/socket.h> for socklen_t to be defined.
+dnl
+AC_CHECK_TYPES(socklen_t,,,[
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+])
AC_SEARCH_LIBS(socket, [socket ws2_32 wsock32], , [AC_MSG_ERROR(socket library not found)])
AC_SEARCH_LIBS(gethostbyname, [nsl resolv], , [AC_MSG_ERROR(gethostbyname not found)])