[PATCH xserver 4/8] xmlrules.in: no need to setup xmlto flags when configuring --without-xmlto

Alan Coopersmith alan.coopersmith at oracle.com
Thu Nov 18 16:34:50 PST 2010


Gaetan Nadon wrote:
> The AM conditional HAVE_XMLTO should wrap more statements.
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  doc/xml/xmlrules.in |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/xml/xmlrules.in b/doc/xml/xmlrules.in
> index 265cd02..3a78569 100644
> --- a/doc/xml/xmlrules.in
> +++ b/doc/xml/xmlrules.in
> @@ -38,6 +38,7 @@ SUFFIXES = .xml .txt .html .pdf
>  
>  XML_ENT_DIR = $(abs_top_builddir)/doc/xml
>  
> +if HAVE_XMLTO
>  if HAVE_STYLESHEETS
>  XMLTO_FLAGS = 				\
>  	-m $(XSL_STYLESHEET)		\
> @@ -45,7 +46,6 @@ XMLTO_FLAGS = 				\
>  	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
>  endif
>  
> -if HAVE_XMLTO
>  if HAVE_XMLTO_TEXT
>  BUILT_DOC_FILES += $(TXT_FILES)
>  .xml.txt:
> @@ -62,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)
>  

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System



More information about the xorg-devel mailing list