[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS shishi/gl/m4
From: |
shishi-commit |
Subject: |
CVS shishi/gl/m4 |
Date: |
Sat, 24 Dec 2005 00:28:49 +0100 |
Update of /home/cvs/shishi/gl/m4
In directory dopio:/tmp/cvs-serv7350/gl/m4
Modified Files:
getaddrinfo.m4 socklen.m4
Log Message:
Update.
--- /home/cvs/shishi/gl/m4/getaddrinfo.m4 2005/10/12 13:24:42 1.6
+++ /home/cvs/shishi/gl/m4/getaddrinfo.m4 2005/12/23 23:28:49 1.7
@@ -7,7 +7,7 @@
AC_DEFUN([gl_GETADDRINFO],
[
AC_SEARCH_LIBS(getaddrinfo, [nsl socket])
- AC_SEARCH_LIBS(gethostbyname, [inet nsl])
+ AC_SEARCH_LIBS(gethostbyname, [inet nsl wsock32])
AC_SEARCH_LIBS(getservbyname, [inet nsl socket xnet])
AC_REPLACE_FUNCS(getaddrinfo gai_strerror)
gl_PREREQ_GETADDRINFO
--- /home/cvs/shishi/gl/m4/socklen.m4 2005/12/13 17:23:34 1.3
+++ /home/cvs/shishi/gl/m4/socklen.m4 2005/12/23 23:28:49 1.4
@@ -1,17 +1,18 @@
-# socklen.m4 serial 2
+# socklen.m4 serial 3
dnl Copyright (C) 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
-dnl From Albert Chin.
+dnl From Albert Chin, Windows fixes from Simon Josefsson.
dnl Check for socklen_t: historically on BSD it is an int, and in
dnl POSIX 1g it is a type of its own, but some platforms use different
dnl types for the argument to getsockopt, getpeername, etc. So we
dnl have to test to find something that will work.
AC_DEFUN([gl_TYPE_SOCKLEN_T],
- [AC_CHECK_TYPE([socklen_t], ,
+ [AC_CHECK_HEADERS_ONCE([sys/socket.h ws2tcpip.h])
+ AC_CHECK_TYPE([socklen_t], ,
[AC_MSG_CHECKING([for socklen_t equivalent])
AC_CACHE_VAL([gl_cv_gl_cv_socklen_t_equiv],
[# Systems have either "struct sockaddr *" or
@@ -21,7 +22,12 @@
for t in int size_t "unsigned int" "long int" "unsigned long int"; do
AC_TRY_COMPILE(
[#include <sys/types.h>
- #include <sys/socket.h>
+ #if HAVE_SYS_SOCKET_H
+ # include <sys/socket.h>
+ #endif
+ #if HAVE_WS2TCPIP_H
+ # include <ws2tcpip.h>
+ #endif
int getpeername (int, $arg2 *, $t *);],
[$t len;
@@ -33,10 +39,16 @@
done
])
if test "$gl_cv_socklen_t_equiv" = ""; then
- AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+ AC_MSG_WARN([Cannot find a type to use in place of socklen_t, using
int...])
+ gl_cv_socklen_t_equiv=int
fi
AC_MSG_RESULT([$gl_cv_socklen_t_equiv])
AC_DEFINE_UNQUOTED([socklen_t], [$gl_cv_socklen_t_equiv],
[type to use in place of socklen_t if not defined])],
[#include <sys/types.h>
- #include <sys/socket.h>])])
+ #if HAVE_SYS_SOCKET_H
+ # include <sys/socket.h>
+ #endif
+ #if HAVE_WS2TCPIP_H
+ # include <ws2tcpip.h>
+ #endif])])