68 files changed, 51 insertions, 67 deletions

diff --git a/MANIFEST b/MANIFEST
index 580f068..a8b2463 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -9,39 +9,6 @@ inc/Module/Install/Win32.pm
 inc/Module/Install/WriteAll.pm
 inc/Module/Install/XSUtil.pm
 include/LDNS.h
-include/ldns/buffer.h
-include/ldns/common.h
-include/ldns/config.h
-include/ldns/dane.h
-include/ldns/dname.h
-include/ldns/dnssec.h
-include/ldns/dnssec_sign.h
-include/ldns/dnssec_verify.h
-include/ldns/dnssec_zone.h
-include/ldns/duration.h
-include/ldns/error.h
-include/ldns/higher.h
-include/ldns/host2str.h
-include/ldns/host2wire.h
-include/ldns/keys.h
-include/ldns/ldns.h
-include/ldns/net.h
-include/ldns/packet.h
-include/ldns/parse.h
-include/ldns/radix.h
-include/ldns/rbtree.h
-include/ldns/rdata.h
-include/ldns/resolver.h
-include/ldns/rr.h
-include/ldns/rr_functions.h
-include/ldns/sha1.h
-include/ldns/sha2.h
-include/ldns/str2host.h
-include/ldns/tsig.h
-include/ldns/update.h
-include/ldns/util.h
-include/ldns/wire2host.h
-include/ldns/zone.h
 lib/Net/LDNS.pm
 lib/Net/LDNS/Packet.pm
 lib/Net/LDNS/RR.pm
@@ -128,39 +95,6 @@ ppport.h
 README.md
 src/assist.c
 src/LDNS.xs
-src/ldns/compat/b64_ntop.c
-src/ldns/compat/b64_pton.c
-src/ldns/buffer.c
-src/ldns/compat/strlcpy.c
-src/ldns/dane.c
-src/ldns/dname.c
-src/ldns/dnssec.c
-src/ldns/dnssec_sign.c
-src/ldns/dnssec_verify.c
-src/ldns/dnssec_zone.c
-src/ldns/duration.c
-src/ldns/error.c
-src/ldns/higher.c
-src/ldns/host2str.c
-src/ldns/host2wire.c
-src/ldns/keys.c
-src/ldns/net.c
-src/ldns/packet.c
-src/ldns/parse.c
-src/ldns/radix.c
-src/ldns/rbtree.c
-src/ldns/rdata.c
-src/ldns/resolver.c
-src/ldns/rr.c
-src/ldns/rr_functions.c
-src/ldns/sha1.c
-src/ldns/sha2.c
-src/ldns/str2host.c
-src/ldns/tsig.c
-src/ldns/update.c
-src/ldns/util.c
-src/ldns/wire2host.c
-src/ldns/zone.c
 src/typemap
 t/axfr.t
 t/dnssec.t
@@ -176,3 +110,36 @@ t/rrlist.t
 t/serialize.t
 t/threads.t
 t/utils.t
