From a26f3d70dcacd133b894f0320fdd7e46c3402f2e Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 13 Oct 2010 13:32:55 +0000
Subject: [PATCH] rootkey file to windows port

git-svn-id: file:///svn/unbound/trunk@2284 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 configure        | 4 ++--
 configure.ac     | 4 ++--
 makedist.sh      | 8 ++++----
 winrc/README.txt | 1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 0720178e2..7764ae18a 100755
--- a/configure
+++ b/configure
@@ -4080,7 +4080,7 @@ else
   if test $on_mingw = no; then
     UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key"
 else
-    UNBOUND_ROOTKEY_FILE=""
+    UNBOUND_ROOTKEY_FILE="C:\\Program Files\\Unbound\\root.key"
 fi
 
 fi
@@ -4102,7 +4102,7 @@ else
   if test $on_mingw = no; then
     UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem"
 else
-    UNBOUND_ROOTCERT_FILE=""
+    UNBOUND_ROOTCERT_FILE="C:\\Program Files\\Unbound\\icannbundle.pem"
 fi
 
 fi
diff --git a/configure.ac b/configure.ac
index b0bff8efd..19391ed72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,7 +161,7 @@ AC_ARG_WITH(rootkey-file,
 if test $on_mingw = no; then
     UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key"
 else
-    UNBOUND_ROOTKEY_FILE=""
+    UNBOUND_ROOTKEY_FILE="C:\\Program Files\\Unbound\\root.key"
 fi
 )
 AC_SUBST(UNBOUND_ROOTKEY_FILE)
@@ -175,7 +175,7 @@ AC_ARG_WITH(rootcert-file,
 if test $on_mingw = no; then
     UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem"
 else
-    UNBOUND_ROOTCERT_FILE=""
+    UNBOUND_ROOTCERT_FILE="C:\\Program Files\\Unbound\\icannbundle.pem"
 fi
 )
 AC_SUBST(UNBOUND_ROOTCERT_FILE)
diff --git a/makedist.sh b/makedist.sh
index ca196e0e2..4ae9f4325 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -222,10 +222,10 @@ if [ "$DOWIN" = "yes" ]; then
 		cd expat-* || error_cleanup "no expat-X dir in tarball"
 		info "wxp: configure"
 		mingw32-configure --prefix="$wxpinstall" --exec-prefix="$wxpinstall" --bindir="$wxpinstall/bin" --includedir="$wxpinstall/include" --mandir="$wxpinstall/man" --libdir="$wxpinstall/lib"  || error_cleanup "libexpat configure failed"
-		info "wxp: make"
-		make || error_cleanup "libexpat crosscompile failed"
-		info "wxp: make install"
-		make install || error_cleanup "libexpat install failed"
+		#info "wxp: make"
+		#make || error_cleanup "libexpat crosscompile failed"
+		info "wxp: make installlib"
+		make installlib || error_cleanup "libexpat install failed"
 		cross_flag="$cross_flag --with-libexpat=$wxpinstall"
 		cd ..
 	fi
diff --git a/winrc/README.txt b/winrc/README.txt
index a80fec22c..250628771 100644
--- a/winrc/README.txt
+++ b/winrc/README.txt
@@ -66,6 +66,7 @@ $ tar xzvf unbound-xxx.tar.gz
 $ cd unbound-xxx
 $ ./configure --enable-static-exe --with-ldns=../ldns-xxx
 If you compiled openssl yourself, pass --with-ssl=../openssl-xxx too.
+If you compiled libexpat yourself, pass --with-libexpat=../expat-install too.
 The configure options for libevent or threads are not applicable for 
 windows, because builtin alternatives for the windows platform are used.
 $ make
-- 
2.47.2