From b72c2222b90df5d077d2e128e99e801145f52f45 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Tue, 24 Sep 2019 13:32:04 -0300
Subject: [PATCH] WIN32 Static build should include libwinpthread to avoid unnecessary dll dependencies on windows.

---
 client/Makefile.in              | 5 ++++-
 client/sdk/ipc3270-static.pc.in | 2 +-
 configure.ac                    | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/Makefile.in b/client/Makefile.in
index 6dc4451..d7022a8 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -105,9 +105,12 @@ CFLAGS= \
 	@LIB3270_CFLAGS@ \
 	@DBUS_CFLAGS@
 
-LDFLAGS=@STATIC_LDFLAGS@ @LDFLAGS@
+LDFLAGS=\
+	@STATIC_LDFLAGS@ \
+	@LDFLAGS@
 
 LIBS= \
+	@STATIC_LIBS@ \
 	@LIBS@ \
 	@LIBICONV@ \
 	@INTL_LIBS@ \
diff --git a/client/sdk/ipc3270-static.pc.in b/client/sdk/ipc3270-static.pc.in
index 63145e3..ac13b63 100644
--- a/client/sdk/ipc3270-static.pc.in
+++ b/client/sdk/ipc3270-static.pc.in
@@ -8,7 +8,7 @@ product_name=@PRODUCT_NAME@
 Name: @PACKAGE_NAME@-static
 Description: @PACKAGE_DESCRIPTION@ (static library)
 Version: @PACKAGE_VERSION@
-Libs: -lipc3270.static @LIB3270_LIBS@ @DBUS_LIBS@ @LIBS@ @LIBICONV@ @INTL_LIBS@
+Libs: -lipc3270.static @LIB3270_LIBS@ @STATIC_LIBS@ @DBUS_LIBS@ @LIBS@ @LIBICONV@ @INTL_LIBS@
 Cflags: -I@includedir@
 
 
diff --git a/configure.ac b/configure.ac
index 4a81f92..39e0096 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,9 +67,9 @@ APP_RESOURCES=""
 APP_LDFLAGS=""
 DLL_LDFLAGS="-shared"
 STATIC_LDFLAGS=""
+STATIC_LIBS=""
 CLIENT_TARGETS="shared devel"
 
-
 dnl ---------------------------------------------------------------------------
 dnl Check for OS specifics
 dnl ---------------------------------------------------------------------------
@@ -83,6 +83,7 @@ case "$host" in
 		LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32 -lkernel32"
 		LDFLAGS="$LDFLAGS"
 		STATIC_LDFLAGS="-static -static-libgcc -static-libstdc++"
+		STATIC_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic"
 		DLLEXT=".dll"
 		DLLPREFIX=""
 
@@ -123,6 +124,7 @@ AC_SUBST(LOGDIR)
 AC_SUBST(DLLEXT)
 AC_SUBST(DLLPREFIX)
 AC_SUBST(STATIC_LDFLAGS)
+AC_SUBST(STATIC_LIBS)
 
 AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF) )
 
--
libgit2 0.21.2