+ldns/src/buffer.c
+ldns/src/compat/b64_ntop.c
+ldns/src/compat/b64_pton.c
+ldns/src/compat/strlcpy.c
+ldns/src/dane.c
+ldns/src/dname.c
+ldns/src/dnssec.c
+ldns/src/dnssec_sign.c
+ldns/src/dnssec_verify.c
+ldns/src/dnssec_zone.c
+ldns/src/duration.c
+ldns/src/error.c
+ldns/src/higher.c
+ldns/src/host2str.c
+ldns/src/host2wire.c
+ldns/src/keys.c
+ldns/src/net.c
+ldns/src/packet.c
+ldns/src/parse.c
+ldns/src/radix.c
+ldns/src/rbtree.c
+ldns/src/rdata.c
+ldns/src/resolver.c
+ldns/src/rr.c
+ldns/src/rr_functions.c
+ldns/src/sha1.c
+ldns/src/sha2.c
+ldns/src/str2host.c
+ldns/src/tsig.c
+ldns/src/update.c
+ldns/src/util.c
+ldns/src/wire2host.c
+ldns/src/zone.c
diff --git a/Makefile.PL b/Makefile.PL
index 35596f7..5ae48a9 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -75,6 +75,23 @@ else {
 
 if (
     check_lib(
+	lib      => 'ldns',
+	header   => 'ldns/ldns.h',
+	function => 'if (!ldns_resolver_clone(ldns_resolver_new())) return 1; else return 0;'
+    )
+  )
+{
+    print "Using system ldns library.\n";
+    cc_libs 'ldns';
+}
+else {
+    print "Using embedded ldns library.\n";
+    cc_include_paths 'ldns/include';
+    cc_src_paths 'ldns/src';
+}
+
+if (
+    check_lib(
         lib      => 'idn',
         header   => 'idna.h',
         function => 'if(strcmp(IDNA_ACE_PREFIX,"xn--")==0) return 0; else return 1;'
@@ -140,4 +157,4 @@ sub check_gost {
 CODE
 
     return check_lib(%args);
-}
\ No newline at end of file
+}
diff --git a/include/ldns/buffer.h b/ldns/include/ldns/buffer.h
index 3b64198..3b64198 100644
--- a/include/ldns/buffer.h
+++ b/ldns/include/ldns/buffer.h
diff --git a/include/ldns/common.h b/ldns/include/ldns/common.h
index 9abd9b9..9abd9b9 100644
--- a/include/ldns/common.h
+++ b/ldns/include/ldns/common.h
diff --git a/include/ldns/config.h b/ldns/include/ldns/config.h
index d77cc7f..d77cc7f 100644
--- a/include/ldns/config.h
+++ b/ldns/include/ldns/config.h
diff --git a/include/ldns/dane.h b/ldns/include/ldns/dane.h
index 8234eb7..8234eb7 100644
--- a/include/ldns/dane.h
+++ b/ldns/include/ldns/dane.h
diff --git a/include/ldns/dname.h b/ldns/include/ldns/dname.h
index 291786b..291786b 100644
--- a/include/ldns/dname.h
+++ b/ldns/include/ldns/dname.h
diff --git a/include/ldns/dnssec.h b/ldns/include/ldns/dnssec.h
index f4cdafb..f4cdafb 100644
--- a/include/ldns/dnssec.h
+++ b/ldns/include/ldns/dnssec.h
diff --git a/include/ldns/dnssec_sign.h b/ldns/include/ldns/dnssec_sign.h
index f51c7fb..f51c7fb 100644
--- a/include/ldns/dnssec_sign.h
+++ b/ldns/include/ldns/dnssec_sign.h
diff --git a/include/ldns/dnssec_verify.h b/ldns/include/ldns/dnssec_verify.h
index e8b1a91..e8b1a91 100644
--- a/include/ldns/dnssec_verify.h
+++ b/ldns/include/ldns/dnssec_verify.h
diff --git a/include/ldns/dnssec_zone.h b/ldns/include/ldns/dnssec_zone.h
index b794f94..b794f94 100644
--- a/include/ldns/dnssec_zone.h
+++ b/ldns/include/ldns/dnssec_zone.h
diff --git a/include/ldns/duration.h b/ldns/include/ldns/duration.h
index f12edc4..f12edc4 100644
--- a/include/ldns/duration.h
+++ b/ldns/include/ldns/duration.h
diff --git a/include/ldns/error.h b/ldns/include/ldns/error.h
index cc11958..cc11958 100644
--- a/include/ldns/error.h
+++ b/ldns/include/ldns/error.h
diff --git a/include/ldns/higher.h b/ldns/include/ldns/higher.h
index 597e134..597e134 100644
--- a/include/ldns/higher.h
+++ b/ldns/include/ldns/higher.h
diff --git a/include/ldns/host2str.h b/ldns/include/ldns/host2str.h
index e69389e..e69389e 100644
--- a/include/ldns/host2str.h
+++ b/ldns/include/ldns/host2str.h
diff --git a/include/ldns/host2wire.h b/ldns/include/ldns/host2wire.h
index 94693cd..94693cd 100644
--- a/include/ldns/host2wire.h
+++ b/ldns/include/ldns/host2wire.h
diff --git a/include/ldns/keys.h b/ldns/include/ldns/keys.h
index d3b4873..d3b4873 100644
--- a/include/ldns/keys.h
+++ b/ldns/include/ldns/keys.h
diff --git a/include/ldns/ldns.h b/ldns/include/ldns/ldns.h
index 60663ef..60663ef 100644
--- a/include/ldns/ldns.h
+++ b/ldns/include/ldns/ldns.h
diff --git a/include/ldns/net.h b/ldns/include/ldns/net.h
index 692a9fb..692a9fb 100644
--- a/include/ldns/net.h
+++ b/ldns/include/ldns/net.h
diff --git a/include/ldns/packet.h b/ldns/include/ldns/packet.h
index e66aa34..e66aa34 100644
--- a/include/ldns/packet.h
+++ b/ldns/include/ldns/packet.h
diff --git a/include/ldns/parse.h b/ldns/include/ldns/parse.h
index 0e9034c..0e9034c 100644
--- a/include/ldns/parse.h
+++ b/ldns/include/ldns/parse.h
diff --git a/include/ldns/radix.h b/ldns/include/ldns/radix.h
index 1885959..1885959 100644
--- a/include/ldns/radix.h
+++ b/ldns/include/ldns/radix.h
diff --git a/include/ldns/rbtree.h b/ldns/include/ldns/rbtree.h
index c891934..c891934 100644
--- a/include/ldns/rbtree.h
+++ b/ldns/include/ldns/rbtree.h
diff --git a/include/ldns/rdata.h b/ldns/include/ldns/rdata.h
index 22665b1..22665b1 100644
--- a/include/ldns/rdata.h
+++ b/ldns/include/ldns/rdata.h
diff --git a/include/ldns/resolver.h b/ldns/include/ldns/resolver.h
index 228485c..228485c 100644
--- a/include/ldns/resolver.h
+++ b/ldns/include/ldns/resolver.h
diff --git a/include/ldns/rr.h b/ldns/include/ldns/rr.h
index 75ac352..75ac352 100644
--- a/include/ldns/rr.h
+++ b/ldns/include/ldns/rr.h
diff --git a/include/ldns/rr_functions.h b/ldns/include/ldns/rr_functions.h
index 09a28dd..09a28dd 100644
--- a/include/ldns/rr_functions.h
+++ b/ldns/include/ldns/rr_functions.h
diff --git a/include/ldns/sha1.h b/ldns/include/ldns/sha1.h
index d5b1082..d5b1082 100644
--- a/include/ldns/sha1.h
+++ b/ldns/include/ldns/sha1.h
diff --git a/include/ldns/sha2.h b/ldns/include/ldns/sha2.h
index 238767a..238767a 100644
--- a/include/ldns/sha2.h
+++ b/ldns/include/ldns/sha2.h
diff --git a/include/ldns/str2host.h b/ldns/include/ldns/str2host.h
index d639970..d639970 100644
--- a/include/ldns/str2host.h
+++ b/ldns/include/ldns/str2host.h
diff --git a/include/ldns/tsig.h b/ldns/include/ldns/tsig.h
index 676045f..676045f 100644
--- a/include/ldns/tsig.h
+++ b/ldns/include/ldns/tsig.h
diff --git a/include/ldns/update.h b/ldns/include/ldns/update.h
index d3459d3..d3459d3 100644
--- a/include/ldns/update.h
+++ b/ldns/include/ldns/update.h
diff --git a/include/ldns/util.h b/ldns/include/ldns/util.h
index 86848eb..86848eb 100644
--- a/include/ldns/util.h
+++ b/ldns/include/ldns/util.h
diff --git a/include/ldns/wire2host.h b/ldns/include/ldns/wire2host.h
index 53155b3..53155b3 100644
--- a/include/ldns/wire2host.h
+++ b/ldns/include/ldns/wire2host.h
diff --git a/include/ldns/zone.h b/ldns/include/ldns/zone.h
index 0d129a0..0d129a0 100644
--- a/include/ldns/zone.h
+++ b/ldns/include/ldns/zone.h
diff --git a/src/ldns/buffer.c b/ldns/src/buffer.c
index fc6c17e..fc6c17e 100644
--- a/src/ldns/buffer.c
+++ b/ldns/src/buffer.c
diff --git a/src/ldns/compat/b64_ntop.c b/ldns/src/compat/b64_ntop.c
index 6895aca..6895aca 100644
--- a/src/ldns/compat/b64_ntop.c
+++ b/ldns/src/compat/b64_ntop.c
diff --git a/src/ldns/compat/b64_pton.c b/ldns/src/compat/b64_pton.c
index 18d8c8e..18d8c8e 100644
--- a/src/ldns/compat/b64_pton.c
+++ b/ldns/src/compat/b64_pton.c
diff --git a/src/ldns/compat/strlcpy.c b/ldns/src/compat/strlcpy.c
index d6c34c1..d6c34c1 100644
--- a/src/ldns/compat/strlcpy.c
+++ b/ldns/src/compat/strlcpy.c
diff --git a/src/ldns/dane.c b/ldns/src/dane.c
index 675dfa8..675dfa8 100644
--- a/src/ldns/dane.c
+++ b/ldns/src/dane.c
diff --git a/src/ldns/dname.c b/ldns/src/dname.c
index 55aba5d..55aba5d 100644
--- a/src/ldns/dname.c
+++ b/ldns/src/dname.c
diff --git a/src/ldns/dnssec.c b/ldns/src/dnssec.c
index a41a9f6..a41a9f6 100644
--- a/src/ldns/dnssec.c
+++ b/ldns/src/dnssec.c
diff --git a/src/ldns/dnssec_sign.c b/ldns/src/dnssec_sign.c
index 4af882a..4af882a 100644
--- a/src/ldns/dnssec_sign.c
+++ b/ldns/src/dnssec_sign.c
diff --git a/src/ldns/dnssec_verify.c b/ldns/src/dnssec_verify.c
index 1af6635..1af6635 100644
--- a/src/ldns/dnssec_verify.c
+++ b/ldns/src/dnssec_verify.c
diff --git a/src/ldns/dnssec_zone.c b/ldns/src/dnssec_zone.c
index 0fec48c..0fec48c 100644
--- a/src/ldns/dnssec_zone.c
+++ b/ldns/src/dnssec_zone.c
diff --git a/src/ldns/duration.c b/ldns/src/duration.c
index 6d0a388..6d0a388 100644
--- a/src/ldns/duration.c
+++ b/ldns/src/duration.c
diff --git a/src/ldns/error.c b/ldns/src/error.c
index 82ea61a..82ea61a 100644
--- a/src/ldns/error.c
+++ b/ldns/src/error.c
diff --git a/src/ldns/higher.c b/ldns/src/higher.c
index 8ce86a4..8ce86a4 100644
--- a/src/ldns/higher.c
+++ b/ldns/src/higher.c
diff --git a/src/ldns/host2str.c b/ldns/src/host2str.c
index 3445254..3445254 100644
--- a/src/ldns/host2str.c
+++ b/ldns/src/host2str.c
diff --git a/src/ldns/host2wire.c b/ldns/src/host2wire.c
index 06f45ba..06f45ba 100644
--- a/src/ldns/host2wire.c
+++ b/ldns/src/host2wire.c
diff --git a/src/ldns/keys.c b/ldns/src/keys.c
index 8b43821..8b43821 100644
--- a/src/ldns/keys.c
+++ b/ldns/src/keys.c
diff --git a/src/ldns/net.c b/ldns/src/net.c
index b8a5385..b8a5385 100644
--- a/src/ldns/net.c
+++ b/ldns/src/net.c
diff --git a/src/ldns/packet.c b/ldns/src/packet.c
index 62bfd07..62bfd07 100644
--- a/src/ldns/packet.c
+++ b/ldns/src/packet.c
diff --git a/src/ldns/parse.c b/ldns/src/parse.c
index e68627c..e68627c 100644
--- a/src/ldns/parse.c
+++ b/ldns/src/parse.c
diff --git a/src/ldns/radix.c b/ldns/src/radix.c
index 7aac258..7aac258 100644
--- a/src/ldns/radix.c
+++ b/ldns/src/radix.c
diff --git a/src/ldns/rbtree.c b/ldns/src/rbtree.c
index b89dff7..b89dff7 100644
--- a/src/ldns/rbtree.c
+++ b/ldns/src/rbtree.c
diff --git a/src/ldns/rdata.c b/ldns/src/rdata.c
index 6eb0096..6eb0096 100644
--- a/src/ldns/rdata.c
+++ b/ldns/src/rdata.c
diff --git a/src/ldns/resolver.c b/ldns/src/resolver.c
index b092404..b092404 100644
--- a/src/ldns/resolver.c
+++ b/ldns/src/resolver.c
diff --git a/src/ldns/rr.c b/ldns/src/rr.c
index e52ea80..e52ea80 100644
--- a/src/ldns/rr.c
+++ b/ldns/src/rr.c
diff --git a/src/ldns/rr_functions.c b/ldns/src/rr_functions.c
index b03751b..b03751b 100644
--- a/src/ldns/rr_functions.c
+++ b/ldns/src/rr_functions.c
diff --git a/src/ldns/sha1.c b/ldns/src/sha1.c
index 18a4dd2..18a4dd2 100644
--- a/src/ldns/sha1.c
+++ b/ldns/src/sha1.c
diff --git a/src/ldns/sha2.c b/ldns/src/sha2.c
index 9a27122..9a27122 100644
--- a/src/ldns/sha2.c
+++ b/ldns/src/sha2.c
diff --git a/src/ldns/str2host.c b/ldns/src/str2host.c
index cd07c89..cd07c89 100644
--- a/src/ldns/str2host.c
+++ b/ldns/src/str2host.c
diff --git a/src/ldns/tsig.c b/ldns/src/tsig.c
index 53aa85e..53aa85e 100644
--- a/src/ldns/tsig.c
+++ b/ldns/src/tsig.c
diff --git a/src/ldns/update.c b/ldns/src/update.c
index 74e9d19..74e9d19 100644
--- a/src/ldns/update.c
+++ b/ldns/src/update.c
diff --git a/src/ldns/util.c b/ldns/src/util.c
index 33060d9..33060d9 100644
--- a/src/ldns/util.c
+++ b/ldns/src/util.c
diff --git a/src/ldns/wire2host.c b/ldns/src/wire2host.c
index e492215..e492215 100644
--- a/src/ldns/wire2host.c
+++ b/ldns/src/wire2host.c
diff --git a/src/ldns/zone.c b/ldns/src/zone.c
index d97a81e..d97a81e 100644
--- a/src/ldns/zone.c
+++ b/ldns/src/zone.c