X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a30f1c8aec383bfc91dc7bddf2bc27a6495130e..98e78a5eb45c4e7b90bb045b7ed7a0b234f4eea4:/configure.in diff --git a/configure.in b/configure.in index a810fe16c8..cb11a6970f 100644 --- a/configure.in +++ b/configure.in @@ -1125,19 +1125,25 @@ dnl When we are using Cygwin with Motif/GTK+, we want it to appear like dnl 'just' a POSIX platform, so the Win32 API must not be available dnl --------------------------------------------------------------------------- -define_win32=0 +dnl (Windows-only piece) +wants_win32=0 +doesnt_want_win32=0 case "${host}" in *-*-cygwin*) if test "$wxUSE_MSW" = 1 ; then - define_win32=1 + wants_win32=1 + else + doesnt_want_win32=1 fi ;; *-*-mingw*) - define_win32=1 + wants_win32=1 ;; esac -if test "$define_win32" = 1 ; then +dnl NB: The two tests bellow are *NOT* mutually exclusive! They should only +dnl take effect on Cygwin/Mingw and not other platforms. +if test "$wants_win32" = 1 ; then USE_UNIX=0 USE_WIN32=1 AC_DEFINE(__WIN32__) @@ -1146,10 +1152,12 @@ if test "$define_win32" = 1 ; then AC_DEFINE(__GNUWIN32__) AC_DEFINE(STRICT) AC_DEFINE(WINVER, 0x0400) -else +fi +if test "$doesnt_want_win32" = 1 ; then USE_UNIX=1 USE_WIN32=0 fi +dnl (end of Windows-only piece) if test "$USE_UNIX" = 1 ; then wxUSE_UNIX=yes