diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2011-03-08 00:04:05 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@redhat.com> | 2011-03-08 00:04:05 +0000 |
| commit | ad3dd133771e9490aac06267ed8947c31fe5a779 (patch) | |
| tree | 2564fedfcbfbf259cb91eeef6699a97183bb9dc6 /libstdc++-v3/configure.ac | |
| parent | 09264306a0d2a0020cf59bfd2e53d315efc78e5f (diff) | |
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.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@170763 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/configure.ac')
| -rw-r--r-- | libstdc++-v3/configure.ac | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index 8ac9cadf643..128b9c5e58f 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -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") |