From 7d4f0689199f4bf5d3f01188c9fac5a797e87b68 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Thu, 5 Feb 2015 22:14:12 -0500 Subject: [PATCH] Only accept xelatex for building PDF docs None of the others work, so let's remove them. Fixes #17220. --- configure | 2 -- mk/docs.mk | 21 +++++---------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 2127f2c656d..a80dafcf047 100755 --- a/configure +++ b/configure @@ -653,9 +653,7 @@ probe CFG_GRUN grun probe CFG_FLEX flex probe CFG_BISON bison probe CFG_PANDOC pandoc -probe CFG_PDFLATEX pdflatex probe CFG_XELATEX xelatex -probe CFG_LUALATEX lualatex probe CFG_GDB gdb probe CFG_LLDB lldb diff --git a/mk/docs.mk b/mk/docs.mk index 8af47700f25..71b253379aa 100644 --- a/mk/docs.mk +++ b/mk/docs.mk @@ -85,27 +85,16 @@ else HTML_DEPS := endif -# Check for the various external utilities for the EPUB/PDF docs: +# Check for xelatex -ifeq ($(CFG_LUALATEX),) - $(info cfg: no lualatex found, deferring to xelatex) - ifeq ($(CFG_XELATEX),) - $(info cfg: no xelatex found, deferring to pdflatex) - ifeq ($(CFG_PDFLATEX),) - $(info cfg: no pdflatex found, disabling LaTeX docs) - NO_PDF_DOCS = 1 - else - CFG_LATEX := $(CFG_PDFLATEX) - endif - else +ifeq ($(CFG_XELATEX),) CFG_LATEX := $(CFG_XELATEX) XELATEX = 1 - endif -else - CFG_LATEX := $(CFG_LUALATEX) + else + $(info cfg: no xelatex found, disabling LaTeX docs) + NO_PDF_DOCS = 1 endif - ifeq ($(CFG_PANDOC),) $(info cfg: no pandoc found, omitting PDF and EPUB docs) ONLY_HTML_DOCS = 1