diff options
author | Bram Moolenaar <bram@vim.org> | 2013-06-14 21:22:39 +0200 |
---|---|---|
committer | Bram Moolenaar <bram@vim.org> | 2013-06-14 21:22:39 +0200 |
commit | d645543a1bed407635d4aadc0e8bd8094569ece5 (patch) | |
tree | f10da4924315f183220a6ca1c348109acb2c527c | |
parent | 276225a16e002597cada26b6384ade271f129109 (diff) | |
download | vim-d645543a1bed407635d4aadc0e8bd8094569ece5.tar.gz |
Problem: fail_if_missing not used for Python 3.
Solution: Give an error when Python 3 can't be configured. (Andrei Olsen)
-rwxr-xr-x | src/auto/configure | 3 | ||||
-rw-r--r-- | src/configure.in | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure index 0d1c5630..ba9ae56f 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5826,6 +5826,9 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "too old" >&6; } fi fi + if test "$fail_if_missing" = "yes" -a "$python3_ok" != "yes"; then + as_fn_error "could not configure python3" "$LINENO" 5 + fi fi diff --git a/src/configure.in b/src/configure.in index 1418f56d..37b6c141 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1229,6 +1229,9 @@ eof AC_MSG_RESULT(too old) fi fi + if test "$fail_if_missing" = "yes" -a "$python3_ok" != "yes"; then + AC_MSG_ERROR([could not configure python3]) + fi fi AC_SUBST(PYTHON3_CONFDIR) diff --git a/src/version.c b/src/version.c index 28f680df..7ca5094f 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1193, +/**/ 1192, /**/ 1191, |