mirror of git://gcc.gnu.org/git/gcc.git
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
This commit is contained in:
Benjamin Kosnik
Benjamin Kosnik
parent
26bc022b8f
commit
b329dd10a9
|
|
@ -1,3 +1,14 @@
|
|||
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>
|
||||
|
||||
* src/Makefile.am (inst_sources): Make source instantion files
|
||||
|
|
|
|||
|
|
@ -204,6 +204,7 @@ WARN_FLAGS = @WARN_FLAGS@
|
|||
WERROR = @WERROR@
|
||||
XMLLINT = @XMLLINT@
|
||||
XSLTPROC = @XSLTPROC@
|
||||
XSL_STYLE_DIR = @XSL_STYLE_DIR@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
dnl
|
||||
dnl GLIBCXX_CONDITIONAL (NAME, SHELL-TEST)
|
||||
dnl
|
||||
|
|
@ -621,6 +620,48 @@ AC_DEFUN([GLIBCXX_CONFIGURE_TESTSUITE], [
|
|||
])
|
||||
|
||||
|
||||
dnl
|
||||
dnl Does any necessary configuration of the documentation directory.
|
||||
dnl
|
||||
dnl XSLTPROC must be set before this
|
||||
dnl
|
||||
dnl Sets:
|
||||
dnl glibcxx_stylesheets
|
||||
dnl Substs:
|
||||
dnl XSL_STYLE_DIR
|
||||
dnl
|
||||
AC_DEFUN([GLIBCXX_CONFIGURE_DOCBOOK], [
|
||||
|
||||
AC_MSG_CHECKING([for stylesheets used in generation of documentation])
|
||||
glibcxx_stylesheets=no
|
||||
if test x${XSLTPROC} = xyes && echo '<title/>' | xsltproc --noout --nonet --xinclude http://docbook.sourceforge.net/release/xsl-ns/current/xhtml-1_1/docbook.xsl - 2>/dev/null; then
|
||||
glibcxx_stylesheets=yes
|
||||
fi
|
||||
AC_MSG_RESULT($glibcxx_stylesheets)
|
||||
|
||||
AC_MSG_CHECKING([for local stylesheet directory])
|
||||
glibcxx_local_stylesheets=no
|
||||
if test x"$glibcxx_stylesheets" = x"yes"; then
|
||||
if test -d /usr/share/sgml/docbook/xsl-ns-stylesheets; then
|
||||
glibcxx_local_stylesheets=yes
|
||||
XSL_STYLE_DIR=/usr/share/sgml/docbook/xsl-ns-stylesheets
|
||||
fi
|
||||
if test -d /usr/share/xml/docbook/stylesheet/docbook-xsl-ns; then
|
||||
glibcxx_local_stylesheets=yes
|
||||
XSL_STYLE_DIR=/usr/share/xml/docbook/stylesheet/docbook-xsl-ns
|
||||
fi
|
||||
fi
|
||||
AC_MSG_RESULT($glibcxx_local_stylesheets)
|
||||
|
||||
if test x"$glibcxx_local_stylesheets" = x"yes"; then
|
||||
AC_SUBST(XSL_STYLE_DIR)
|
||||
AC_MSG_NOTICE($XSL_STYLE_DIR)
|
||||
else
|
||||
glibcxx_stylesheets=no
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
dnl
|
||||
dnl Set up *_INCLUDES variables for all sundry Makefile.am's.
|
||||
dnl
|
||||
|
|
@ -3166,4 +3207,3 @@ AC_DEFUN([AC_LC_MESSAGES], [
|
|||
# Macros from the top-level gcc directory.
|
||||
m4_include([../config/gc++filt.m4])
|
||||
m4_include([../config/tls.m4])
|
||||
|
||||
|
|
|
|||
|
|
@ -632,6 +632,7 @@ BUILD_HTML_FALSE
|
|||
BUILD_HTML_TRUE
|
||||
BUILD_XML_FALSE
|
||||
BUILD_XML_TRUE
|
||||
XSL_STYLE_DIR
|
||||
XMLLINT
|
||||
XSLTPROC
|
||||
DOT
|
||||
|
|
@ -11487,7 +11488,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11490 "configure"
|
||||
#line 11491 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -11593,7 +11594,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11596 "configure"
|
||||
#line 11597 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -14951,7 +14952,7 @@ fi
|
|||
#
|
||||
# Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 14954 "configure"
|
||||
#line 14955 "configure"
|
||||
struct S { ~S(); };
|
||||
void bar();
|
||||
void foo()
|
||||
|
|
@ -15319,7 +15320,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
|
|||
# Fake what AC_TRY_COMPILE does.
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15322 "configure"
|
||||
#line 15323 "configure"
|
||||
int main()
|
||||
{
|
||||
typedef bool atomic_type;
|
||||
|
|
@ -15356,7 +15357,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; }
|
|||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15359 "configure"
|
||||
#line 15360 "configure"
|
||||
int main()
|
||||
{
|
||||
typedef short atomic_type;
|
||||
|
|
@ -15393,7 +15394,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; }
|
|||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15396 "configure"
|
||||
#line 15397 "configure"
|
||||
int main()
|
||||
{
|
||||
// NB: _Atomic_word not necessarily int.
|
||||
|
|
@ -15431,7 +15432,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }
|
|||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15434 "configure"
|
||||
#line 15435 "configure"
|
||||
int main()
|
||||
{
|
||||
typedef long long atomic_type;
|
||||
|
|
@ -15507,7 +15508,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu
|
|||
# unnecessary for this test.
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15510 "configure"
|
||||
#line 15511 "configure"
|
||||
int main()
|
||||
{
|
||||
_Decimal32 d1;
|
||||
|
|
@ -65064,10 +65065,40 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stylesheets used in generation of documentation" >&5
|
||||
$as_echo_n "checking for stylesheets used in generation of documentation... " >&6; }
|
||||
glibcxx_stylesheets=no
|
||||
if test -f /usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION; then
|
||||
if test x${XSLTPROC} = xyes && echo '<title/>' | xsltproc --noout --nonet --xinclude http://docbook.sourceforge.net/release/xsl-ns/current/xhtml-1_1/docbook.xsl - 2>/dev/null; then
|
||||
glibcxx_stylesheets=yes
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_stylesheets" >&5
|
||||
$as_echo "$glibcxx_stylesheets" >&6; }
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for local stylesheet directory" >&5
|
||||
$as_echo_n "checking for local stylesheet directory... " >&6; }
|
||||
glibcxx_local_stylesheets=no
|
||||
if test x"$glibcxx_stylesheets" = x"yes"; then
|
||||
if test -d /usr/share/sgml/docbook/xsl-ns-stylesheets; then
|
||||
glibcxx_local_stylesheets=yes
|
||||
XSL_STYLE_DIR=/usr/share/sgml/docbook/xsl-ns-stylesheets
|
||||
fi
|
||||
if test -d /usr/share/xml/docbook/stylesheet/docbook-xsl-ns; then
|
||||
glibcxx_local_stylesheets=yes
|
||||
XSL_STYLE_DIR=/usr/share/xml/docbook/stylesheet/docbook-xsl-ns
|
||||
fi
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_local_stylesheets" >&5
|
||||
$as_echo "$glibcxx_local_stylesheets" >&6; }
|
||||
|
||||
if test x"$glibcxx_local_stylesheets" = x"yes"; then
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: $XSL_STYLE_DIR" >&5
|
||||
$as_echo "$as_me: $XSL_STYLE_DIR" >&6;}
|
||||
else
|
||||
glibcxx_stylesheets=no
|
||||
fi
|
||||
|
||||
|
||||
# Check for xml/html dependencies.
|
||||
if test $ac_cv_prog_DOXYGEN = "yes" &&
|
||||
|
|
@ -65232,8 +65263,8 @@ $as_echo "no" >&6; }
|
|||
fi
|
||||
|
||||
|
||||
# Extract the first word of "dbtoepubm", so it can be a program name with args.
|
||||
set dummy dbtoepubm; ac_word=$2
|
||||
# Extract the first word of "dbtoepub", so it can be a program name with args.
|
||||
set dummy dbtoepub; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if test "${ac_cv_prog_DBTOEPUB+set}" = set; then :
|
||||
|
|
|
|||
|
|
@ -344,11 +344,7 @@ AC_CHECK_PROG([DOT], dot, yes, no)
|
|||
# Check for docbook
|
||||
AC_CHECK_PROG([XSLTPROC], xsltproc, yes, no)
|
||||
AC_CHECK_PROG([XMLLINT], xmllint, yes, no)
|
||||
|
||||
glibcxx_stylesheets=no
|
||||
if test -f /usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION; then
|
||||
glibcxx_stylesheets=yes
|
||||
fi
|
||||
GLIBCXX_CONFIGURE_DOCBOOK
|
||||
|
||||
# Check for xml/html dependencies.
|
||||
AM_CONDITIONAL(BUILD_XML,
|
||||
|
|
@ -378,7 +374,7 @@ AM_CONDITIONAL(BUILD_PDF,
|
|||
test $ac_cv_prog_PDFLATEX = "yes")
|
||||
|
||||
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,
|
||||
test $ac_cv_prog_RUBY = "yes" &&
|
||||
test $ac_cv_prog_DBTOEPUB = "yes")
|
||||
|
|
|
|||
|
|
@ -368,12 +368,9 @@ xml_noinst = \
|
|||
|
||||
XSLTPROC = xsltproc
|
||||
XSLTPROC_FLAGS = --nonet --xinclude
|
||||
#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-stylesheets
|
||||
XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets
|
||||
#XSL_STYLE_DIR = /usr/share/xml/docbook/stylesheet/docbook-xsl-ns
|
||||
#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets
|
||||
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_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl
|
||||
XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub/docbook.xsl
|
||||
|
|
@ -398,13 +395,11 @@ ${docbook_outdir}/xml:
|
|||
|
||||
# Validate existing XML structure.
|
||||
XMLLINT = xmllint
|
||||
#LINT_FLAGS = --debug --xinclude --nsclean --postvalid --nowarning --nonet
|
||||
#LINT_FLAGS = --xinclude --postvalid --noent --noblanks --noout
|
||||
LINT_FLAGS = --debug --xinclude --noent --noblanks --nonet --noout
|
||||
#SCHEMA_FLAGS = --relaxng /usr/share/xml/docbook5/schema/rng/5.0/docbookxi.rng
|
||||
SCHEMA_FLAGS = --dtdvalid /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
|
||||
LINT_FLAGS = --debug --xinclude --noent --noblanks --noout
|
||||
SCHEMA_FLAGS = http://www.docbook.org/xml/5.0/dtd/docbook.dtd
|
||||
#SCHEMA_FLAGS = --nonet /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
|
||||
XMLLINT_VALID_FLAGS = $(LINT_FLAGS) --dtdvalid $(SCHEMA_FLAGS)
|
||||
XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata
|
||||
XMLLINT_VALID_FLAGS = $(LINT_FLAGS) $(SCHEMA_FLAGS)
|
||||
doc-xml-validate-docbook: $(xml_sources)
|
||||
@echo "Generating XML validation log..."
|
||||
$(XMLLINT) $(XMLLINT_VALID_FLAGS) ${top_srcdir}/doc/xml/spine.xml
|
||||
|
|
|
|||
|
|
@ -180,6 +180,7 @@ WERROR = @WERROR@
|
|||
# Validate existing XML structure.
|
||||
XMLLINT = xmllint
|
||||
XSLTPROC = xsltproc
|
||||
XSL_STYLE_DIR = @XSL_STYLE_DIR@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
|
|
@ -418,22 +419,17 @@ xml_noinst = \
|
|||
${xml_dir}/images/confdeps.pdf
|
||||
|
||||
XSLTPROC_FLAGS = --nonet --xinclude
|
||||
#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-stylesheets
|
||||
XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets
|
||||
#XSL_STYLE_DIR = /usr/share/xml/docbook/stylesheet/docbook-xsl-ns
|
||||
#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets
|
||||
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_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl
|
||||
XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub/docbook.xsl
|
||||
#LINT_FLAGS = --debug --xinclude --nsclean --postvalid --nowarning --nonet
|
||||
#LINT_FLAGS = --xinclude --postvalid --noent --noblanks --noout
|
||||
LINT_FLAGS = --debug --xinclude --noent --noblanks --nonet --noout
|
||||
#SCHEMA_FLAGS = --relaxng /usr/share/xml/docbook5/schema/rng/5.0/docbookxi.rng
|
||||
SCHEMA_FLAGS = --dtdvalid /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
|
||||
LINT_FLAGS = --debug --xinclude --noent --noblanks --noout
|
||||
SCHEMA_FLAGS = http://www.docbook.org/xml/5.0/dtd/docbook.dtd
|
||||
#SCHEMA_FLAGS = --nonet /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
|
||||
XMLLINT_VALID_FLAGS = $(LINT_FLAGS) --dtdvalid $(SCHEMA_FLAGS)
|
||||
XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata
|
||||
XMLLINT_VALID_FLAGS = $(LINT_FLAGS) $(SCHEMA_FLAGS)
|
||||
|
||||
# XML, all one page
|
||||
# Some info on canonicalization
|
||||
|
|
|
|||
|
|
@ -178,6 +178,7 @@ WARN_FLAGS = @WARN_FLAGS@
|
|||
WERROR = @WERROR@
|
||||
XMLLINT = @XMLLINT@
|
||||
XSLTPROC = @XSLTPROC@
|
||||
XSL_STYLE_DIR = @XSL_STYLE_DIR@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
|
|
|
|||
|
|
@ -237,6 +237,7 @@ WARN_FLAGS = @WARN_FLAGS@
|
|||
WERROR = @WERROR@
|
||||
XMLLINT = @XMLLINT@
|
||||
XSLTPROC = @XSLTPROC@
|
||||
XSL_STYLE_DIR = @XSL_STYLE_DIR@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
|
|
|
|||
|
|
@ -178,6 +178,7 @@ WARN_FLAGS = @WARN_FLAGS@
|
|||
WERROR = @WERROR@
|
||||
XMLLINT = @XMLLINT@
|
||||
XSLTPROC = @XSLTPROC@
|
||||
XSL_STYLE_DIR = @XSL_STYLE_DIR@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
|
|
|
|||
|
|
@ -202,6 +202,7 @@ WARN_FLAGS = @WARN_FLAGS@
|
|||
WERROR = @WERROR@
|
||||
XMLLINT = @XMLLINT@
|
||||
XSLTPROC = @XSLTPROC@
|
||||
XSL_STYLE_DIR = @XSL_STYLE_DIR@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
|
|
|
|||
|
|
@ -242,6 +242,7 @@ WARN_FLAGS = @WARN_FLAGS@
|
|||
WERROR = @WERROR@
|
||||
XMLLINT = @XMLLINT@
|
||||
XSLTPROC = @XSLTPROC@
|
||||
XSL_STYLE_DIR = @XSL_STYLE_DIR@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
|
|
|
|||
|
|
@ -178,6 +178,7 @@ WARN_FLAGS = @WARN_FLAGS@
|
|||
WERROR = @WERROR@
|
||||
XMLLINT = @XMLLINT@
|
||||
XSLTPROC = @XSLTPROC@
|
||||
XSL_STYLE_DIR = @XSL_STYLE_DIR@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
|
|
|
|||
Loading…
Reference in New Issue