[libvirt PATCH 013/351] meson: set windows variables for AI_ADDRCONFIG

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:54:09 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 configure.ac | 4 ----
 meson.build  | 6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7294b61bc46..445a44f2e79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,10 +154,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"])
 if test "$with_win" = "yes" ; then
   # We don't support the daemon yet
   with_libvirtd=no
-
-  # For AI_ADDRCONFIG
-  AC_DEFINE([_WIN32_WINNT], [0x0600], [Win Vista / Server 2008])
-  AC_DEFINE([WINVER], [0x0600], [Win Vista / Server 2008])
 fi
 
 # The daemon requires remote support.  Likewise, if we are not using
diff --git a/meson.build b/meson.build
index 88a163e2ee6..3b149e829d3 100644
--- a/meson.build
+++ b/meson.build
@@ -32,6 +32,12 @@ conf.set_quoted('PACKAGE_NAME', meson.project_name())
 conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 conf.set_quoted('VERSION', meson.project_version())
 
+if host_machine.system() == 'windows'
+  # For AI_ADDRCONFIG
+  conf.set('_WIN32_WINNT', '0x0600') # Win Vista / Server 2008
+  conf.set('WINVER', '0x0600') # Win Vista / Server 2008
+endif
+
 
 # set various paths
 
-- 
2.26.2




More information about the libvir-list mailing list