From 0055b9616e00c6af4fc6116baae99bd80616cfab Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Mon, 9 Sep 2019 14:21:19 +0200 Subject: [PATCH 1/2] Find docbook-xsl and dblatex templates on Red Hat/Fedora `/usr/share/sgml/docbook/xsl-stylesheets` and `/usr/share/dblatex` are places where docbook-style-xsl and, respectively, dblatex packages on Red Hat systems put their XSL templates. Unless we hint this place it has to be added to `./configure` manually (`--with-docbook-xsl=...`): https://src.fedoraproject.org/rpms/bind/blob/master/f/bind.spec#_691. On Fedora 30: Before ``` ./configure ... checking for Docbook-XSL path... auto checking for html/docbook.xsl... "not found" checking for xhtml/docbook.xsl... "not found" checking for manpages/docbook.xsl... "not found" checking for html/chunk.xsl... "not found" checking for xhtml/chunk.xsl... "not found" checking for html/chunktoc.xsl... "not found" checking for xhtml/chunktoc.xsl... "not found" checking for html/maketoc.xsl... "not found" checking for xhtml/maketoc.xsl... "not found" checking for xsl/docbook.xsl... "not found" checking for xsl/latex_book_fast.xsl... "not found" ``` After: ``` ./configure ... checking for Docbook-XSL path... auto checking for html/docbook.xsl... /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl checking for xhtml/docbook.xsl... /usr/share/sgml/docbook/xsl-stylesheets/xhtml/docbook.xsl checking for manpages/docbook.xsl... /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl checking for html/chunk.xsl... /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl checking for xhtml/chunk.xsl... /usr/share/sgml/docbook/xsl-stylesheets/xhtml/chunk.xsl checking for html/chunktoc.xsl... /usr/share/sgml/docbook/xsl-stylesheets/html/chunktoc.xsl checking for xhtml/chunktoc.xsl... /usr/share/sgml/docbook/xsl-stylesheets/xhtml/chunktoc.xsl checking for html/maketoc.xsl... /usr/share/sgml/docbook/xsl-stylesheets/html/maketoc.xsl checking for xhtml/maketoc.xsl... /usr/share/sgml/docbook/xsl-stylesheets/xhtml/maketoc.xsl checking for xsl/docbook.xsl... /usr/share/dblatex/xsl/docbook.xsl checking for xsl/latex_book_fast.xsl... /usr/share/dblatex/xsl/latex_book_fast.xsl ``` --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 53251a64b7..59a6a6f8bb 100755 --- a/configure +++ b/configure @@ -20678,7 +20678,7 @@ case "$docbook_path" in auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto" >&5 $as_echo "auto" >&6; } - docbook_xsl_trees="/usr/pkg/share/xsl/docbook /usr/local/share/xsl/docbook-ns /usr/local/share/xsl/docbook /usr/share/xsl/docbook /opt/local/share/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl-nons /usr/share/xml/docbook/stylesheet/docbook-xsl" + docbook_xsl_trees="/usr/pkg/share/xsl/docbook /usr/local/share/xsl/docbook-ns /usr/local/share/xsl/docbook /usr/share/xsl/docbook /usr/share/sgml/docbook/xsl-stylesheets /opt/local/share/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl-nons /usr/share/xml/docbook/stylesheet/docbook-xsl" ;; *) docbook_xsl_trees="$withval" diff --git a/configure.ac b/configure.ac index bfb4bc5094..e43ae0d374 100644 --- a/configure.ac +++ b/configure.ac @@ -2070,7 +2070,7 @@ AC_ARG_WITH(docbook-xsl, case "$docbook_path" in auto) AC_MSG_RESULT(auto) - docbook_xsl_trees="/usr/pkg/share/xsl/docbook /usr/local/share/xsl/docbook-ns /usr/local/share/xsl/docbook /usr/share/xsl/docbook /opt/local/share/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl-nons /usr/share/xml/docbook/stylesheet/docbook-xsl" + docbook_xsl_trees="/usr/pkg/share/xsl/docbook /usr/local/share/xsl/docbook-ns /usr/local/share/xsl/docbook /usr/share/xsl/docbook /usr/share/sgml/docbook/xsl-stylesheets /opt/local/share/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl-nons /usr/share/xml/docbook/stylesheet/docbook-xsl" ;; *) docbook_xsl_trees="$withval" From c871dda0aad00f9c829a83dc058148a0492a486e Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Tue, 17 Sep 2019 08:01:41 +0200 Subject: [PATCH 2/2] Remove unused configure checks for dblatex --- configure | 53 ---------------------------------------------------- configure.ac | 7 ------- 2 files changed, 60 deletions(-) diff --git a/configure b/configure index 59a6a6f8bb..5144fba2cc 100755 --- a/configure +++ b/configure @@ -677,8 +677,6 @@ CMOCKA_CFLAGS LIBIDN2_LDFLAGS LIBIDN2_LIBS LIBIDN2_CFLAGS -XSLT_DBLATEX_FASTBOOK -XSLT_DBLATEX_STYLE XSLT_DOCBOOK_MAKETOC_XHTML XSLT_DOCBOOK_MAKETOC_HTML XSLT_DOCBOOK_CHUNKTOC_XHTML @@ -20899,57 +20897,6 @@ fi -# -# Same dance for dblatex -# -dblatex_xsl_trees="/usr/local/share/xml/docbook/stylesheet/dblatex /usr/pkg/share/xml/docbook/stylesheet/dblatex /usr/share/xml/docbook/stylesheet/dblatex" - -XSLT_DBLATEX_STYLE="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xsl/docbook.xsl" >&5 -$as_echo_n "checking for xsl/docbook.xsl... " >&6; } -for d in $dblatex_xsl_trees -do - f=$d/xsl/docbook.xsl - if test -f $f - then - XSLT_DBLATEX_STYLE=$f - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $f" >&5 -$as_echo "$f" >&6; } - break - fi -done -if test "X$XSLT_DBLATEX_STYLE" = "X" -then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5 -$as_echo "\"not found\"" >&6; }; - XSLT_DBLATEX_STYLE=xsl/docbook.xsl -fi - - - -XSLT_DBLATEX_FASTBOOK="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xsl/latex_book_fast.xsl" >&5 -$as_echo_n "checking for xsl/latex_book_fast.xsl... " >&6; } -for d in $dblatex_xsl_trees -do - f=$d/xsl/latex_book_fast.xsl - if test -f $f - then - XSLT_DBLATEX_FASTBOOK=$f - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $f" >&5 -$as_echo "$f" >&6; } - break - fi -done -if test "X$XSLT_DBLATEX_FASTBOOK" = "X" -then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5 -$as_echo "\"not found\"" >&6; }; - XSLT_DBLATEX_FASTBOOK=xsl/latex_book_fast.xsl -fi - - - # # IDN support using libidn2 # diff --git a/configure.ac b/configure.ac index e43ae0d374..7eee3cd044 100644 --- a/configure.ac +++ b/configure.ac @@ -2092,13 +2092,6 @@ NOM_PATH_FILE(XSLT_DOCBOOK_CHUNKTOC_XHTML, xhtml/chunktoc.xsl, $docbook_xsl_tree NOM_PATH_FILE(XSLT_DOCBOOK_MAKETOC_HTML, html/maketoc.xsl, $docbook_xsl_trees) NOM_PATH_FILE(XSLT_DOCBOOK_MAKETOC_XHTML, xhtml/maketoc.xsl, $docbook_xsl_trees) -# -# Same dance for dblatex -# -dblatex_xsl_trees="/usr/local/share/xml/docbook/stylesheet/dblatex /usr/pkg/share/xml/docbook/stylesheet/dblatex /usr/share/xml/docbook/stylesheet/dblatex" -NOM_PATH_FILE(XSLT_DBLATEX_STYLE, xsl/docbook.xsl, $dblatex_xsl_trees) -NOM_PATH_FILE(XSLT_DBLATEX_FASTBOOK, xsl/latex_book_fast.xsl, $dblatex_xsl_trees) - # # IDN support using libidn2 #