diff options
author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2013-02-21 19:19:48 -0600 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2013-02-26 08:03:57 -0600 |
commit | 94ca0708a2c3151fe7e92f97bb4ebeb65cb029c9 (patch) | |
tree | d72e64da49e642b86c63d0b0bf785843b83c4924 /doc/configure.ac | |
parent | doc: Update to build info format with texinfo 4.13 and 5.0 (diff) | |
download | rtems-94ca0708a2c3151fe7e92f97bb4ebeb65cb029c9.tar.bz2 |
doc: Support texi2any and texi2html
This was tested with texi2html-1.82-5.1.el6.noarch and
a locally built texinfo 5.0. These are completely different
implementations and require different invocations.
The Makefile dependencies appear to work but are likely not
perfect at this point. The key point is that the autoconf
probe detects which to use and responds accordingly with
preference given to texi2any.
Diffstat (limited to 'doc/configure.ac')
-rw-r--r-- | doc/configure.ac | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/configure.ac b/doc/configure.ac index eaa50e984e..7c8a69c7fc 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -75,8 +75,18 @@ AC_PROG_LN_S AC_CHECK_PROGS(PERL,perl) +AC_CHECK_PROGS(TEXI2ANY,texi2any) +AC_SUBST(TEXI2ANY) +AM_CONDITIONAL(USE_TEXI2ANY, + test "$enable_html" = "yes" \ + && test x"$TEXI2ANY" != x"") + AC_CHECK_PROGS(TEXI2HTML,texi2html) AC_SUBST(TEXI2HTML) +AM_CONDITIONAL(USE_TEXI2HTML, + test "$enable_html" = "yes" \ + && test x"$TEXI2ANY" = x"" \ + && test x"$TEXI2HTML" != x"") AC_CHECK_PROGS(GS,gs) AM_CONDITIONAL(GS,test x"$GS" != x"") @@ -169,5 +179,6 @@ new_chapters/Makefile cpu_supplement/Makefile shell/Makefile texi2html_init +texi2any_init ]) AC_OUTPUT |