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 | 1612b1abe77c0cfff7d9d8f6e8b1b96b6f412546 (patch) | |
| tree | d206f845df055d44f49931183685842ac9cc42a4 /src | |
| parent | c5089bb8ff4d9f15c11632d7486b9068e09ff202 (diff) | |
| download | vim-1612b1abe77c0cfff7d9d8f6e8b1b96b6f412546.zip | |
updated for version 7.3.1193
Problem: fail_if_missing not used for Python 3.
Solution: Give an error when Python 3 can't be configured. (Andrei Olsen)
Diffstat (limited to 'src')
| -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 0d1c56304..ba9ae56ff 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 1418f56d2..37b6c1410 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 28f680dfd..7ca5094f8 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, |