/pidgin/main: 45db81738d2e: cross-win32: don't check for socket ...
Tomasz Wasilczyk
twasilczyk at pidgin.im
Mon Apr 14 20:56:03 EDT 2014
Changeset: 45db81738d2ee784a7e9db802122f76d25d80c74
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2014-04-15 02:55 +0200
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/45db81738d2e
Description:
cross-win32: don't check for socket and inet_aton
diffstat:
configure.ac | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diffs (41 lines):
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -121,6 +121,16 @@ AC_FUNC_ALLOCA
dnl Check for Sun compiler
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+dnl Check for Win32
+case "$host" in
+ *-*-mingw* | *-*-cygwin*)
+ is_win32="yes"
+ ;;
+ *)
+ is_win32="no"
+ ;;
+esac
+
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
@@ -147,12 +157,16 @@ AC_CHECK_FUNCS(getopt_long,,
])
dnl Check for inet_aton
-AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
- [AC_MSG_ERROR([inet_aton not found])])])
+if test "x$is_win32" != "xyes" ; then
+ AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
+ [AC_MSG_ERROR([inet_aton not found])])])
+fi
AC_CHECK_LIB(resolv, __res_query)
AC_CHECK_LIB(nsl, gethostent)
-AC_CHECK_FUNC(socket, ,
- [AC_CHECK_LIB(socket, socket, , [AC_MSG_ERROR([socket not found])])])
+if test "x$is_win32" != "xyes" ; then
+ AC_CHECK_FUNC(socket, , [AC_CHECK_LIB(socket, socket, ,
+ [AC_MSG_ERROR([socket not found])])])
+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,
More information about the Commits
mailing list