Mercurial > mxe-octave

annotate src/octave-7-fixes.patch @ 2974:91c9957508d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warn instead of error if makeinfo program is missing
author John W. Eaton <jwe@octave.org>
date Wed, 06 Feb 2013 16:38:02 -0500
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2974
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/m4/acinclude.m4
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/m4/acinclude.m4
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -1537,7 +1537,12 @@
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 dnl exist which will then fool the 'test -z' line.
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 AC_CHECK_PROG(MKINFO, makeinfo, makeinfo, [])
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 if test -z "$MKINFO"; then
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 - AC_MSG_ERROR([makeinfo program required for reading documentation])
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 + warn_makeinfo="
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 +
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 +I didn't find makeinfo, which is required for reading documentation.
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 +You may install a copy later for Octave to use.
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 +"
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 + OCTAVE_CONFIGURE_WARNING([warn_makeinfo])
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 fi
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 ])
91c9957508d4 warn instead of error if makeinfo program is missing
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 dnl