libXmu: Branch 'master' - 2 commits

[Gaetan Nadon]

 configure.ac    |    7 +++----
 doc/Makefile.am |    9 +++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit e721c444a8268db0406e26d65e0a4746c477750f
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Fri Jun 25 15:06:39 2010 -0400

    config: use HAVE_XMLTO_TEXT from XORG_WITH_XMLTO
    
    Skip text format when XMLTO dependencies for text format
    are missing (lynx, links or w3m)
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 05f61f7..c208073 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,12 +25,16 @@ if ENABLE_DOCS
 dist_doc_DATA = Xmu.xml xlogo.svg
 
 if HAVE_XMLTO
-doc_DATA = Xmu.txt Xmu.html
+doc_DATA = Xmu.html
 
 if HAVE_FOP
 doc_DATA += Xmu.pdf Xmu.ps
 endif
 
+if HAVE_XMLTO_TEXT
+doc_DATA += Xmu.txt
+endif
+
 CLEANFILES = Xmu.txt Xmu.html Xmu.pdf Xmu.ps xorg.css
 
 if HAVE_STYLESHEETS
commit 449bc79585f324c5695f379def1e57fe9fcec2e6
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Fri Jun 25 15:02:59 2010 -0400

    config: use HAVE_STYLESHEET now defined in XORG_CHECK_SGML_DOCTOOLS
    
    Also use STYLESHEET_SRCDIR XSL_STYLESHEET
    
    This requires version 1.10 of util-macros
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

diff --git a/configure.ac b/configure.ac
index 936e0ae..5ed4864 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,16 +15,15 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 AM_MAINTAINER_MODE
 
-# Require xorg-macros minimum of 1.7 for XORG_CHECK_SGML_DOCTOOLS
+# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS
 m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.7 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.7)
+          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.10)
 XORG_DEFAULT_OPTIONS
 XORG_ENABLE_DOCS
 XORG_WITH_XMLTO(0.0.20)
 XORG_WITH_FOP
 XORG_CHECK_SGML_DOCTOOLS(1.5)
-AM_CONDITIONAL([HAVE_STYLESHEETS], [test "x$XORG_SGML_PATH" != "x"])
 
 AM_CONFIG_HEADER([config.h])
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cd2392e..05f61f7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -34,9 +34,6 @@ endif
 CLEANFILES = Xmu.txt Xmu.html Xmu.pdf Xmu.ps xorg.css
 
 if HAVE_STYLESHEETS
-STYLESHEET_SRCDIR = $(XORG_SGML_PATH)/X11
-
-XSL_STYLESHEET = $(STYLESHEET_SRCDIR)/xorg.xsl
 XMLTO_FLAGS = -m $(XSL_STYLESHEET)
 
 doc_DATA += xorg.css