From 6a92197ff4fb2c620ec0eeedfe20f1573400907b Mon Sep 17 00:00:00 2001
From: "Jeremy C. Reed" <jreed@isc.org>
Date: Fri, 28 Jun 2013 09:16:23 -0500
Subject: [PATCH 1/2] [rt18155] look in another directory for db2latex
 stylesheets

This is so I can do it on a pkgsrc system too.
(Previously was only known to work on FreeBSD.)
---
 configure.in | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index 62ba467ba7..71650df81d 100644
--- a/configure.in
+++ b/configure.in
@@ -3234,30 +3234,27 @@ NOM_PATH_FILE(XSLT_DOCBOOK_MAKETOC_XHTML, xhtml/maketoc.xsl, $docbook_xsl_trees)
 #
 # Same dance for db2latex
 #
-# No idea where this lives except on FreeBSD.
-#
 
-db2latex_xsl_trees="/usr/local/share"
+db2latex_xsl_trees="/usr/local/share/db2latex/xsl /usr/pkg/share/xsl/db2latex"
 
 #
 # Look for stylesheets we need.
 #
 
-NOM_PATH_FILE(XSLT_DB2LATEX_STYLE, db2latex/xsl/docbook.xsl, $db2latex_xsl_trees)
+NOM_PATH_FILE(XSLT_DB2LATEX_STYLE, docbook.xsl, $db2latex_xsl_trees)
 
 #
 # Look for "admonition" image directory.  Can't use NOM_PATH_FILE()
 # because it's a directory, so just do the same things, inline.
 #
 
-AC_MSG_CHECKING(for db2latex/xsl/figures)
+AC_MSG_CHECKING(for db2latex xsl figures)
 for d in $db2latex_xsl_trees
 do
-	dd=$d/db2latex/xsl/figures
-	if test -d $dd
+	if test -d $d/figures
 	then
-		XSLT_DB2LATEX_ADMONITIONS=$dd
-		AC_MSG_RESULT($dd)
+		XSLT_DB2LATEX_ADMONITIONS=$d/figures
+		AC_MSG_RESULT($d/figures)
 		break
 	fi
 done

From 678577a63415f8e192b25eef935ee8e69bf9b05c Mon Sep 17 00:00:00 2001
From: Jeremy Reed <jreed@docs.lab.isc.org>
Date: Fri, 28 Jun 2013 14:20:11 +0000
Subject: [PATCH 2/2] [rt18155]  regen configure

---
 configure | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index ee0982c6b3..c0bd9da226 100755
--- a/configure
+++ b/configure
@@ -19508,10 +19508,8 @@ fi
 #
 # Same dance for db2latex
 #
-# No idea where this lives except on FreeBSD.
-#
 
-db2latex_xsl_trees="/usr/local/share"
+db2latex_xsl_trees="/usr/local/share/db2latex/xsl /usr/pkg/share/xsl/db2latex"
 
 #
 # Look for stylesheets we need.
@@ -19519,11 +19517,11 @@ db2latex_xsl_trees="/usr/local/share"
 
 
 XSLT_DB2LATEX_STYLE=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db2latex/xsl/docbook.xsl" >&5
-$as_echo_n "checking for db2latex/xsl/docbook.xsl... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook.xsl" >&5
+$as_echo_n "checking for docbook.xsl... " >&6; }
 for d in $db2latex_xsl_trees
 do
-	f=$d/db2latex/xsl/docbook.xsl
+	f=$d/docbook.xsl
 	if test -f $f
 	then
 		XSLT_DB2LATEX_STYLE=$f
@@ -19536,7 +19534,7 @@ if test "X$XSLT_DB2LATEX_STYLE" = "X"
 then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
 $as_echo "\"not found\"" >&6; };
-	XSLT_DB2LATEX_STYLE=db2latex/xsl/docbook.xsl
+	XSLT_DB2LATEX_STYLE=docbook.xsl
 fi
 
 
@@ -19546,16 +19544,15 @@ fi
 # because it's a directory, so just do the same things, inline.
 #
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db2latex/xsl/figures" >&5
-$as_echo_n "checking for db2latex/xsl/figures... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db2latex xsl figures" >&5
+$as_echo_n "checking for db2latex xsl figures... " >&6; }
 for d in $db2latex_xsl_trees
 do
-	dd=$d/db2latex/xsl/figures
-	if test -d $dd
+	if test -d $d/figures
 	then
-		XSLT_DB2LATEX_ADMONITIONS=$dd
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dd" >&5
-$as_echo "$dd" >&6; }
+		XSLT_DB2LATEX_ADMONITIONS=$d/figures
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $d/figures" >&5
+$as_echo "$d/figures" >&6; }
 		break
 	fi
 done