From 43b2398ee28e9144fd51eb9994d67c4c9a198c9c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 9 May 2011 09:35:45 +0000
Subject: libXext libX11 mkfontscale mesa git update 9 May 2011

---
 libXext/configure.ac      | 2 +-
 libXext/docbook.am        | 2 ++
 libXext/specs/Makefile.am | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'libXext')

diff --git a/libXext/configure.ac b/libXext/configure.ac
index aa8730726..79fb39c15 100644
--- a/libXext/configure.ac
+++ b/libXext/configure.ac
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libXext], [1.2.99.0],
+AC_INIT([libXext], [1.3.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXext])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
diff --git a/libXext/docbook.am b/libXext/docbook.am
index 3cf21e879..693708351 100644
--- a/libXext/docbook.am
+++ b/libXext/docbook.am
@@ -20,6 +20,7 @@ shelf_DATA =
 # DocBook/XML file with chapters, appendix and images it includes
 dist_shelf_DATA = $(docbook) $(chapters)
 
+if HAVE_XMLTO
 #
 # Generate DocBook/XML output formats with or without stylesheets
 #
@@ -91,5 +92,6 @@ XSLTPROC_FLAGS =					\
 
 endif HAVE_XSLTPROC
 endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
 
 CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
diff --git a/libXext/specs/Makefile.am b/libXext/specs/Makefile.am
index 659b5d217..80fb18f81 100644
--- a/libXext/specs/Makefile.am
+++ b/libXext/specs/Makefile.am
@@ -1,6 +1,5 @@
 
 if ENABLE_SPECS
-if HAVE_XMLTO
 
 # Main DocBook/XML files (DOCTYPE book)
 docbook = dbelib.xml dpmslib.xml shapelib.xml synclib.xml xtest1.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)
 # Generate DocBook/XML output formats with or without stylesheets
 include $(top_srcdir)/docbook.am
 
-endif HAVE_XMLTO
 endif ENABLE_SPECS
-- 
cgit v1.2.3