From 5241f035b579b1dcf65fdbe379c0fb8f3ef7168c Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 29 Jun 2005 22:52:54 +0000
Subject: [PATCH] Pick latest Docbook XML DTD for 4.X

---
 doc/license.xml |    4 ++--
 doc/yaz.xml.in  |   11 +++++------
 yaz.m4          |    4 +---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/doc/license.xml b/doc/license.xml
index 7ebda19..705d7e5 100644
--- a/doc/license.xml
+++ b/doc/license.xml
@@ -1,10 +1,10 @@
-<!-- $Id: license.xml,v 1.9 2005-01-15 19:47:09 adam Exp $ -->
+<!-- $Id: license.xml,v 1.10 2005-06-29 22:52:54 adam Exp $ -->
  <appendix id="license"><title>License</title>
 
   <sect1 id="license.indexdata"><title>Index Data Copyright</title>
 
    <para>
-    Copyright &copy; 1995-2005 Index Data ApS.
+    Copyright &copy; &copyright-year; Index Data ApS.
    </para>
 
    <para>
diff --git a/doc/yaz.xml.in b/doc/yaz.xml.in
index d5c1081..80cf698 100644
--- a/doc/yaz.xml.in
+++ b/doc/yaz.xml.in
@@ -1,8 +1,7 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                    "@DTD_DIR@/docbookx.dtd" [
-
-     <!ENTITY oslash "&#x00F8;"> <!-- CIRCLED DIVISION SLASH -->
+<!-- $Id: yaz.xml.in,v 1.18 2005-06-29 22:52:54 adam Exp $ -->
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4//EN"
+          "@DTD_DIR@/docbookx.dtd" [
      <!ENTITY yaz "YAZ">
      <!ENTITY chap-introduction SYSTEM "introduction.xml">
      <!ENTITY chap-installation SYSTEM "installation.xml">
@@ -28,8 +27,8 @@
      <!ENTITY zoom "<acronym>ZOOM</acronym>">
      <!ENTITY gfs-synopsis-app "application">
      <!ENTITY reference-tools-cql-map "<xref linkend='tools.cql.map'/>">
+     <!ENTITY copyright-year "1995-2005">
 ]>
-<!-- $Id: yaz.xml.in,v 1.17 2005-03-14 11:12:16 adam Exp $ -->
 <book id="yaz">
  <bookinfo>
   <title>YAZ User&apos;s Guide and Reference</title>
@@ -38,7 +37,7 @@
   <author><firstname>Mike</firstname><surname>Taylor</surname></author>
   <author><firstname>Heikki</firstname><surname>Levanto</surname></author>
   <copyright>
-   <year>1995-2005</year>
+   <year>&copyright-year;</year>
    <holder>Index Data</holder>
   </copyright>
   <abstract><simpara>
diff --git a/yaz.m4 b/yaz.m4
index 5b39828..645d872 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -15,14 +15,12 @@ AC_ARG_WITH(docbook-dtd,[[  --with-docbook-dtd=DIR  use docbookx.dtd in DIR]],
 	DTD_DIR=""
 	for d in /usr/lib/sgml/dtd/docbook-xml \
 		 /usr/share/sgml/docbook/dtd/4.2 \
-		 /usr/share/sgml/docbook/dtd/xml/4.0 \
-		 /usr/share/sgml/docbook/dtd/xml/4.1.2 \
+		 /usr/share/sgml/docbook/dtd/xml/4.* \
 		 /usr/share/sgml/docbook/xml-dtd-4.* 
 	do
 		if test -f $d/docbookx.dtd; then
 			AC_MSG_RESULT($d)
 			DTD_DIR=$d
-			break
 		fi
 	done
 	if test -z "$DTD_DIR"; then
-- 
1.7.10.4