Removing pandoc remnants

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index 4b9eaa97ad479c56e5549e49f99a768839fe0cce..6c04f60c83d487640e9430015ec47ac79d80aee2 100755 (executable)
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -643,7 +643,6 @@ run "sudo apt-get -qq --no-install-recommends install \
   libluajit-5.1-dev \
   libedit-dev \
   libprotobuf-dev \
-  pandoc\
   protobuf-compiler"
 
 run "cd .."

diff --git a/m4/pdns_check_pandoc.m4 b/m4/pdns_check_pandoc.m4
deleted file mode 100644 (file)
index d41979a..0000000
--- a/m4/pdns_check_pandoc.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-AC_DEFUN([PDNS_CHECK_PANDOC], [
-  AC_CHECK_PROG([PANDOC], [pandoc], [pandoc], [no])
-
-  AS_IF([test "x$PANDOC" = "xno"], [
-    AS_IF([test ! -d "$srcdir/docs/html" -o ! -f "$srcdir/docs/pdns_server.1"],
-      [AC_MSG_WARN([pandoc is missing, unable to build documentation and manpages.])]
-    )
-  ])
-  AM_CONDITIONAL([HAVE_PANDOC], [test "x$PANDOC" != "xno"])
-  AM_CONDITIONAL([HAVE_MANPAGES], [test -e "$srcdir/docs/pdns_server.1"])
-])

diff --git a/pdns/dnsdistdist/docs/install.rst b/pdns/dnsdistdist/docs/install.rst
index 4a9675164f810b15e48ad9350313b9c64e1942bf..16a5e0bc777948d4f5d756d843679dbdb18f3402 100644 (file)
--- a/pdns/dnsdistdist/docs/install.rst
+++ b/pdns/dnsdistdist/docs/install.rst
@@ -81,7 +81,6 @@ To compile from git, these additional dependencies are required:
 
 * GNU `Autoconf <http://www.gnu.org/software/autoconf/autoconf.html>`_
 * GNU `Automake <https://www.gnu.org/software/automake/>`_
-* `Pandoc <http://pandoc.org/>`_
 * `Ragel <http://www.colm.net/open-source/ragel/>`_
 
 dnsdist sourcecode lives in the `PowerDNS git repository <https://github.com/PowerDNS/pdns>`_ but is independent of PowerDNS.

diff --git a/pdns/recursordist/README.md b/pdns/recursordist/README.md
index f7723966be024d5ee11050dcd39e14870e8658b9..ca8db0a9cd5a9d6340402661510cf764c5b3a84d 100644 (file)
--- a/pdns/recursordist/README.md
+++ b/pdns/recursordist/README.md
@@ -39,7 +39,7 @@ This repository contains the sources for the PowerDNS Recursor, the PowerDNS
 Authoritative Server, and dnsdist (a powerful DNS loadbalancer). The sources for
 the recursor are located in the `pdns/recursordist` subdirectory of the repository.
 
-To compile from a git checkout, install pandoc, ragel, automake, autoconf and curl.
+To compile from a git checkout, install ragel, automake, autoconf and curl.
 Then run
 
 ```sh