From 97e307dda201d6ba28a723c21a95e484921d1b08 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 21 Nov 2010 14:27:54 -0500 Subject: [PATCH] xmlrules.in: no need to setup xmlto flags when configuring --without-xmlto The AM conditional HAVE_XMLTO should wrap more statements. Reviewed-by: Alan Coopersmith Signed-off-by: Gaetan Nadon Signed-off-by: Keith Packard --- doc/xml/xmlrules.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/xml/xmlrules.in b/doc/xml/xmlrules.in index c455ded89..987d6b6ed 100644 --- a/doc/xml/xmlrules.in +++ b/doc/xml/xmlrules.in @@ -37,6 +37,8 @@ BUILT_DOC_FILES = SUFFIXES = .xml .txt .html .pdf XML_ENT_DIR = $(abs_top_builddir)/doc/xml + +if HAVE_XMLTO XMLTO_FLAGS = --searchpath $(XML_ENT_DIR) if HAVE_STYLESHEETS @@ -44,7 +46,6 @@ XMLTO_FLAGS += -m $(XSL_STYLESHEET) \ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css endif -if HAVE_XMLTO if HAVE_XMLTO_TEXT BUILT_DOC_FILES += $(TXT_FILES) .xml.txt: @@ -61,7 +62,7 @@ BUILT_DOC_FILES += $(PDF_FILES) $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< endif -endif +endif HAVE_XMLTO CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES)