diff options
| author | Yang Tse <yangsita@gmail.com> | 2008-05-14 16:14:35 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2008-05-14 16:14:35 +0000 |
| commit | 5e06ec8409cc0811b047008da3556eb9b3e13021 (patch) | |
| tree | 4accbcaa004e34ed4d242716d6e435c3d78762e6 /ares/configure.ac | |
| parent | 04d0a84ae5bba155bb32d16c48d9dd6906182289 (diff) | |
skip checks for Windows specific header files
when build target is not a native Windows one
Diffstat (limited to 'ares/configure.ac')
| -rw-r--r-- | ares/configure.ac | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/ares/configure.ac b/ares/configure.ac index da728edac..d1755bb14 100644 --- a/ares/configure.ac +++ b/ares/configure.ac @@ -124,6 +124,28 @@ dnl ********************************************************************** CURL_DETECT_ICC([CFLAGS="$CFLAGS -we 147"]) 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 checks which +dnl could be done later using AC_CHECK_HEADER or AC_CHECK_HEADERS for +dnl this specific header files. And do them before its results are used. +dnl ********************************************************************** + +CURL_CHECK_HEADER_WINDOWS +CURL_CHECK_NATIVE_WINDOWS +case X-"$ac_cv_native_windows" in + X-yes) + CURL_CHECK_HEADER_WINSOCK + CURL_CHECK_HEADER_WINSOCK2 + CURL_CHECK_HEADER_WS2TCPIP + ;; + *) + ac_cv_header_winsock_h="no" + ac_cv_header_winsock2_h="no" + ac_cv_header_ws2tcpip_h="no" + ;; +esac + +dnl ********************************************************************** dnl platform/compiler/architecture specific checks/flags dnl ********************************************************************** @@ -365,18 +387,6 @@ dnl ********************************************************************** dnl Checks for header files. AC_HEADER_STDC -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 checks which -dnl could be done later using AC_CHECK_HEADER or AC_CHECK_HEADERS for -dnl this specific header files. And do them before its results are used. -dnl ********************************************************************** - -CURL_CHECK_HEADER_WINDOWS -CURL_CHECK_HEADER_WINSOCK -CURL_CHECK_HEADER_WINSOCK2 -CURL_CHECK_HEADER_WS2TCPIP - CURL_CHECK_HEADER_MALLOC dnl check for a few basic system headers we need |