attempt to remove pandoc dependency for "make install" from a dist tarball; @rubenk...

diff --git a/docs/Makefile.am b/docs/Makefile.am
index d62e76378c6d4070b05d9c6051ae0f946d75f0dd..3c4a22d2888b1bae7e9bba89ad604aa884e602d1 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -11,6 +11,10 @@ MANPAGES_TARGET = dnsdist.1 \
 
 if HAVE_PANDOC
 man_MANS = $(MANPAGES_TARGET)
+else
+if HAVE_MANPAGES
+dist_man_MANS = $(MANPAGES_TARGET)
+endif
 endif
 
 EXTRA_DIST = manpages \

diff --git a/m4/pdns_check_pandoc.m4 b/m4/pdns_check_pandoc.m4
index 12ab3f423f2b00686217772bec219fabb9efc76f..16443b1c614650c216669ddd77a1e38656b8441c 100644 (file)
--- a/m4/pdns_check_pandoc.m4
+++ b/m4/pdns_check_pandoc.m4
@@ -7,4 +7,5 @@ AC_DEFUN([PDNS_CHECK_PANDOC], [
     )
   ])
   AM_CONDITIONAL([HAVE_PANDOC], [test "x$PANDOC" != "xno"])
+  AM_CONDITIONAL([HAVE_MANPAGES], [test -e docs/pdns_server.1])
 ])