diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-17 23:39:21 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-17 23:39:21 +0000 |
| commit | cd1be69fee37bfb5dcf849583986cd12b1ea9107 (patch) | |
| tree | cf6825c30831db83803362c1b76e68e46e2dd688 /libstdc++-v3/configure.ac | |
| parent | 4d18c297eb4e8f4f1cda3ccfd1efac6c033b9a16 (diff) | |
| download | gcc-cd1be69fee37bfb5dcf849583986cd12b1ea9107.tar.gz | |
2012-01-17 Benjamin Kosnik <bkoz@redhat.com>
* configure.ac (BUILD_EPUB): Adjust for epub3.
* configure: Regenerate.
* Makefile.in: Same.
* doc/Makefile.am (stamp-epub-docbook): Update for epub3.
* doc/Makefile.in: Regenerate.
* include/Makefile.in: Same.
* libsupc++/Makefile.in: Same.
* po/Makefile.in: Same.
* python/Makefile.in: Same.
* src/Makefile.in: Same.
* testsuite/Makefile.in: Same.
* doc/xml/manual/documentation_hacking.xml: Update.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@183263 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/configure.ac')
| -rw-r--r-- | libstdc++-v3/configure.ac | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index d453f63e207..1c62aeadb46 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -373,18 +373,21 @@ AM_CONDITIONAL(BUILD_MAN, test $ac_cv_prog_DOXYGEN = "yes" && test $ac_cv_prog_DOT = "yes") -# Check for pdf/epub dependencies. +# Check for pdf dependencies. AC_CHECK_PROG([DBLATEX], dblatex, yes, no) AC_CHECK_PROG([PDFLATEX], pdflatex, yes, no) AM_CONDITIONAL(BUILD_PDF, test $ac_cv_prog_DBLATEX = "yes" && test $ac_cv_prog_PDFLATEX = "yes") -AC_CHECK_PROG([RUBY], ruby, yes, no) -AC_CHECK_PROG([DBTOEPUB], dbtoepub, yes, no) +# Check for epub dependencies. +AC_CHECK_FILE(/usr/share/xml/docbook/stylesheet/docbook-xsl-ns/epub3/chunk.xsl, + ac_cv_file_epub3_a=yes, ac_cv_file_epub3_a=no) +AC_CHECK_FILE(/usr/share/sgml/docbook/xsl-ns-stylesheets/epub3/chunk.xsl, + ac_cv_file_epub3_b=yes, ac_cv_file_epub3_b=no) AM_CONDITIONAL(BUILD_EPUB, - test $ac_cv_prog_RUBY = "yes" && - test $ac_cv_prog_DBTOEPUB = "yes") + test $ac_cv_file_epub3_a = "yes" || + test $ac_cv_file_epub3_b = "yes") # Propagate the target-specific source directories through the build chain. |