diff options
| author | Glenn Morris | 2012-04-09 06:17:30 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-04-09 06:17:30 -0400 |
| commit | 9e40dda4c65e2b5a3dba82c180a20bb5c4687540 (patch) | |
| tree | 0deff2baa537c7ecf1e1afeeeeb2f8e9845e0ff5 | |
| parent | 70f4d9736b7aa878f54530523c281e9db67bf778 (diff) | |
| download | emacs-9e40dda4c65e2b5a3dba82c180a20bb5c4687540.tar.gz emacs-9e40dda4c65e2b5a3dba82c180a20bb5c4687540.zip | |
Auto-commit of generated files.
| -rwxr-xr-x | autogen/configure | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/autogen/configure b/autogen/configure index c93ca6cea68..26b13d971f7 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -7576,7 +7576,7 @@ fi | |||
| 7576 | 7576 | ||
| 7577 | 7577 | ||
| 7578 | 7578 | ||
| 7579 | ## Need makeinfo >= 4.6 (?) to build the manuals. | 7579 | ## Need makeinfo >= 4.7 (?) to build the manuals. |
| 7580 | # Extract the first word of "makeinfo", so it can be a program name with args. | 7580 | # Extract the first word of "makeinfo", so it can be a program name with args. |
| 7581 | set dummy makeinfo; ac_word=$2 | 7581 | set dummy makeinfo; ac_word=$2 |
| 7582 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 7582 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| @@ -7619,7 +7619,7 @@ fi | |||
| 7619 | 7619 | ||
| 7620 | 7620 | ||
| 7621 | if test "$MAKEINFO" != "no" && \ | 7621 | if test "$MAKEINFO" != "no" && \ |
| 7622 | test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([1-4][0-9]+|[5-9]|4\.[6-9]|4\.[1-5][0-9]+)'`" = x; then | 7622 | test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([1-4][0-9]+|[5-9]|4\.[7-9]|4\.[1-6][0-9]+)'`" = x; then |
| 7623 | MAKEINFO=no | 7623 | MAKEINFO=no |
| 7624 | fi | 7624 | fi |
| 7625 | 7625 | ||
| @@ -7639,7 +7639,7 @@ if test "$MAKEINFO" = "no"; then | |||
| 7639 | if test "x${with_makeinfo}" = "xno"; then | 7639 | if test "x${with_makeinfo}" = "xno"; then |
| 7640 | HAVE_MAKEINFO=no | 7640 | HAVE_MAKEINFO=no |
| 7641 | elif test ! -e $srcdir/info/emacs; then | 7641 | elif test ! -e $srcdir/info/emacs; then |
| 7642 | as_fn_error "You do not seem to have makeinfo >= 4.6, and your | 7642 | as_fn_error "You do not seem to have makeinfo >= 4.7, and your |
| 7643 | source tree does not seem to have pre-built manuals in the \`info' directory. | 7643 | source tree does not seem to have pre-built manuals in the \`info' directory. |
| 7644 | Either install a suitable version of makeinfo, or re-run configure | 7644 | Either install a suitable version of makeinfo, or re-run configure |
| 7645 | with the \`--without-makeinfo' option to build without the manuals. " "$LINENO" 5 | 7645 | with the \`--without-makeinfo' option to build without the manuals. " "$LINENO" 5 |