diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-12-02 16:58:33 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-12-02 16:58:33 +0000 |
| commit | 72951077b9c6ef5a87e50da22a6f91735a1d2d25 (patch) | |
| tree | b4120a1fb36fb17c3cc88d7b037e8da9da84eb7a | |
| parent | d7cd61723e099bb6b743d1d901dee2257ec315da (diff) | |
| download | vim-git-7.2.315.tar.gz | |
updated for version 7.2-315v7.2.315
| -rwxr-xr-x | src/auto/configure | 10 | ||||
| -rw-r--r-- | src/configure.in | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/auto/configure b/src/auto/configure index 7230ce395..f7be0a777 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5126,7 +5126,7 @@ else vi_cv_path_python_conf= for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do - for subdir in lib share; do + for subdir in lib64 lib share; do d="${path}/${subdir}/python${vi_cv_var_python_version}/config" if test -d "$d" && test -f "$d/config.c"; then vi_cv_path_python_conf="$d" @@ -13718,8 +13718,8 @@ $as_echo "$ac_try_echo") >&5 $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; } else vim_cv_tty_group=world - { $as_echo "$as_me:$LINENO: result: ptys are world accessable" >&5 -$as_echo "ptys are world accessable" >&6; } + { $as_echo "$as_me:$LINENO: result: ptys are world accessible" >&5 +$as_echo "ptys are world accessible" >&6; } fi else @@ -13730,8 +13730,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) vim_cv_tty_group=world - { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5 -$as_echo "can't determine - assume ptys are world accessable" >&6; } + { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessible" >&5 +$as_echo "can't determine - assume ptys are world accessible" >&6; } fi rm -rf conftest.dSYM diff --git a/src/configure.in b/src/configure.in index 727bfd1bb..6e292c4c6 100644 --- a/src/configure.in +++ b/src/configure.in @@ -686,7 +686,7 @@ if test "$enable_pythoninterp" = "yes"; then [ vi_cv_path_python_conf= for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do - for subdir in lib share; do + for subdir in lib64 lib share; do d="${path}/${subdir}/python${vi_cv_var_python_version}/config" if test -d "$d" && test -f "$d/config.c"; then vi_cv_path_python_conf="$d" @@ -2557,11 +2557,11 @@ main() AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group]) else vim_cv_tty_group=world - AC_MSG_RESULT([ptys are world accessable]) + AC_MSG_RESULT([ptys are world accessible]) fi ],[ vim_cv_tty_group=world - AC_MSG_RESULT([can't determine - assume ptys are world accessable]) + AC_MSG_RESULT([can't determine - assume ptys are world accessible]) ],[ AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode') ]) diff --git a/src/version.c b/src/version.c index 376a78a38..874b163fd 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 315, +/**/ 314, /**/ 313, |