Merge pull request #3931 from zeha/rename-notify

Rename notify to pdns_notify to avoid conflicts

diff --combined docs/Makefile.am
index 401ba5861abbc41673d8f00777c3067aebaeee13,0b3ffe38861c57caad7ef271b0d8b375163fb61c..2946e583512aef6d9a44cbf0e6f2eea816a78c93
--- 1/docs/Makefile.am
--- 2/docs/Makefile.am
+++ b/docs/Makefile.am
@@@ -6,24 -6,21 +6,24 @@@ MANPAGES_TARGET_AUTH = pdns_server.1 
        zone2sql.1
  
  MANPAGES_TARGET_TOOLS = calidns.1 \
 -      dnsbulktest.1 \
        dnsgram.1 \
        dnsreplay.1 \
        dnsscan.1 \
        dnsscope.1 \
 -      dnstcpbench.1 \
        dnswasher.1 \
        dumresp.1 \
        ixplore.1 \
-       notify.1 \
+       pdns_notify.1 \
        nproxy.1 \
        nsec3dig.1 \
        saxfr.1 \
        sdig.1
  
 +if HAVE_BOOST_GE_148
 +MANPAGES_TARGET_TOOLS += dnsbulktest.1 \
 +      dnstcpbench.1
 +endif
 +
  MANPAGES_TARGET_DNSDIST = dnsdist.1
  
  MANPAGES_TARGET_RECURSOR = pdns_recursor.1 \

diff --combined docs/mkdocs.yml
index db82afb4571847cb49f70b024e629c9464e37d27,c42674a6f0f6e6bd2332ed742426aa98acc48ba5..a91ca1c49ce65aafc87e5c2b3c258a8e69dee3bb
--- 1/docs/mkdocs.yml
--- 2/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@@ -59,7 -59,6 +59,7 @@@ pages
    - Recursor:
      - Introduction: recursor/index.md
      - Security of the Recursor: recursor/security.md
 +    - DNSSEC in the Recursor: recursor/dnssec.md
      - Recursor Statistics: recursor/stats.md
      - Controlling & Querying: recursor/running.md
      - 'Manpage: pdns_recursor.1': manpages/pdns_recursor.1.md
@@@ -99,7 -98,7 +99,7 @@@
      - 'Manpage: dnstcpbench.1': manpages/dnstcpbench.1.md
      - 'Manpage: dnswasher.1': manpages/dnswasher.1.md
      - 'Manpage: ixplore.1': manpages/ixplore.1.md
-     - 'Manpage: notify.1': manpages/notify.1.md
+     - 'Manpage: pdns_notify.1': manpages/pdns_notify.1.md
      - 'Manpage: nproxy.1': manpages/nproxy.1.md
      - 'Manpage: nsec3dig.1': manpages/nsec3dig.1.md
      - 'Manpage: saxfr.1': manpages/saxfr.1.md

diff --combined pdns/Makefile.am
index 4434692c61fc5423aee7faf12c4739a3d9c050dd,de08741b18cffbd3202a39f6514544a28cbea20f..9f34b84d2544a9494e60f87534393d10d343e47a
--- 1/pdns/Makefile.am
--- 2/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@@ -78,13 -78,15 +78,13 @@@ bin_PROGRAMS = 
  
  if TOOLS
  bin_PROGRAMS += \
 -      dnsbulktest \
        dnsgram \
        dnsreplay \
        dnsscan \
        dnsscope \
 -      dnstcpbench \
        dnswasher \
        dumresp \
-       notify \
+       pdns_notify \
        nproxy \
        nsec3dig \
        saxfr \
@@@ -96,12 -98,6 +96,12 @@@ if HAVE_RECVMMS
  bin_PROGRAMS += calidns
  endif
  
 +if HAVE_BOOST_GE_148
 +bin_PROGRAMS += \
 +      dnsbulktest \
 +      dnstcpbench
 +endif
 +
  endif
  
  EXTRA_PROGRAMS = \
@@@ -118,7 -114,7 +118,7 @@@
        dumresp \
        kvresp \
        ixplore \
-       notify \
+       pdns_notify \
        nproxy \
        nsec3dig \
        saxfr \
@@@ -927,7 -923,7 +927,7 @@@ nproxy_LDADD = 
        $(OPENSSL_LIBS) \
        $(BOOST_PROGRAM_OPTIONS_LIBS)
  
- notify_SOURCES = \
+ pdns_notify_SOURCES = \
        arguments.cc \
        base32.cc \
        base64.cc base64.hh \
@@@ -948,12 -944,12 +948,12 @@@
        statbag.cc \
        unix_utility.cc
  
- notify_LDFLAGS = \
+ pdns_notify_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(OPENSSL_LDFLAGS) \
        $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
  
- notify_LDADD = \
+ pdns_notify_LDADD = \
        $(OPENSSL_LIBS) \
        $(BOOST_PROGRAM_OPTIONS_LIBS)