[vlc-commits] configure: Check the toolchain default _WIN32_WINNT in addition to a command line override

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Fri Apr  3 14:10:42 2020 +0300| [b8395c1b9d19b0e094f0b20f8218b9d2747fece9] | committer: Martin Storsjo

configure: Check the toolchain default _WIN32_WINNT in addition to a command line override

Since 255e2ce27, we try not to override _WIN32_WINNT in case it already
is defined on the command line to a higher value. However, if it isn't
specified on the command line, but the toolchain headers default to
a newer version, we should also honor it and keep that version instead
of forcing a lower version here. (If the toolchain defaults to a newer
version, runtime libs of the toolchain may rely on such a new version
anyway, so forcing a lower target within VLC might be useless.)

EDIT: Adapted to a different default version in the 3.0 branch.

(cherry picked from commit 0d65fe038a76d3686d2e37c5b522fb24b92d8157)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=b8395c1b9d19b0e094f0b20f8218b9d2747fece9
---

 configure.ac | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configure.ac b/configure.ac
index 99b31a7461..074d40bb0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,6 +221,11 @@ case "${host_os}" in
     AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
       [[#ifdef _WIN32_WINNT
        # error _WIN32_WINNT already defined
+       #else
+       # include <windows.h>
+       # if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0502
+       #  error _WIN32_WINNT toolchain default high enough
+       # endif
        #endif
       ]],[[;]])
     ],[