From 4b6e68282b654df389016c47c80adc66ee0163c2 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Sat, 22 Jun 2024 02:34:36 +0200
Subject: [PATCH] cmake: Stop using win32config.h

Move this file to the win32 subdirectory.
---
 CMakeLists.txt                   | 6 +-----
 include/Makefile.am              | 2 +-
 win32/configure.js               | 2 +-
 {include => win32}/win32config.h | 0
 4 files changed, 3 insertions(+), 7 deletions(-)
 rename {include => win32}/win32config.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5c35a38..a207e145 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -587,11 +587,7 @@ install(
     COMPONENT development
 )
 
-if(MSVC)
-    configure_file(include/win32config.h config.h COPYONLY)
-else()
-    configure_file(config.h.cmake.in config.h)
-endif()
+configure_file(config.h.cmake.in config.h)
 configure_file(include/libxml/xmlversion.h.in libxml/xmlversion.h)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml/xmlversion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development)
 
diff --git a/include/Makefile.am b/include/Makefile.am
index 328b9932..c2f978db 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 SUBDIRS=libxml private
 
-EXTRA_DIST = win32config.h wsockcompat.h meson.build
+EXTRA_DIST = wsockcompat.h meson.build
 
diff --git a/win32/configure.js b/win32/configure.js
index 92f3fc7d..f2d26f77 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -605,7 +605,7 @@ if (f) {
 fso.CopyFile(makefile, new_makefile, true);
 WScript.Echo("Created Makefile.");
 // Create the config.h.
-var confighsrc = "..\\include\\win32config.h";
+var confighsrc = "win32config.h";
 var configh = "..\\config.h";
 var f = fso.FileExists(configh);
 if (f) {
diff --git a/include/win32config.h b/win32/win32config.h
similarity index 100%
rename from include/win32config.h
rename to win32/win32config.h