From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 29 Jun 2016 11:22:57 +0000 (+0000)
Subject: - Fix static compile on windows missing gdi32.
X-Git-Tag: release-1.5.10~64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9282f12b179ae7e0ff6e96b111a95292a40711d;p=thirdparty%2Funbound.git

- Fix static compile on windows missing gdi32.


git-svn-id: file:///svn/unbound/trunk@3801 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/configure b/configure
index 15c528195..bf997a51f 100755
--- a/configure
+++ b/configure
@@ -18356,10 +18356,8 @@ if test x_$enable_static_exe = x_yes; then
 	staticexe="-static"
 	if test "$on_mingw" = yes; then
 		staticexe="-all-static"
-		# for static crosscompile, include gdi32 and zlib here.
-		if test "`uname`" = "Linux"; then
-			LIBS="$LIBS -lgdi32 -lz"
-		fi
+		# for static compile, include gdi32 and zlib here.
+		LIBS="$LIBS -lgdi32 -lz"
 	fi
 fi
 
diff --git a/configure.ac b/configure.ac
index 850fd4565..a007e8d34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1000,10 +1000,8 @@ if test x_$enable_static_exe = x_yes; then
 	staticexe="-static"
 	if test "$on_mingw" = yes; then
 		staticexe="-all-static"
-		# for static crosscompile, include gdi32 and zlib here.
-		if test "`uname`" = "Linux"; then
-			LIBS="$LIBS -lgdi32 -lz"
-		fi
+		# for static compile, include gdi32 and zlib here.
+		LIBS="$LIBS -lgdi32 -lz"
 	fi
 fi
 
diff --git a/doc/Changelog b/doc/Changelog
index 52039ccd0..d322dd637 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+29 June 2016: Wouter
+	- Fix static compile on windows missing gdi32.
+
 28 June 2016: Wouter
 	- Create a pkg-config file for libunbound in contrib.