Mercurial > hg > octave-shane > gnulib-hg
annotate m4/getaddrinfo.m4 @ 6646:c8acef83bf3f
* sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
winsock2.h or ws2tcpip.h when sys/socket.h is present. Fixes
'present but cannot compile' warnings on cygwin.
* socklen.m4 (gl_TYPE_SOCKLEN_T): Use gl_HEADER_SYS_SOCKET. Don't
use ws2tcpip.h if sys/socket.h works.
* getaddrinfo.m4 (gl_PREREQ_GETADDRINFO): Use gl_HEADER_SYS_SOCKET.
(gl_GETADDRINFO): Don't use ws2tcpip.h when sys/socket.h is present.
author | Simon Josefsson <simon@josefsson.org> |
---|---|
date | Thu, 16 Feb 2006 09:48:07 +0000 |
parents | 29248383a0c7 |
children | f9e910a182f7 |
rev | line source |
---|---|
6646
c8acef83bf3f
* sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents:
6619
diff
changeset
|
1 # getaddrinfo.m4 serial 8 |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
2 dnl Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. |
5611
87c42e194f4a
Use an all-permissive copyright notice, recommended by RMS.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5408
diff
changeset
|
3 dnl This file is free software; the Free Software Foundation |
87c42e194f4a
Use an all-permissive copyright notice, recommended by RMS.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5408
diff
changeset
|
4 dnl gives unlimited permission to copy and/or distribute it, |
87c42e194f4a
Use an all-permissive copyright notice, recommended by RMS.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5408
diff
changeset
|
5 dnl with or without modifications, as long as this notice is preserved. |
5408 | 6 |
7 AC_DEFUN([gl_GETADDRINFO], | |
8 [ | |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
9 AC_MSG_NOTICE([checking how to do getaddrinfo]) |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
10 |
6316
f1727ec07f78
(gl_GETADDRINFO): Look for getservbyname in these
Jim Meyering <jim@meyering.net>
parents:
6306
diff
changeset
|
11 AC_SEARCH_LIBS(getaddrinfo, [nsl socket]) |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
12 AC_CHECK_FUNCS(getaddrinfo,, [ |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
13 AC_CACHE_CHECK(for getaddrinfo in ws2tcpip.h and -lws2_32, |
6646
c8acef83bf3f
* sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents:
6619
diff
changeset
|
14 gl_cv_w32_getaddrinfo, [ |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
15 gl_cv_w32_getaddrinfo=no |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
16 am_save_LIBS="$LIBS" |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
17 LIBS="$LIBS -lws2_32" |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
18 AC_TRY_LINK([ |
6646
c8acef83bf3f
* sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents:
6619
diff
changeset
|
19 #ifdef HAVE_WS2TCPIP_H |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
20 #define WINVER 0x0501 |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
21 #include <ws2tcpip.h> |
6646
c8acef83bf3f
* sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents:
6619
diff
changeset
|
22 #endif |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
23 ], [getaddrinfo(0, 0, 0, 0);], gl_cv_w32_getaddrinfo=yes) |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
24 LIBS="$am_save_LIBS" |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
25 if test "$gl_cv_w32_getaddrinfo" = "yes"; then |
6646
c8acef83bf3f
* sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents:
6619
diff
changeset
|
26 LIBS="$LIBS -lws2_32" |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
27 else |
6646
c8acef83bf3f
* sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents:
6619
diff
changeset
|
28 AC_LIBOBJ(getaddrinfo) |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
29 fi |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
30 ])]) |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
31 |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
32 AC_REPLACE_FUNCS(gai_strerror) |
5408 | 33 gl_PREREQ_GETADDRINFO |
34 ]) | |
35 | |
36 # Prerequisites of lib/getaddrinfo.h and lib/getaddrinfo.c. | |
37 AC_DEFUN([gl_PREREQ_GETADDRINFO], [ | |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
38 AC_SEARCH_LIBS(gethostbyname, [inet nsl]) |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
39 AC_SEARCH_LIBS(getservbyname, [inet nsl socket xnet]) |
5408 | 40 AC_REQUIRE([gl_C_RESTRICT]) |
41 AC_REQUIRE([gl_SOCKET_FAMILIES]) | |
6646
c8acef83bf3f
* sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents:
6619
diff
changeset
|
42 AC_REQUIRE([gl_HEADER_SYS_SOCKET]) |
5408 | 43 AC_REQUIRE([AC_C_INLINE]) |
6319
81f384f9b845
2005-10-01 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
6316
diff
changeset
|
44 AC_REQUIRE([AC_GNU_SOURCE]) |
6646
c8acef83bf3f
* sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents:
6619
diff
changeset
|
45 AC_CHECK_HEADERS_ONCE(netinet/in.h netdb.h) |
6319
81f384f9b845
2005-10-01 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
6316
diff
changeset
|
46 AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror],,,[ |
6321
2b9ecd9439d4
2005-10-01 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
6319
diff
changeset
|
47 /* sys/types.h is not needed according to POSIX, but the |
2b9ecd9439d4
2005-10-01 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
6319
diff
changeset
|
48 sys/socket.h in i386-unknown-freebsd4.10 and |
2b9ecd9439d4
2005-10-01 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
6319
diff
changeset
|
49 powerpc-apple-darwin5.5 required it. */ |
6340
7ce682b6b199
Don't use the HAVE_ macros that we used to define.
Paul Eggert <eggert@cs.ucla.edu>
parents:
6339
diff
changeset
|
50 #include <sys/types.h> |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
51 #ifdef HAVE_SYS_SOCKET_H |
6340
7ce682b6b199
Don't use the HAVE_ macros that we used to define.
Paul Eggert <eggert@cs.ucla.edu>
parents:
6339
diff
changeset
|
52 #include <sys/socket.h> |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
53 #endif |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
54 #ifdef HAVE_NETDB_H |
6340
7ce682b6b199
Don't use the HAVE_ macros that we used to define.
Paul Eggert <eggert@cs.ucla.edu>
parents:
6339
diff
changeset
|
55 #include <netdb.h> |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
56 #endif |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
57 #ifdef HAVE_WS2TCPIP_H |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
58 #define WINVER 0x0501 |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
59 #include <ws2tcpip.h> |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
60 #endif |
5408 | 61 ]) |
6319
81f384f9b845
2005-10-01 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
6316
diff
changeset
|
62 AC_CHECK_TYPES([struct addrinfo],,,[ |
6340
7ce682b6b199
Don't use the HAVE_ macros that we used to define.
Paul Eggert <eggert@cs.ucla.edu>
parents:
6339
diff
changeset
|
63 #include <sys/types.h> |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
64 #ifdef HAVE_SYS_SOCKET_H |
6340
7ce682b6b199
Don't use the HAVE_ macros that we used to define.
Paul Eggert <eggert@cs.ucla.edu>
parents:
6339
diff
changeset
|
65 #include <sys/socket.h> |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
66 #endif |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
67 #ifdef HAVE_NETDB_H |
6340
7ce682b6b199
Don't use the HAVE_ macros that we used to define.
Paul Eggert <eggert@cs.ucla.edu>
parents:
6339
diff
changeset
|
68 #include <netdb.h> |
6619
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
69 #endif |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
70 #ifdef HAVE_WS2TCPIP_H |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
71 #define WINVER 0x0501 |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
72 #include <ws2tcpip.h> |
29248383a0c7
Mingw32 fixes for getaddrinfo.
Simon Josefsson <simon@josefsson.org>
parents:
6340
diff
changeset
|
73 #endif |
6319
81f384f9b845
2005-10-01 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
6316
diff
changeset
|
74 ]) |
81f384f9b845
2005-10-01 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
6316
diff
changeset
|
75 ]) |