/pidgin/main: 1bed3dca6bd2: Configure: don't look for getaddrinf...
Tomasz Wasilczyk <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 1bed3dca6bd2ecefddea6809773539f1d6d290c1 Author: Tomasz Wasilczyk <[email protected]> Date: 2014-05-13 12:02 +0200 Branch: default URL: https://hg.pidgin.im/pidgin/main/rev/1bed3dca6bd2 Description: Configure: don't look for getaddrinfo and inet_ntop on win32 diffstat: configure.ac | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diffs (34 lines): diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -270,18 +270,21 @@ if test "x$is_win32" != "xyes" ; then fi AC_CHECK_LIB(resolv, __res_query) AC_CHECK_LIB(nsl, gethostent) -if test "x$is_win32" != "xyes" ; then +if test "x$is_win32" = "xyes" ; then + AC_DEFINE(HAVE_GETADDRINFO, 1, [Define to 1 if you have the getaddrinfo function.]) + AC_DEFINE(HAVE_INET_NTOP, 1, [Define to 1 if you have the `inet_ntop' function.]) +else AC_CHECK_FUNC(socket, , [AC_CHECK_LIB(socket, socket, , [AC_MSG_ERROR([socket not found])])]) + dnl If all goes well, by this point the previous two checks will have + dnl pulled in -lsocket and -lnsl if we need them. + AC_CHECK_FUNC(getaddrinfo, + [AC_DEFINE([HAVE_GETADDRINFO], [1], + [Define to 1 if you have the getaddrinfo function.])], + [AC_CHECK_LIB(socket, getaddrinfo, + [AC_DEFINE([HAVE_GETADDRINFO]) LIBS="-lsocket -lnsl $LIBS"], , -lnsl)]) + AC_CHECK_FUNCS(inet_ntop) fi -dnl If all goes well, by this point the previous two checks will have -dnl pulled in -lsocket and -lnsl if we need them. -AC_CHECK_FUNC(getaddrinfo, - [AC_DEFINE([HAVE_GETADDRINFO], [1], - [Define to 1 if you have the getaddrinfo function.])], - [AC_CHECK_LIB(socket, getaddrinfo, - [AC_DEFINE([HAVE_GETADDRINFO]) LIBS="-lsocket -lnsl $LIBS"], , -lnsl)]) -AC_CHECK_FUNCS(inet_ntop) AC_CHECK_FUNCS(getifaddrs) dnl Check for socklen_t (in Unix98) AC_MSG_CHECKING(for socklen_t)