[vlc-commits] configure: Don't force _WIN32_WINNT to 0x0601 if it is set to a higher version

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Wed Jul 11 22:24:06 2018 +0300| [5ea7fe6fde0a5b257dadf2d36753da77e08aee31] | committer: Martin Storsjo

configure: Don't force _WIN32_WINNT to 0x0601 if it is set to a higher version

Since e807c8e91, we're explicitly unconditionally defining _WIN32_WINNT,
regardless if it was set before or not.

If it was set before (e.g. on the command line), to a higher version,
we should honor that.

This is cruicial for WinRT building, where _WIN32_WINNT is set to Windows
8 or higher on the command line.

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

(cherry picked from commit 255e2ce27954004b8e6aa65ed37266c422f08a58)

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

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index e45b21e66e..082fb3389f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,7 +218,8 @@ case "${host_os}" in
     CXXFLAGS="${CXXFLAGS} -static-libgcc"
     AC_CHECK_TOOL(WINDRES, windres, :)
     AC_CHECK_TOOL(OBJCOPY, objcopy, :)
-    AH_TOP([#if defined(_WIN32) && !defined(_WIN32_WINNT)])
+    AH_TOP([#if defined(_WIN32) && (!defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0502)])
+    AH_TOP([# undef _WIN32_WINNT])
     AH_TOP([# define _WIN32_WINNT 0x0502 /* Windows XP SP2 */])
     AH_TOP([#endif])
     AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.])