- makedist crosscompile to windows uses builtin ldns not host ldns.

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

diff --git a/doc/Changelog b/doc/Changelog
index a1408ee930186e1c23b510f9f1301bb79d6bc529..3054c0f728cdc406b55bd8c3782bad5f4b81c6ba 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
        - trunk contains 1.4.6 in development.
        - Fix TCPreply on systems with no writev, if just 1 byte could be sent.
        - Fix to use one pointer less for iterator query state store_parent_NS.
+       - makedist crosscompile to windows uses builtin ldns not host ldns.
 
 11 June 2010: Wouter
        - When retry to parent the retrycount is not wiped, so failed 

diff --git a/makedist.sh b/makedist.sh
index d1caf468dd126e33b04dad272bac737d64c652a6..e259091e9f905d5d859838d1fb565747c2b74ae6 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -168,13 +168,15 @@ while [ "$1" ]; do
 done
 
 if [ "$DOWIN" = "yes" ]; then
-    # detect crosscompile, from Fedora11 at this point.
+    # detect crosscompile, from Fedora13 at this point.
     if test "`uname`" = "Linux"; then 
        info "Crosscompile windows dist"
         cross="yes"
        configure="mingw32-configure"
        strip="i686-pc-mingw32-strip"
        makensis="makensis"     # from mingw32-nsis package
+       # in crosscompile no installed ldns, use builtin (not linux-ldns)
+       cross_flag="--with-ldns-builtin"
 
        check_svn_root
        create_temp_dir
@@ -186,6 +188,7 @@ if [ "$DOWIN" = "yes" ]; then
        if test -f mingw32-config.cache; then rm mingw32-config.cache; fi
     else 
        cross="no"      # mingw and msys
+       cross_flag=""
        configure="./configure"
        strip="strip"
        makensis="c:/Program Files/NSIS/makensis.exe" # http://nsis.sf.net
@@ -213,8 +216,8 @@ 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 '"$*"
-    $configure --enable-debug --enable-static-exe $* \
+    echo "$configure"' --enable-debug --enable-static-exe '"$* $cross_flag"
+    $configure --enable-debug --enable-static-exe $* $cross_flag \
        || error_cleanup "Could not configure"
     info "Calling make"
     make || error_cleanup "Could not make"