diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-06-21 02:42:34 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-06-21 02:42:34 +0000 |
| commit | e96a9190a3099fe08e64468ecb7bca95121eac25 (patch) | |
| tree | 4de9c9d3a5a1efbba0620ea8273599882d569bb0 | |
| parent | 1ff4e9008b70ccf521179ad1a2438bdc93554fd4 (diff) | |
Refactor how libraries are checked for connect() function, follow-up.
| -rw-r--r-- | acinclude.m4 | 5 | ||||
| -rw-r--r-- | ares/acinclude.m4 | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8c6f5bbff..d0e28aa74 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2208,6 +2208,7 @@ dnl Verify if network connect function is already available dnl using current libraries or if another one is required. AC_DEFUN([CURL_CHECK_LIBS_CONNECT], [ + AC_REQUIRE([CURL_INCLUDES_WINSOCK2])dnl AC_MSG_CHECKING([for connect in libraries]) tst_connect_save_LIBS="$LIBS" tst_connect_need_LIBS="unknown" @@ -2216,6 +2217,10 @@ AC_DEFUN([CURL_CHECK_LIBS_CONNECT], [ LIBS="$tst_lib $tst_connect_save_LIBS" AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ + $curl_includes_winsock2 + #ifndef HAVE_WINDOWS_H + int connect(int, void*, int); + #endif ]],[[ if(0 != connect(0, 0, 0)) return 1; diff --git a/ares/acinclude.m4 b/ares/acinclude.m4 index 4c5e8c736..336dfabb6 100644 --- a/ares/acinclude.m4 +++ b/ares/acinclude.m4 @@ -1676,6 +1676,7 @@ dnl Verify if network connect function is already available dnl using current libraries or if another one is required. AC_DEFUN([CARES_CHECK_LIBS_CONNECT], [ + AC_REQUIRE([CARES_INCLUDES_WINSOCK2])dnl AC_MSG_CHECKING([for connect in libraries]) tst_connect_save_LIBS="$LIBS" tst_connect_need_LIBS="unknown" @@ -1684,6 +1685,10 @@ AC_DEFUN([CARES_CHECK_LIBS_CONNECT], [ LIBS="$tst_lib $tst_connect_save_LIBS" AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ + $cares_includes_winsock2 + #ifndef HAVE_WINDOWS_H + int connect(int, void*, int); + #endif ]],[[ if(0 != connect(0, 0, 0)) return 1; |