Mercurial > octave

comparison m4/acinclude.m4 @ 24623:f39ae754a7d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure: test that makeinfo supports the @sortas command * acinclude.m4 (OCTAVE_PROG_MAKEINFO): Test that makeinfo supports the @sortas command, print a warning and disable docs if it doesn't. This makes explicit the newest command required to build the manual, which depends on Texinfo 6.1 and newer. * configure.ac: Update disabling documentation warning messages.
author Mike Miller <mtmiller@octave.org>
date Fri, 19 Jan 2018 15:09:42 -0800
parents 194eb4bd202b
children 45470049a43f
comparison
equal deleted inserted replaced
24622:298c6a6bd869 24623:f39ae754a7d8
2631 I didn't find makeinfo, which is required for reading documentation. 2631 I didn't find makeinfo, which is required for reading documentation.
2632 You may install a copy later for Octave to use. 2632 You may install a copy later for Octave to use.
2633 " 2633 "
2634 OCTAVE_CONFIGURE_WARNING([warn_makeinfo]) 2634 OCTAVE_CONFIGURE_WARNING([warn_makeinfo])
2635 fi 2635 fi
2636 dnl If we have a GNU makeinfo program, see if it supports the @sortas command
2637 dnl for defining a custom sort key for an index entry.
2638 if test -n "$MKINFO"; then
2639 AC_CACHE_CHECK([for makeinfo support for @sortas command],
2640 [octave_cv_makeinfo_sortas_command],
2641 [cat << EOF > conftest.texi
2642 \input texinfo
2643 @node Top
2644 @top Document
2645 @menu
2646 * Chapter::
2647 * Index::
2648 @end menu
2649 @node Chapter
2650 @chapter Chapter
2651 @cindex @sortas{a} foo
2652 @node Index
2653 @unnumbered Index
2654 @printindex cp
2655 @bye
2656 EOF
2657 if $MKINFO --no-warn conftest.texi 2>/dev/null; then
2658 octave_cv_makeinfo_sortas_command=yes
2659 else
2660 octave_cv_makeinfo_sortas_command=no
2661 fi
2662 rm -f conftest.info conftest.texi
2663 ])
2664 if test $octave_cv_makeinfo_sortas_command = no; then
2665 warn_makeinfo="
2666
2667 I wasn't able to find a version of GNU makeinfo that supports the
2668 @sortas command, but it's only a problem if you need to build the
2669 manual, which is the case if you're building from VCS sources.
2670 "
2671 OCTAVE_CONFIGURE_WARNING([warn_makeinfo])
2672 fi
2673 fi
2636 ]) 2674 ])
2637 dnl 2675 dnl
2638 dnl What pager should we use? 2676 dnl What pager should we use?
2639 dnl 2677 dnl
2640 AC_DEFUN([OCTAVE_PROG_PAGER], [ 2678 AC_DEFUN([OCTAVE_PROG_PAGER], [