mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
Tests to check the availability of compilable and
valid windows.h winsock.h winsock2.h and ws2tcpip.h header files: CURL_CHECK_HEADER_WINDOWS CURL_CHECK_HEADER_WINSOCK CURL_CHECK_HEADER_WINSOCK2 CURL_CHECK_HEADER_WS2TCPIP
This commit is contained in:
parent
8f25a95b47
commit
51581c034d
117
acinclude.m4
117
acinclude.m4
@ -1,3 +1,116 @@
|
|||||||
|
|
||||||
|
|
||||||
|
dnl CURL_CHECK_HEADER_WINDOWS
|
||||||
|
dnl -------------------------------------------------
|
||||||
|
dnl Checks for compilable and valid windows.h header
|
||||||
|
|
||||||
|
AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
|
||||||
|
AC_CACHE_CHECK([for windows.h], [ac_cv_header_windows_h], [
|
||||||
|
AC_COMPILE_IFELSE([
|
||||||
|
AC_LANG_PROGRAM([
|
||||||
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
#include <windows.h>
|
||||||
|
],[
|
||||||
|
int dummy=2*WINVER;
|
||||||
|
])
|
||||||
|
],[
|
||||||
|
ac_cv_header_windows_h="yes"
|
||||||
|
],[
|
||||||
|
ac_cv_header_windows_h="no"
|
||||||
|
])
|
||||||
|
])
|
||||||
|
if test "x$ac_cv_header_windows_h" = "xyes"; then
|
||||||
|
AC_DEFINE_UNQUOTED(HAVE_WINDOWS_H, "1",
|
||||||
|
[Define to 1 if you have the windows.h header file.])
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl CURL_CHECK_HEADER_WINSOCK
|
||||||
|
dnl -------------------------------------------------
|
||||||
|
dnl Checks for compilable and valid winsock.h header
|
||||||
|
|
||||||
|
AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [
|
||||||
|
AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
|
||||||
|
AC_CACHE_CHECK([for winsock.h], [ac_cv_header_winsock_h], [
|
||||||
|
AC_COMPILE_IFELSE([
|
||||||
|
AC_LANG_PROGRAM([
|
||||||
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
#include <windows.h>
|
||||||
|
#include <winsock.h>
|
||||||
|
],[
|
||||||
|
int dummy=WSACleanup();
|
||||||
|
])
|
||||||
|
],[
|
||||||
|
ac_cv_header_winsock_h="yes"
|
||||||
|
],[
|
||||||
|
ac_cv_header_winsock_h="no"
|
||||||
|
])
|
||||||
|
])
|
||||||
|
if test "x$ac_cv_header_winsock_h" = "xyes"; then
|
||||||
|
AC_DEFINE_UNQUOTED(HAVE_WINSOCK_H, "1",
|
||||||
|
[Define to 1 if you have the winsock.h header file.])
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl CURL_CHECK_HEADER_WINSOCK2
|
||||||
|
dnl -------------------------------------------------
|
||||||
|
dnl Checks for compilable and valid winsock2.h header
|
||||||
|
|
||||||
|
AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [
|
||||||
|
AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
|
||||||
|
AC_CACHE_CHECK([for winsock2.h], [ac_cv_header_winsock2_h], [
|
||||||
|
AC_COMPILE_IFELSE([
|
||||||
|
AC_LANG_PROGRAM([
|
||||||
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
#include <windows.h>
|
||||||
|
#include <winsock2.h>
|
||||||
|
],[
|
||||||
|
int dummy=2*IPPROTO_ESP;
|
||||||
|
])
|
||||||
|
],[
|
||||||
|
ac_cv_header_winsock2_h="yes"
|
||||||
|
],[
|
||||||
|
ac_cv_header_winsock2_h="no"
|
||||||
|
])
|
||||||
|
])
|
||||||
|
if test "x$ac_cv_header_winsock2_h" = "xyes"; then
|
||||||
|
AC_DEFINE_UNQUOTED(HAVE_WINSOCK2_H, "1",
|
||||||
|
[Define to 1 if you have the winsock2.h header file.])
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl CURL_CHECK_HEADER_WS2TCPIP
|
||||||
|
dnl -------------------------------------------------
|
||||||
|
dnl Checks for compilable and valid ws2tcpip.h header
|
||||||
|
|
||||||
|
AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
|
||||||
|
AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
|
||||||
|
AC_CACHE_CHECK([for ws2tcpip.h], [ac_cv_header_ws2tcpip_h], [
|
||||||
|
AC_COMPILE_IFELSE([
|
||||||
|
AC_LANG_PROGRAM([
|
||||||
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
#include <windows.h>
|
||||||
|
#include <winsock2.h>
|
||||||
|
#include <ws2tcpip.h>
|
||||||
|
],[
|
||||||
|
int dummy=2*IP_PKTINFO;
|
||||||
|
])
|
||||||
|
],[
|
||||||
|
ac_cv_header_ws2tcpip_h="yes"
|
||||||
|
],[
|
||||||
|
ac_cv_header_ws2tcpip_h="no"
|
||||||
|
])
|
||||||
|
])
|
||||||
|
if test "x$ac_cv_header_ws2tcpip_h" = "xyes"; then
|
||||||
|
AC_DEFINE_UNQUOTED(HAVE_WS2TCPIP_H, "1",
|
||||||
|
[Define to 1 if you have the ws2tcpip.h header file.])
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
dnl Check for how to set a socket to non-blocking state. There seems to exist
|
dnl Check for how to set a socket to non-blocking state. There seems to exist
|
||||||
dnl four known different ways, with the one used almost everywhere being POSIX
|
dnl four known different ways, with the one used almost everywhere being POSIX
|
||||||
dnl and XPG3, while the other different ways for different systems (old BSD,
|
dnl and XPG3, while the other different ways for different systems (old BSD,
|
||||||
@ -758,9 +871,9 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [
|
|||||||
shift
|
shift
|
||||||
AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG2, $[1],
|
AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG2, $[1],
|
||||||
[Define to the type of arg 2 for `getnameinfo'.])
|
[Define to the type of arg 2 for `getnameinfo'.])
|
||||||
AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG46, ($[2]),
|
AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG46, $[2],
|
||||||
[Define to the type of args 4 and 6 for `getnameinfo'.])
|
[Define to the type of args 4 and 6 for `getnameinfo'.])
|
||||||
AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG7, ($[3]),
|
AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG7, $[3],
|
||||||
[Define to the type of arg 7 for `getnameinfo'.])
|
[Define to the type of arg 7 for `getnameinfo'.])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
16
configure.ac
16
configure.ac
@ -289,6 +289,22 @@ AC_HELP_STRING([--disable-manual],[Disable built-in manual]),
|
|||||||
dnl The actual use of the USE_MANUAL variable is done much later in this
|
dnl The actual use of the USE_MANUAL variable is done much later in this
|
||||||
dnl script to allow other actions to disable it as well.
|
dnl script to allow other actions to disable it as well.
|
||||||
|
|
||||||
|
dnl **********************************************************************
|
||||||
|
dnl Make sure that our checks for headers windows.h winsock.h winsock2.h
|
||||||
|
dnl and ws2tcpip.h take precedence over any other further check done later.
|
||||||
|
dnl **********************************************************************
|
||||||
|
|
||||||
|
dnl Do we have a compilable and valid windows.h header ?
|
||||||
|
CURL_CHECK_HEADER_WINDOWS
|
||||||
|
|
||||||
|
dnl Do we have a compilable and valid winsock.h header ?
|
||||||
|
CURL_CHECK_HEADER_WINSOCK
|
||||||
|
|
||||||
|
dnl Do we have a compilable and valid winsock2.h header ?
|
||||||
|
CURL_CHECK_HEADER_WINSOCK2
|
||||||
|
|
||||||
|
dnl Do we have a compilable and valid ws2tcpip.h header ?
|
||||||
|
CURL_CHECK_HEADER_WS2TCPIP
|
||||||
|
|
||||||
dnl **********************************************************************
|
dnl **********************************************************************
|
||||||
dnl Checks for libraries.
|
dnl Checks for libraries.
|
||||||
|
Loading…
Reference in New Issue
Block a user