From 6011a7156d007b94abde4bfc3d427a1bd853cd86 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 14 Feb 2003 20:32:59 +0000
Subject: [PATCH] Configure option --with-xsl.

---
 configure.in       |   24 +++++++++++++++++++++++-
 doc/tkl.xsl.in     |    2 +-
 doc/tools.xml      |    5 +++--
 doc/yazhtml.xsl    |   12 ------------
 doc/yazhtml.xsl.in |   12 ++++++++++++
 5 files changed, 39 insertions(+), 16 deletions(-)
 delete mode 100644 doc/yazhtml.xsl
 create mode 100644 doc/yazhtml.xsl.in

diff --git a/configure.in b/configure.in
index 620cf6e..d66b29a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2003
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.104 2003-02-14 18:49:22 adam Exp $
+dnl $Id: configure.in,v 1.105 2003-02-14 20:32:59 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.9.3)
 dnl
@@ -62,6 +62,27 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
       AC_MSG_RESULT(Not found)
    fi
 ])
+AC_SUBST(XSL_DIR)
+AC_ARG_WITH(xsl,[  --with-xsl[=DIR]        Use XSL in DIR/{htmlhelp,xhtml}],
+[
+   if test -f "$withval/htmlhelp/htmlhelp.xsl"; then
+      XSL_DIR=$withval
+   fi
+],[
+   AC_MSG_CHECKING(for htmlhelp.xsl)
+   for d in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
+            /usr/share/sgml/docbook/xsl-stylesheets-1.* 
+   do
+     if test -f $d/htmlhelp/htmlhelp.xsl; then
+       AC_MSG_RESULT($d)
+       XSL_DIR=$d
+       break
+     fi
+   done
+   if test -z "$XSL_DIR"; then
+      AC_MSG_RESULT(Not found)
+   fi
+])
 dnl 
 dnl ----- Sockets
 checkBoth=0
@@ -373,6 +394,7 @@ doc/yazhtml.dsl
 doc/yazphp.dsl
 doc/yazprint.dsl
 doc/tkl.xsl
+doc/yazhtml.xsl
 etc/Makefile
 yaz-config
 ],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > lib/yaz-config && chmod +x yaz-config lib/yaz-config])
diff --git a/doc/tkl.xsl.in b/doc/tkl.xsl.in
index 350b30e..62ae3ac 100644
--- a/doc/tkl.xsl.in
+++ b/doc/tkl.xsl.in
@@ -1,7 +1,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		version="1.0">
 
-  <xsl:include href="/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/xhtml/chunk.xsl"/>
+  <xsl:include href="@XSL_DIR@/xhtml/chunk.xsl"/>
 
   <xsl:variable name="use.id.as.filename">1</xsl:variable>
   <xsl:variable name="html.ext">.tkl</xsl:variable>
diff --git a/doc/tools.xml b/doc/tools.xml
index b158495..f827436 100644
--- a/doc/tools.xml
+++ b/doc/tools.xml
@@ -1,4 +1,4 @@
-<!-- $Id: tools.xml,v 1.19 2003-02-14 18:49:23 adam Exp $ -->
+<!-- $Id: tools.xml,v 1.20 2003-02-14 20:33:00 adam Exp $ -->
  <chapter id="tools"><title>Supporting Tools</title>
   
   <para>
@@ -907,7 +907,7 @@ int cql_transform_FILE(cql_transform_t ct,
        This small file defines two index sets, three qualifiers and three
        relations, a position pattern and a default structure.
       </para>
-      <programlisting>
+      <programlisting><![CDATA[
        set.srw    = http://www.loc.gov/zing/cql/srw-indexes/v1.0/
        set.dc     = http://www.loc.gov/zing/cql/dc-indexes/v1.0/
 
@@ -922,6 +922,7 @@ int cql_transform_FILE(cql_transform_t ct,
        position.any               = 3=3 6=1
 
        structure.*                = 4=1
+]]>
       </programlisting>
       <para>
        With the mappings above, the CQL query
diff --git a/doc/yazhtml.xsl b/doc/yazhtml.xsl
deleted file mode 100644
index 521d024..0000000
--- a/doc/yazhtml.xsl
+++ /dev/null
@@ -1,12 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	        version="1.0">
-
-<xsl:import href="/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/htmlhelp/htmlhelp.xsl"/>
-
-<xsl:param name="suppress.navigation" select="0"/>
-<xsl:param name="use.id.as.filename" select="1"/>
-
-
-</xsl:stylesheet>
-
-
diff --git a/doc/yazhtml.xsl.in b/doc/yazhtml.xsl.in
new file mode 100644
index 0000000..0bc5333
--- /dev/null
+++ b/doc/yazhtml.xsl.in
@@ -0,0 +1,12 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	        version="1.0">
+
+<xsl:import href="@XSL_DIR@/htmlhelp/htmlhelp.xsl"/>
+
+<xsl:param name="suppress.navigation" select="0"/>
+<xsl:param name="use.id.as.filename" select="1"/>
+
+
+</xsl:stylesheet>
+
+
-- 
1.7.10.4