aboutsummaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-05-14 19:42:17 +0000
committerYang Tse <yangsita@gmail.com>2008-05-14 19:42:17 +0000
commit2748c64d605b19fb419ae56810ad8da36487a2d4 (patch)
treed764ebde2da9bbdffac2612040805fd6010f1555 /acinclude.m4
parentc4f1ab3cc53af12347bab603bb8bdfed67b354b1 (diff)
Improve toolchain detection for WinCE cross compilation:
When cross compiling WinCE with the arm-wince-cegcc-gcc C compiler symbol __CEGCC__ is defined and the unix-like compatibility layer is used. For our purposes this is not a native Windows build. When cross compiling WinCE with the arm-wince-mingw32ce-gcc C compiler symbol __MINGW32CE__ is defined and the unix-like compatibility layer is not used. For our purposes this _is_ a native Windows build.
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m410
1 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index a9ace2041..27319ddba 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -36,7 +36,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
#endif
#include <windows.h>
],[
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(__CEGCC__)
HAVE_WINDOWS_H shall not be defined.
#else
int dummy=2*WINVER;
@@ -72,7 +72,7 @@ AC_DEFUN([CURL_CHECK_NATIVE_WINDOWS], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([
],[
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || defined(__MINGW32CE__)
int dummy=1;
#else
Not a native Windows build target.
@@ -110,7 +110,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [
#include <windows.h>
#include <winsock.h>
],[
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(__CEGCC__)
HAVE_WINSOCK_H shall not be defined.
#else
int dummy=WSACleanup();
@@ -147,7 +147,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [
#include <windows.h>
#include <winsock2.h>
],[
-#if defined(__CYGWIN__) || defined(_WIN32_WCE)
+#if defined(__CYGWIN__) || defined(__CEGCC__) || defined(__MINGW32CE__)
HAVE_WINSOCK2_H shall not be defined.
#else
int dummy=2*IPPROTO_ESP;
@@ -185,7 +185,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
#include <winsock2.h>
#include <ws2tcpip.h>
],[
-#if defined(__CYGWIN__) || defined(_WIN32_WCE)
+#if defined(__CYGWIN__) || defined(__CEGCC__) || defined(__MINGW32CE__)
HAVE_WS2TCPIP_H shall not be defined.
#else
int dummy=2*IP_PKTINFO;