From 39381dbd877e1130c43be4f6121789be748003aa Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sat, 3 Jul 2004 04:13:22 +0000
Subject: [PATCH] configure.ac: Correctly check for XML tools.  Correctly set

Original commit message from CVS:
* configure.ac:  Correctly check for XML tools.  Correctly set
BUILD_DOCS variable depending on tools.
* docs/Makefile.am:  Use XML variables.
---
 ChangeLog        |  6 ++++++
 configure.ac     | 44 +++++++++++++++++++++++++++++++-------------
 docs/Makefile.am |  8 +++-----
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b17f98310..6b3e4d4d0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-02  David Schleef  <ds@schleef.org>
+
+	* configure.ac:  Correctly check for XML tools.  Correctly set
+	BUILD_DOCS variable depending on tools.
+	* docs/Makefile.am:  Use XML variables.
+
 2004-06-21  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac: back to cvs
diff --git a/configure.ac b/configure.ac
index 25e8ba1399..8cfbf694a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,29 +107,47 @@ dnl AM_CONDITIONAL(BUILD_EDITOR, test "x$HAVE_EDITOR" = "xyes")
 dnl AC_SUBST(GST_EDITOR_CFLAGS)
 dnl AC_SUBST(GST_EDITOR_LIBS)
 
-AC_CHECK_PROG(HAVE_XMLTO, xmlto, true, false)
-AC_CHECK_PROG(HAVE_XMLCATALOG, xmlcatalog, true, false)
+BUILD_DOCS=yes
+AC_CHECK_PROG(XMLTO, xmlto, xmlto, no)
+if test "x$XMLTO" = xno ; then
+  BUILD_DOCS=no
+fi
+AC_SUBST(XMLTO)
+AC_CHECK_PROG(XMLCATALOG, xmlcatalog, xmlcatalog, no)
+if test "x$XMLCATALOG" = xno ; then
+  BUILD_DOCS=no
+fi
+AC_SUBST(XMLCATALOG)
+AC_CHECK_PROG(XMLLINT, xmllint, xmllint, no)
+if test "x$XMLLINT" = xno ; then
+  BUILD_DOCS=no
+fi
+AC_SUBST(XMLLINT)
 
 AC_ARG_ENABLE(docs,
 AC_HELP_STRING([--enable-docs],[enable building of documentation]),
 [case "${enableval}" in
   yes)
-    if test "x$HAVE_XMLTO" = "xtrue" ; then
-      BUILD_DOCS=yes
-    else
+    if test "x$XMLTO" = "xno" ; then
       AC_MSG_ERROR([you don't have xmlto, so don't use --enable-docs])
       BUILD_DOCS=no
     fi
-    if test "x$HAVE_XMLCATALOG" = "xtrue" ; then
-      BUILD_DOCS=yes
-    else
+    if test "x$XMLCATALOG" = "xno" ; then
       AC_MSG_ERROR([you don't have xmlcatalog, so don't use --enable-docs])
       BUILD_DOCS=no
-    fi ;;
-  no)  BUILD_DOCS=no ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-docs) ;;
-esac],
-[BUILD_DOCS=yes]) dnl Default value
+    fi
+    if test "x$XMLLINT" = "xno" ; then
+      AC_MSG_ERROR([you don't have xmllint, so don't use --enable-docs])
+      BUILD_DOCS=no
+    fi
+    ;;
+  no)
+    BUILD_DOCS=no
+    ;;
+  *)
+    AC_MSG_ERROR(bad value ${enableval} for --enable-docs)
+    ;;
+esac])
 
 AM_CONDITIONAL(BUILD_DOCS,          test "x$BUILD_DOCS" = "xyes")
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 6803de37e7..1ba7eaac16 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -18,17 +18,15 @@ CLEANFILES = $(DOCS) $(TOPDOCS) $(RELNOTES) tmpbuildcatalog
 
 if BUILD_DOCS
 
-XMLTO = xmlto
 XMLTOFLAGS = --skip-validation -o $(CURDIR)
-XMLLINT = xmllint
 XMLLINTFLAGS = --xinclude --noout --loaddtd --catalogs --postvalid
 
 all: $(DOCS)
 
 tmpbuildcatalog: gst-python.ent
-	xmlcatalog --noout --create $@
-	xmlcatalog --noout --add system `cd $(srcdir) && pwd`/gst-python.ent $(CURDIR)/gst-python.ent $@
-	xmlcatalog --noout --add system $(srcdir)/gst-python.ent $(CURDIR)/gst-python.ent $@
+	$(XMLCATALOG) --noout --create $@
+	$(XMLCATALOG) --noout --add system `cd $(srcdir) && pwd`/gst-python.ent $(CURDIR)/gst-python.ent $@
+	$(XMLCATALOG) --noout --add system $(srcdir)/gst-python.ent $(CURDIR)/gst-python.ent $@
 
 #check: tmpbuildcatalog
 #	for d in $(XMLFILES); do \