From 7455717359cccc96d5a5928d84d78cba936e2061 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 27 Feb 2017 15:05:52 +0000
Subject: [PATCH] - Fix #1226: provide official 32bit binary for windows.

git-svn-id: file:///svn/unbound/trunk@4028 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 doc/Changelog |  1 +
 makedist.sh   | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 1a2cee1e7..24e08c95a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 27 February 2017: Wouter
 	- Fix #1227: Fix that Unbound control allows weak ciphersuits.
+	- Fix #1226: provide official 32bit binary for windows.
 
 24 February 2017: Wouter
 	- include sys/time.h for new shm code on NetBSD.
diff --git a/makedist.sh b/makedist.sh
index 992c16f59..46a5263c2 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -205,7 +205,6 @@ while [ "$1" ]; do
 	    ;;
 	"-w32")
 	    W64="no"
-	    shift
 	    ;;
         "-w")
             DOWIN="yes"
@@ -324,9 +323,20 @@ if [ "$DOWIN" = "yes" ]; then
     # procedure for making unbound installer on mingw. 
     info "Creating windows dist unbound $version"
     info "Calling configure"
-    echo "$configure"' --enable-debug --enable-static-exe --disable-flto '"$* $cross_flag"
-    $configure --enable-debug --enable-static-exe --disable-flto $* $cross_flag \
+    if test "$W64" = "no"; then
+	file_flag="--with-conf-file=C:\Program Files (x86)\Unbound\service.conf"
+	file2_flag="--with-rootkey-file=C:\Program Files (x86)\Unbound\root.key"
+	file3_flag="--with-rootcert-file=C:\Program Files (x86)\Unbound\icannbundle.pem"
+	version="$version"-w32
+    fi
+    echo "$configure"' --enable-debug --enable-static-exe --disable-flto '"$* $cross_flag "$file_flag" "$file2_flag" "$file3_flag""
+    if test "$W64" = "no"; then
+        $configure --enable-debug --enable-static-exe --disable-flto $* $cross_flag "$file_flag" "$file2_flag" "$file3_flag" \
 	|| error_cleanup "Could not configure"
+    else
+        $configure --enable-debug --enable-static-exe --disable-flto $* $cross_flag \
+	|| error_cleanup "Could not configure"
+    fi
     info "Calling make"
     make || error_cleanup "Could not make"
     info "Make complete"