Skip to content

R
riscv-gcc-1
Commit b329dd10 by Benjamin Kosnik Committed by Benjamin Kosnik
Options

re PR libstdc++/47145 (configure test for docbook-xsl-ns stylesheets uses hardcoded path) 

2011-03-07  Benjamin Kosnik  <bkoz@redhat.com>
            Matthias Klose  <doko@ubuntu.com>
	    Jonathan Wakely  <redi@gcc.gnu.org>

	PR libstdc++/47145
	* acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Define.
	* configure.ac: Use it.
	* doc/Makefile.am (XSL_STYLE_DIR): Set at configure time.
	* configure: Regenerate.
	* doc/Makefile.in: Regenerate.


Co-Authored-By: Jonathan Wakely <redi@gcc.gnu.org>
Co-Authored-By: Matthias Klose <doko@ubuntu.com>

From-SVN: r170763
parent 26bc022b
Showing with 33 additions and 28 deletions
libstdc++-v3/ChangeLog
2011-03-07 Benjamin Kosnik <bkoz@redhat.com>
Matthias Klose <doko@ubuntu.com>
Jonathan Wakely <redi@gcc.gnu.org>
PR libstdc++/47145
* acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Define.
* configure.ac: Use it.
* doc/Makefile.am (XSL_STYLE_DIR): Set at configure time.
* configure: Regenerate.
* doc/Makefile.in: Regenerate.
2011-03-04 Benjamin Kosnik <bkoz@chula> 2011-03-04 Benjamin Kosnik <bkoz@chula>
* src/Makefile.am (inst_sources): Make source instantion files * src/Makefile.am (inst_sources): Make source instantion files
......
libstdc++-v3/Makefile.in
...@@ -204,6 +204,7 @@ WARN_FLAGS = @WARN_FLAGS@ ...@@ -204,6 +204,7 @@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@ XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@ XSLTPROC = @XSLTPROC@
XSL_STYLE_DIR = @XSL_STYLE_DIR@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
libstdc++-v3/configure.ac
...@@ -344,11 +344,7 @@ AC_CHECK_PROG([DOT], dot, yes, no) ...@@ -344,11 +344,7 @@ AC_CHECK_PROG([DOT], dot, yes, no)
# Check for docbook # Check for docbook
AC_CHECK_PROG([XSLTPROC], xsltproc, yes, no) AC_CHECK_PROG([XSLTPROC], xsltproc, yes, no)
AC_CHECK_PROG([XMLLINT], xmllint, yes, no) AC_CHECK_PROG([XMLLINT], xmllint, yes, no)
GLIBCXX_CONFIGURE_DOCBOOK
glibcxx_stylesheets=no
if test -f /usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION; then
glibcxx_stylesheets=yes
fi
# Check for xml/html dependencies. # Check for xml/html dependencies.
AM_CONDITIONAL(BUILD_XML, AM_CONDITIONAL(BUILD_XML,
...@@ -378,7 +374,7 @@ AM_CONDITIONAL(BUILD_PDF, ...@@ -378,7 +374,7 @@ AM_CONDITIONAL(BUILD_PDF,
test $ac_cv_prog_PDFLATEX = "yes") test $ac_cv_prog_PDFLATEX = "yes")
AC_CHECK_PROG([RUBY], ruby, yes, no) AC_CHECK_PROG([RUBY], ruby, yes, no)
AC_CHECK_PROG([DBTOEPUB], dbtoepubm, yes, no) AC_CHECK_PROG([DBTOEPUB], dbtoepub, yes, no)
AM_CONDITIONAL(BUILD_EPUB, AM_CONDITIONAL(BUILD_EPUB,
test $ac_cv_prog_RUBY = "yes" && test $ac_cv_prog_RUBY = "yes" &&
test $ac_cv_prog_DBTOEPUB = "yes") test $ac_cv_prog_DBTOEPUB = "yes")
......
libstdc++-v3/doc/Makefile.am
...@@ -368,12 +368,9 @@ xml_noinst = \ ...@@ -368,12 +368,9 @@ xml_noinst = \
XSLTPROC = xsltproc XSLTPROC = xsltproc
XSLTPROC_FLAGS = --nonet --xinclude XSLTPROC_FLAGS = --nonet --xinclude
#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-stylesheets #XSL_STYLE_DIR = /usr/share/xml/docbook/stylesheet/docbook-xsl-ns
XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets #XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets
XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl
#XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml/chunk.xsl
#XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml/onechunk.xsl
#XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml/docbook.xsl
XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/chunk.xsl XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/chunk.xsl
XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl
XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub/docbook.xsl XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub/docbook.xsl
...@@ -398,13 +395,11 @@ ${docbook_outdir}/xml: ...@@ -398,13 +395,11 @@ ${docbook_outdir}/xml:
# Validate existing XML structure. # Validate existing XML structure.
XMLLINT = xmllint XMLLINT = xmllint
#LINT_FLAGS = --debug --xinclude --nsclean --postvalid --nowarning --nonet LINT_FLAGS = --debug --xinclude --noent --noblanks --noout
#LINT_FLAGS = --xinclude --postvalid --noent --noblanks --noout SCHEMA_FLAGS = http://www.docbook.org/xml/5.0/dtd/docbook.dtd
LINT_FLAGS = --debug --xinclude --noent --noblanks --nonet --noout #SCHEMA_FLAGS = --nonet /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
#SCHEMA_FLAGS = --relaxng /usr/share/xml/docbook5/schema/rng/5.0/docbookxi.rng XMLLINT_VALID_FLAGS = $(LINT_FLAGS) --dtdvalid $(SCHEMA_FLAGS)
SCHEMA_FLAGS = --dtdvalid /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata
XMLLINT_VALID_FLAGS = $(LINT_FLAGS) $(SCHEMA_FLAGS)
doc-xml-validate-docbook: $(xml_sources) doc-xml-validate-docbook: $(xml_sources)
@echo "Generating XML validation log..." @echo "Generating XML validation log..."
$(XMLLINT) $(XMLLINT_VALID_FLAGS) ${top_srcdir}/doc/xml/spine.xml $(XMLLINT) $(XMLLINT_VALID_FLAGS) ${top_srcdir}/doc/xml/spine.xml
......
libstdc++-v3/doc/Makefile.in
...@@ -180,6 +180,7 @@ WERROR = @WERROR@ ...@@ -180,6 +180,7 @@ WERROR = @WERROR@
# Validate existing XML structure. # Validate existing XML structure.
XMLLINT = xmllint XMLLINT = xmllint
XSLTPROC = xsltproc XSLTPROC = xsltproc
XSL_STYLE_DIR = @XSL_STYLE_DIR@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
...@@ -418,22 +419,17 @@ xml_noinst = \ ...@@ -418,22 +419,17 @@ xml_noinst = \
${xml_dir}/images/confdeps.pdf ${xml_dir}/images/confdeps.pdf
XSLTPROC_FLAGS = --nonet --xinclude XSLTPROC_FLAGS = --nonet --xinclude
#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-stylesheets #XSL_STYLE_DIR = /usr/share/xml/docbook/stylesheet/docbook-xsl-ns
XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets #XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets
XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl
#XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml/chunk.xsl
#XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml/onechunk.xsl
#XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml/docbook.xsl
XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/chunk.xsl XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/chunk.xsl
XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl
XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub/docbook.xsl XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub/docbook.xsl
#LINT_FLAGS = --debug --xinclude --nsclean --postvalid --nowarning --nonet LINT_FLAGS = --debug --xinclude --noent --noblanks --noout
#LINT_FLAGS = --xinclude --postvalid --noent --noblanks --noout SCHEMA_FLAGS = http://www.docbook.org/xml/5.0/dtd/docbook.dtd
LINT_FLAGS = --debug --xinclude --noent --noblanks --nonet --noout #SCHEMA_FLAGS = --nonet /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
#SCHEMA_FLAGS = --relaxng /usr/share/xml/docbook5/schema/rng/5.0/docbookxi.rng XMLLINT_VALID_FLAGS = $(LINT_FLAGS) --dtdvalid $(SCHEMA_FLAGS)
SCHEMA_FLAGS = --dtdvalid /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata
XMLLINT_VALID_FLAGS = $(LINT_FLAGS) $(SCHEMA_FLAGS)
# XML, all one page # XML, all one page
# Some info on canonicalization # Some info on canonicalization
......
libstdc++-v3/include/Makefile.in
...@@ -178,6 +178,7 @@ WARN_FLAGS = @WARN_FLAGS@ ...@@ -178,6 +178,7 @@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@ XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@ XSLTPROC = @XSLTPROC@
XSL_STYLE_DIR = @XSL_STYLE_DIR@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
libstdc++-v3/libsupc++/Makefile.in
...@@ -237,6 +237,7 @@ WARN_FLAGS = @WARN_FLAGS@ ...@@ -237,6 +237,7 @@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@ XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@ XSLTPROC = @XSLTPROC@
XSL_STYLE_DIR = @XSL_STYLE_DIR@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
libstdc++-v3/po/Makefile.in
...@@ -178,6 +178,7 @@ WARN_FLAGS = @WARN_FLAGS@ ...@@ -178,6 +178,7 @@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@ XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@ XSLTPROC = @XSLTPROC@
XSL_STYLE_DIR = @XSL_STYLE_DIR@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
libstdc++-v3/python/Makefile.in
...@@ -202,6 +202,7 @@ WARN_FLAGS = @WARN_FLAGS@ ...@@ -202,6 +202,7 @@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@ XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@ XSLTPROC = @XSLTPROC@
XSL_STYLE_DIR = @XSL_STYLE_DIR@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
libstdc++-v3/src/Makefile.in
...@@ -242,6 +242,7 @@ WARN_FLAGS = @WARN_FLAGS@ ...@@ -242,6 +242,7 @@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@ XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@ XSLTPROC = @XSLTPROC@
XSL_STYLE_DIR = @XSL_STYLE_DIR@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
libstdc++-v3/testsuite/Makefile.in
...@@ -178,6 +178,7 @@ WARN_FLAGS = @WARN_FLAGS@ ...@@ -178,6 +178,7 @@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@ XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@ XSLTPROC = @XSLTPROC@
XSL_STYLE_DIR = @XSL_STYLE_DIR@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment