rootkey file to windows port

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

diff --git a/configure b/configure
index 0720178e2dac3cfa8993a9d9f508159164d61774..7764ae18a39fe7bab5ca0f014aa1af270aad56a4 100755 (executable)
--- 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 b0bff8efdf2303355af5cc55e630bd4d74c227a4..19391ed72b55505979293f81844c4a519b13b03f 100644 (file)
--- 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 ca196e0e2f052dfedca8fc97e81b42fc5024d156..4ae9f4325bea3c9f5f158d4ead150a21f3df7adb 100755 (executable)
--- 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 a80fec22ca7efc7da6610402ba66893fd044a52c..250628771157881859fd4b284576540b22496dda 100644 (file)
--- a/winrc/README.txt
+++ b/winrc/README.txt
@@ -66,6 +66,7 @@ $ tar xzvf unbound-xxx.tar.gz
 $ cd unbound-xxx\r
 $ ./configure --enable-static-exe --with-ldns=../ldns-xxx\r
 If you compiled openssl yourself, pass --with-ssl=../openssl-xxx too.\r
+If you compiled libexpat yourself, pass --with-libexpat=../expat-install too.\r
 The configure options for libevent or threads are not applicable for \r
 windows, because builtin alternatives for the windows platform are used.\r
 $ make\r