Some more Net::LDNS to DNS::LDNS renames

diff --git a/Changelog b/Changelog
index 38cc0acd2a34c43143d2061b14c19130af6a683f..34060c46bd663d1cf791675a3a8ce452433f9674 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -43,7 +43,7 @@
        * bugfix #525: Fix documentation of ldns_resolver_set_retry
        * Remove unused LDNS_RDF_TYPE_TSIG and associated functions.
        * Fix ldns_nsec_covers_name for zones with an apex only. Thanks Miek.
-       * Configure option to build perl bindings: --with-p5-net-ldns
+       * Configure option to build perl bindings: --with-p5-dns-ldns
          (Net::LDNS is a contribution from Erik Ostlyngen)
        * bugfix #527: Move -lssl before -lcrypto when linking
        * Optimize TSIG digest function name comparison (Thanks Marc Buijsman)

diff --git a/Makefile.in b/Makefile.in
index 40e157db9117c8793ff9d7693feece4f9134505e..cf58e14adefa9a068d30f9ebdde09bc8e49b34a4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@ includedir    = @includedir@
 doxygen                = @doxygen@
 pywrapdir       = $(srcdir)/contrib/python
 pyldnsxwrapdir  = $(srcdir)/contrib/ldnsx
-p5_net_ldns_dir = $(srcdir)/contrib/Net-LDNS
+p5_dns_ldns_dir = $(srcdir)/contrib/Net-LDNS
 PERL           = @PERL@
 swig           = @swig@
 swigpy_flags   = -python @SWIGPY3@
@@ -103,7 +103,7 @@ LINK_EXE    = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBSSL_LDFLAGS)
 .PHONY: install uninstall install-doc uninstall-doc uninstall-pyldns
 .PHONY: install-h uninstall-h install-lib uninstall-lib install-pyldns
 
-all:   setup-builddir lib linktest manpages @P5_NET_LDNS@ @PYLDNS@ @DRILL@ @EXAMPLES@
+all:   setup-builddir lib linktest manpages @P5_DNS_LDNS@ @PYLDNS@ @DRILL@ @EXAMPLES@
 
 .SUFFIXES: .c .o .a .lo .h .i
 
@@ -250,29 +250,29 @@ ldns_wrapper.lo: $(pywrapdir)/ldns_wrapper.c ldns/config.h
 _ldns.la: ldns_wrapper.lo libldns.la 
        $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-number $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LIBS)
 
-$(p5_net_ldns_dir)/Makefile: $(p5_net_ldns_dir)/Makefile.PL
-       BUILDDIR=`pwd`; cd $(p5_net_ldns_dir); $(PERL) Makefile.PL PREFIX="$(prefix)" LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"
+$(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
+       BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); $(PERL) Makefile.PL PREFIX="$(prefix)" LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"
 
-$(p5_net_ldns_dir)/blib/arch/auto/Net/LDNS/LDNS.so: $(p5_net_ldns_dir)/Makefile
-       cd $(p5_net_ldns_dir); $(MAKE)
+$(p5_dns_ldns_dir)/blib/arch/auto/Net/LDNS/LDNS.so: $(p5_dns_ldns_dir)/Makefile
+       cd $(p5_dns_ldns_dir); $(MAKE)
 
-p5-net-ldns: $(p5_net_ldns_dir)/blib/arch/auto/Net/LDNS/LDNS.so
+p5-dns-ldns: $(p5_dns_ldns_dir)/blib/arch/auto/Net/LDNS/LDNS.so
 
-install-p5-net-ldns: $(p5_net_ldns_dir)/Makefile
-       cd $(p5_net_ldns_dir); $(MAKE) install
+install-p5-dns-ldns: $(p5_dns_ldns_dir)/Makefile
+       cd $(p5_dns_ldns_dir); $(MAKE) install
 
-uninstall-p5-net-ldns: $(p5_net_ldns_dir)/Makefile
-       cd $(p5_net_ldns_dir); $(MAKE) uninstall
+uninstall-p5-dns-ldns: $(p5_dns_ldns_dir)/Makefile
+       cd $(p5_dns_ldns_dir); $(MAKE) uninstall
 
-clean-p5-net-ldns: $(p5_net_ldns_dir)/Makefile
-       cd $(p5_net_ldns_dir); $(MAKE) clean
+clean-p5-dns-ldns: $(p5_dns_ldns_dir)/Makefile
+       cd $(p5_dns_ldns_dir); $(MAKE) clean
 
-test-p5-net-ldns: $(p5_net_ldns_dir)/Makefile
-       cd $(p5_net_ldns_dir); $(MAKE) test
+test-p5-dns-ldns: $(p5_dns_ldns_dir)/Makefile
+       cd $(p5_dns_ldns_dir); $(MAKE) test
 
-install: install-h install-lib @INSTALL_CONFIG@ install-manpages $(pyldns_inst) $(pyldnsx_inst) @INSTALL_P5_NET_LDNS@ @INSTALL_DRILL@ @INSTALL_EXAMPLES@
+install: install-h install-lib @INSTALL_CONFIG@ install-manpages $(pyldns_inst) $(pyldnsx_inst) @INSTALL_P5_DNS_LDNS@ @INSTALL_DRILL@ @INSTALL_EXAMPLES@
 
-uninstall: uninstall-manpages @UNINSTALL_CONFIG@ uninstall-h uninstall-lib $(pyldns_uninst) $(pyldnsx_uninst) @UNINSTALL_P5_NET_LDNS@ @UNINSTALL_DRILL@ @UNINSTALL_EXAMPLES@
+uninstall: uninstall-manpages @UNINSTALL_CONFIG@ uninstall-h uninstall-lib $(pyldns_uninst) $(pyldnsx_uninst) @UNINSTALL_P5_DNS_LDNS@ @UNINSTALL_DRILL@ @UNINSTALL_EXAMPLES@
 
 destclean: uninstall
 
@@ -354,7 +354,7 @@ clean-lib:
        $(LIBTOOL) --mode clean rm -f $(pywrapdir)/ldns_wrapper.c
        $(LIBTOOL) --mode clean rm -f $(pywrapdir)/ldns.py
 
-clean: @CLEAN_DRILL@ @CLEAN_EXAMPLES@ @CLEAN_P5_NET_LDNS@ clean-manpages clean-lib  putdown-builddir
+clean: @CLEAN_DRILL@ @CLEAN_EXAMPLES@ @CLEAN_P5_DNS_LDNS@ clean-manpages clean-lib  putdown-builddir
 
 realclean: clean docclean
        rm -f config.status
@@ -419,7 +419,7 @@ allclean: test-clean clean
 test-clean:
        tpkg -b test clean
 
-test: @TEST_P5_NET_LDNS@
+test: @TEST_P5_DNS_LDNS@
        if test -x "`which bash`"; then bash test/test_all.sh; else sh test/test_all.sh; fi
 
 

diff --git a/configure.ac b/configure.ac
index 1689054b9884407bcb1277bec731e56779ac2302..d4a1df689b077377588e26c5666ff4f66eba2f65 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -297,7 +297,7 @@ else
 fi
 
 # check for perl
-ldns_with_p5_net_ldns=no
+ldns_with_p5_dns_ldns=no
 AC_ARG_WITH(p5-dns-ldns, AC_HELP_STRING([--with-p5-dns-ldns], 
  [generate DNS::LDNS perl bindings]), 
  [],[ withval="no" ])