From 7683a8b7a9e8f4be61a5dee67667db54646d80d3 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 12 Sep 2023 08:58:44 +0200
Subject: Release version 3.2.4+2

- Don't insist on LIBXERCES_C_{SHARED,STATIC} for non-Windows platforms.

- Don't link winsock if network support is disabled.

- Add binary distribution package build configurations.
---
 libxerces-c/xercesc/buildfile                       |  6 ++++--
 libxerces-c/xercesc/util/Xerces_autoconf_config.hpp | 11 ++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'libxerces-c/xercesc')

diff --git a/libxerces-c/xercesc/buildfile b/libxerces-c/xercesc/buildfile
index 15f61b1..88cf9b1 100644
--- a/libxerces-c/xercesc/buildfile
+++ b/libxerces-c/xercesc/buildfile
@@ -126,7 +126,8 @@ switch $tclass, $tsys
     #
     cxx.loptions += -Wl,--no-undefined
 
-    cxx.libs += -lws2_32
+    if $network
+      cxx.libs += -lws2_32
   }
   case 'windows'
   {
@@ -137,7 +138,8 @@ switch $tclass, $tsys
     if! $transcoder_icu
       cxx.libs += advapi32.lib
 
-    cxx.libs += ws2_32.lib
+    if $network
+      cxx.libs += ws2_32.lib
   }
   case 'linux'
   {
diff --git a/libxerces-c/xercesc/util/Xerces_autoconf_config.hpp b/libxerces-c/xercesc/util/Xerces_autoconf_config.hpp
index 2b088cf..e88b063 100644
--- a/libxerces-c/xercesc/util/Xerces_autoconf_config.hpp
+++ b/libxerces-c/xercesc/util/Xerces_autoconf_config.hpp
@@ -135,10 +135,15 @@
  * type. Note that falling back to defining the XERCES_PLATFORM_IMPORT macro
  * as empty would work for both the static and shared libraries (being
  * sub-optimal for the later) but only for functions. Xerces-C++, however,
- * also exports data symbols, which cannot be imported this way. Thus we,
- * just issue an error.
+ * also exports data symbols, which cannot be imported this way. Thus,
+ * where matters (Windows), we just issue an error.
  */
-#  error define LIBXERCES_C_STATIC or LIBXERCES_C_SHARED preprocessor macro to signal Xerces-C++ library type being linked
+#  ifdef _WIN32
+#    error define LIBXERCES_C_STATIC or LIBXERCES_C_SHARED preprocessor macro to signal Xerces-C++ library type being linked
+#  else
+#    define XERCES_PLATFORM_IMPORT
+#    define XERCES_PLATFORM_DECEXPORT
+#  endif
 #endif
 
 #ifdef XERCES_DLL_EXPORT
-- 
cgit v1.1