Submodule Net-LDNS renamed to DNS-LDNS

diff --git a/.gitmodules b/.gitmodules
index 836a4377de57ff431dc767a002bfb69a63a5d162..df684f2920d46d634db5483a0c03ec4fc96a39ff 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "contrib/Net-LDNS"]
        path = contrib/Net-LDNS
        url = https://github.com/erikoest/Net-LDNS
+[submodule "contrib/DNS-LDNS"]
+       path = contrib/DNS-LDNS
+       url = https://github.com/erikoest/DNS-LDNS

diff --git a/configure.ac b/configure.ac
index 28b01118c37f323b20778b18110bc57a74fd4993..1689054b9884407bcb1277bec731e56779ac2302 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -298,8 +298,8 @@ fi
 
 # check for perl
 ldns_with_p5_net_ldns=no
-AC_ARG_WITH(p5-net-ldns, AC_HELP_STRING([--with-p5-net-ldns], 
- [generate Net::LDNS perl bindings]), 
+AC_ARG_WITH(p5-dns-ldns, AC_HELP_STRING([--with-p5-dns-ldns], 
+ [generate DNS::LDNS perl bindings]), 
  [],[ withval="no" ])
 ldns_have_perl=no
 if test x_$withval != x_no; then
@@ -307,17 +307,17 @@ if test x_$withval != x_no; then
    if test -z "$PERL"; then
       AC_MSG_ERROR([Cannot find perl in your system path])
    fi
-   AC_SUBST(P5_NET_LDNS, "p5-net-ldns")dnl
-   AC_SUBST(TEST_P5_NET_LDNS, "test-p5-net-ldns")dnl
-   AC_SUBST(INSTALL_P5_NET_LDNS, "install-p5-net-ldns")dnl
-   AC_SUBST(UNINSTALL_P5_NET_LDNS, "uninstall-p5-net-ldns")dnl
-   AC_SUBST(CLEAN_P5_NET_LDNS, "clean-p5-net-ldns")
+   AC_SUBST(P5_DNS_LDNS, "p5-dns-ldns")dnl
+   AC_SUBST(TEST_P5_DNS_LDNS, "test-p5-dns-ldns")dnl
+   AC_SUBST(INSTALL_P5_DNS_LDNS, "install-p5-dns-ldns")dnl
+   AC_SUBST(UNINSTALL_P5_DNS_LDNS, "uninstall-p5-dns-ldns")dnl
+   AC_SUBST(CLEAN_P5_DNS_LDNS, "clean-p5-dns-ldns")
 else
-   AC_SUBST(P5_NET_LDNS, "")dnl
-   AC_SUBST(TEST_P5_NET_LDNS, "")dnl
-   AC_SUBST(INSTALL_P5_NET_LDNS, "")dnl
-   AC_SUBST(UNINSTALL_P5_NET_LDNS, "")dnl
-   AC_SUBST(CLEAN_P5_NET_LDNS, "")
+   AC_SUBST(P5_DNS_LDNS, "")dnl
+   AC_SUBST(TEST_P5_DNS_LDNS, "")dnl
+   AC_SUBST(INSTALL_P5_DNS_LDNS, "")dnl
+   AC_SUBST(UNINSTALL_P5_DNS_LDNS, "")dnl
+   AC_SUBST(CLEAN_P5_DNS_LDNS, "")
 fi
 
 # Use libtool

diff --git a/contrib/DNS-LDNS b/contrib/DNS-LDNS
new file mode 160000 (submodule)
index 0000000..c9cd177
--- /dev/null
+++ b/contrib/DNS-LDNS
@@ -0,0 +1 @@
+Subproject commit c9cd177f878c680557c0f3583b75686f33961321

diff --git a/contrib/Net-LDNS b/contrib/Net-LDNS
deleted file mode 160000 (submodule)
index a2c5826..0000000
--- a/contrib/Net-LDNS
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a2c5826fb90ca7431cbbf4a9eb7f00be6f3a5c84

diff --git a/makedist.sh b/makedist.sh
index 18b24095dfe341b8bcdf2b5662744eeea95ebb5a..10883cdfa847a9d20de7a42ff6df8184f552c410 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -121,7 +121,7 @@ git clone git://git.nlnetlabs.nl/ldns/ || error_cleanup "git command failed"
 cd ldns || error_cleanup "LDNS not exported correctly from git"
 git checkout "$CHECKOUT" || error_cleanup "Could not checkout $CHECKOUT"
 git submodule update --init || error_cleanup "Could not update submodules"
-(cd contrib/Net-LDNS; git checkout master) || error_cleanup "Could not checkout Net-LDNS contribution"
+(cd contrib/DNS-LDNS; git checkout master) || error_cleanup "Could not checkout DNS-LDNS contribution"
 
 info "Running  Libtoolize script (libtoolize)."
 libtoolize -c --install || libtoolize -c || error_cleanup "Libtoolize failed."
@@ -140,7 +140,7 @@ rm -r autom4te* drill/autom4te* examples/autom4te* || error_cleanup "Failed to r
 # custom removes
 find . -name .c-mode-rc.el -exec rm {} \;
 find . -name .cvsignore -exec rm {} \;
-rm  -f .gitignore .gitmodules contrib/Net-LDNS/.git
+rm  -f .gitignore .gitmodules contrib/DNS-LDNS/.git
 rm -rf .git
 rm -rf lua 
 rm -rf masterdont