Changeset 7225749 in mod_gnutls

Timestamp:

Nov 24, 2015, 3:33:41 PM (7 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream

Children:

3e04c0b

Parents:

13ffeff

Message:

Use "markdown" to build HTML doc if pandoc is not available

Some exotic Debian architectures don't include pandoc, and this might
be useful for some users who don't want to bother with it. The result
isn't as pretty as with pandoc, though.

Files:

• configure.ac (modified) (1 diff)
• doc/Makefile.am (modified) (1 diff)

configure.ac

@@ -93 +93 @@
                 build_doc="html only"
         fi
+else
+        AC_PATH_PROG([MARKDOWN], [markdown], [no])
+        if test "$MARKDOWN" != "no"; then
+                build_doc="html stub"
+        fi
 fi
 AM_CONDITIONAL([USE_PANDOC], [test "$PANDOC" != "no"])
 AM_CONDITIONAL([USE_PDFLATEX], [test "$PANDOC" != "no" && \
                                test "$PDFLATEX" != "no"])
+AM_CONDITIONAL([USE_MARKDOWN], [test -n "$MARKDOWN" && \
+                               test "$MARKDOWN" != "no"])
 
 # Check for Apache binary

doc/Makefile.am

@@ -3 +3 @@
 if USE_PANDOC
 html_DATA = mod_gnutls_manual.html
-endif
-# pandoc needs pdflatex for PDF output, so USE_PDFLATEX will only be
-# enabled if USE_PANDOC is, too.
 if USE_PDFLATEX
+# pandoc && pdflatex
 pdf_DATA = mod_gnutls_manual.pdf
 endif
+else
+if USE_MARKDOWN
+# !pandoc && markdown
+html_DATA = mod_gnutls_manual.html
+endif
+endif
+
 MOSTLYCLEANFILES = $(html_DATA) $(pdf_DATA)
 
+# pdf_DATA will be empty if pandoc isn't available
 $(html_DATA) $(pdf_DATA): mod_gnutls_manual.mdwn
+if USE_PANDOC
         $(PANDOC) --toc --standalone -f markdown -o $@ $<
+else
+if USE_MARKDOWN
+        $(MARKDOWN) $< > $@
+endif
+endif