m4: dovecot.m4 - Remove PANDOC requirement

diff --git a/Makefile.am b/Makefile.am
index 3442322d2af0afea0732f9c87eecacbef9553120..8d41c57e7f336a3cbfc20cda63676d54368e78df 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,9 +13,7 @@ EXTRA_DIST = \
        COPYING.LGPL \
        COPYING.MIT \
        ChangeLog \
-       README \
        README.md \
-       INSTALL \
        INSTALL.md \
        update-version.sh \
        run-test-valgrind.supp \
@@ -31,12 +29,6 @@ nodist_pkginclude_HEADERS = config.h
 version:
        $(AM_V_GEN)$(top_srcdir)/build-aux/git-version-gen > $@
 
-README: README.md
-       $(AM_V_GEN)$(PANDOC) -f markdown_github -t plain -o $@ $<
-
-INSTALL: INSTALL.md
-       $(AM_V_GEN)$(PANDOC) -f markdown_github -t plain -o $@ $<
-
 ChangeLog:
        $(AM_V_GEN)git log --name-status --pretty="format:%ai %aN <%aE> (%h)%n%n%w(80,4,4)%s%n%n%b" 5d5c4f2bfb812c767084c0338dae692db476da10^.. > ChangeLog || rm -f ChangeLog
 

diff --git a/configure.ac b/configure.ac
index c2992b6765dfed70cbcb47ed5a507adf1fdd18f4..4e26b9dbbae40741e383d773abcd5576db45dac2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -761,7 +761,6 @@ LDFLAGS="\$(NOPLUGIN_LDFLAGS) $LDFLAGS $EXTRA_LDFLAGS"
 AC_SUBST(NOPLUGIN_LDFLAGS)
 
 DC_CC_WRAPPER
-DC_PANDOC
 
 if test "$docdir" = ""; then
   dnl docdir supported only by autoconf v2.59c and later

diff --git a/m4/dovecot.m4 b/m4/dovecot.m4
index 02e39d100aa7602b6ee1ad44781a83fcc6baee2d..69eb1c7d04b8fc5ad19f63a58e1eabad3e3afb4f 100644 (file)
--- a/m4/dovecot.m4
+++ b/m4/dovecot.m4
@@ -433,18 +433,6 @@ _DC_EOF
   ])
 ])
 
-AC_DEFUN([DC_PANDOC], [
-  AC_ARG_VAR(PANDOC, [Path to pandoc program])
-
-  dnl Optional tool for making documentation
-  AC_CHECK_PROGS(PANDOC, [pandoc], [true])
-
-  AS_IF([test "$PANDOC" = "true"], [
-   AS_IF([test ! -e README], [
-     AC_MSG_ERROR([Cannot produce documentation without pandoc - disable with PANDOC=false ./configure])
-   ])
-  ])
-])
 # warnings.m4 serial 11
 dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation