mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'rt18155'

Browse Source 
Allow configure to detect documentation tools/styles on pkgsrc
too.  No changelog entry needed.  No need to pull this to any branches.
This commit is contained in:
Jeremy C. Reed
2013-07-09 18:06:47 -05:00
parent 5b7abbef51 678577a634
commit f977aaebb2
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
configure vendored
View File

@@ -19525,10 +19525,8 @@ fi
# #
# Same dance for db2latex # 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. # Look for stylesheets we need.
@@ -19536,11 +19534,11 @@ db2latex_xsl_trees="/usr/local/share"
XSLT_DB2LATEX_STYLE="" XSLT_DB2LATEX_STYLE=""
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db2latex/xsl/docbook.xsl" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook.xsl" >&5
$as_echo_n "checking for db2latex/xsl/docbook.xsl... " >&6; } $as_echo_n "checking for docbook.xsl... " >&6; }
for d in $db2latex_xsl_trees for d in $db2latex_xsl_trees
do do
f=$d/db2latex/xsl/docbook.xsl f=$d/docbook.xsl
if test -f $f if test -f $f
then then
XSLT_DB2LATEX_STYLE=$f XSLT_DB2LATEX_STYLE=$f
@@ -19553,7 +19551,7 @@ if test "X$XSLT_DB2LATEX_STYLE" = "X"
then then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
$as_echo "\"not found\"" >&6; }; $as_echo "\"not found\"" >&6; };
XSLT_DB2LATEX_STYLE=db2latex/xsl/docbook.xsl XSLT_DB2LATEX_STYLE=docbook.xsl
fi fi
@@ -19563,16 +19561,15 @@ fi
# because it's a directory, so just do the same things, inline. # 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 "$as_me:${as_lineno-$LINENO}: checking for db2latex xsl figures" >&5
$as_echo_n "checking for db2latex/xsl/figures... " >&6; } $as_echo_n "checking for db2latex xsl figures... " >&6; }
for d in $db2latex_xsl_trees for d in $db2latex_xsl_trees
do do
dd=$d/db2latex/xsl/figures if test -d $d/figures
if test -d $dd
then then
XSLT_DB2LATEX_ADMONITIONS=$dd XSLT_DB2LATEX_ADMONITIONS=$d/figures
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dd" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d/figures" >&5
$as_echo "$dd" >&6; } $as_echo "$d/figures" >&6; }
break break
fi fi
done done

15
configure.in
View File

@@ -3250,30 +3250,27 @@ NOM_PATH_FILE(XSLT_DOCBOOK_MAKETOC_XHTML, xhtml/maketoc.xsl, $docbook_xsl_trees)
# #
# Same dance for db2latex # 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. # 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() # Look for "admonition" image directory. Can't use NOM_PATH_FILE()
# because it's a directory, so just do the same things, inline. # 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 for d in $db2latex_xsl_trees
do do
dd=$d/db2latex/xsl/figures if test -d $d/figures
if test -d $dd
then then
XSLT_DB2LATEX_ADMONITIONS=$dd XSLT_DB2LATEX_ADMONITIONS=$d/figures
AC_MSG_RESULT($dd) AC_MSG_RESULT($d/figures)
break break
fi fi
done done