From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 2 Apr 2020 13:33:40 +0000 (+0200)
Subject: don't force windows versions if they are set in the environment
X-Git-Tag: v3.5.0~25^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fd0c0152bda69de7470850a0fa14b1571b241e2;p=thirdparty%2Flibarchive.git

don't force windows versions if they are set in the environment
---

diff --git a/configure.ac b/configure.ac
index 41ba5a49b..fbb7b3c25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,9 +245,23 @@ AM_CONDITIONAL([STATIC_BSDCPIO], [ test "$static_bsdcpio" = yes ])
 # Set up defines needed before including any headers
 case $host in
   *mingw* | *cygwin* | *msys*  )
-  AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.])
-  AC_DEFINE([WINVER], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.])
-  AC_DEFINE([NTDDI_VERSION], 0x05020000, [Define to '0x05020000' for Windows Server 2003 APIs.])
+  AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+    [[#ifdef _WIN32_WINNT
+     # error _WIN32_WINNT already defined
+     #endif
+    ]],[[;]])
+  ],[
+    AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.])
+    AC_DEFINE([NTDDI_VERSION], 0x05020000, [Define to '0x05020000' for Windows Server 2003 APIs.])
+  ])
+  AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+    [[#ifdef WINVER
+     # error WINVER already defined
+     #endif
+    ]],[[;]])
+  ],[
+    AC_DEFINE([WINVER], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.])
+  ])
   ;;
 esac