From: Josh Soref <jsoref@users.noreply.github.com>
Date: Fri, 19 Oct 2018 20:19:57 +0000 (-0400)
Subject: Removing pandoc remnants
X-Git-Tag: dnsdist-1.3.3~26^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7086%2Fhead;p=thirdparty%2Fpdns.git

Removing pandoc remnants
---

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index 4b9eaa97ad..6c04f60c83 100755
--- 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
index d41979aea3..0000000000
--- 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 4a9675164f..16a5e0bc77 100644
--- 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 f7723966be..ca8db0a9cd 100644
--- 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