]>
Commit | Line | Data |
---|---|---|
e40e3b19 AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.2.315 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.2.315 | |
11 | Problem: Python libs can't be found on 64 bit system. | |
12 | Solution: Add lib64 to the list of directories. (Michael Henry) | |
13 | Files: src/auto/configure, src/configure.in | |
14 | ||
15 | ||
16 | *** ../vim-7.2.314/src/auto/configure 2009-11-17 17:13:03.000000000 +0100 | |
17 | --- src/auto/configure 2009-12-02 17:21:20.000000000 +0100 | |
18 | *************** | |
19 | *** 5126,5132 **** | |
20 | ||
21 | vi_cv_path_python_conf= | |
22 | for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do | |
23 | ! for subdir in lib share; do | |
24 | d="${path}/${subdir}/python${vi_cv_var_python_version}/config" | |
25 | if test -d "$d" && test -f "$d/config.c"; then | |
26 | vi_cv_path_python_conf="$d" | |
27 | --- 5126,5132 ---- | |
28 | ||
29 | vi_cv_path_python_conf= | |
30 | for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do | |
31 | ! for subdir in lib64 lib share; do | |
32 | d="${path}/${subdir}/python${vi_cv_var_python_version}/config" | |
33 | if test -d "$d" && test -f "$d/config.c"; then | |
34 | vi_cv_path_python_conf="$d" | |
35 | *************** | |
36 | *** 13718,13725 **** | |
37 | $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; } | |
38 | else | |
39 | vim_cv_tty_group=world | |
40 | ! { $as_echo "$as_me:$LINENO: result: ptys are world accessable" >&5 | |
41 | ! $as_echo "ptys are world accessable" >&6; } | |
42 | fi | |
43 | ||
44 | else | |
45 | --- 13718,13725 ---- | |
46 | $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; } | |
47 | else | |
48 | vim_cv_tty_group=world | |
49 | ! { $as_echo "$as_me:$LINENO: result: ptys are world accessible" >&5 | |
50 | ! $as_echo "ptys are world accessible" >&6; } | |
51 | fi | |
52 | ||
53 | else | |
54 | *************** | |
55 | *** 13730,13737 **** | |
56 | ( exit $ac_status ) | |
57 | ||
58 | vim_cv_tty_group=world | |
59 | ! { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5 | |
60 | ! $as_echo "can't determine - assume ptys are world accessable" >&6; } | |
61 | ||
62 | fi | |
63 | rm -rf conftest.dSYM | |
64 | --- 13730,13737 ---- | |
65 | ( exit $ac_status ) | |
66 | ||
67 | vim_cv_tty_group=world | |
68 | ! { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessible" >&5 | |
69 | ! $as_echo "can't determine - assume ptys are world accessible" >&6; } | |
70 | ||
71 | fi | |
72 | rm -rf conftest.dSYM | |
73 | *** ../vim-7.2.314/src/configure.in 2009-11-17 17:13:03.000000000 +0100 | |
74 | --- src/configure.in 2009-12-02 17:21:10.000000000 +0100 | |
75 | *************** | |
76 | *** 686,692 **** | |
77 | [ | |
78 | vi_cv_path_python_conf= | |
79 | for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do | |
80 | ! for subdir in lib share; do | |
81 | d="${path}/${subdir}/python${vi_cv_var_python_version}/config" | |
82 | if test -d "$d" && test -f "$d/config.c"; then | |
83 | vi_cv_path_python_conf="$d" | |
84 | --- 686,692 ---- | |
85 | [ | |
86 | vi_cv_path_python_conf= | |
87 | for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do | |
88 | ! for subdir in lib64 lib share; do | |
89 | d="${path}/${subdir}/python${vi_cv_var_python_version}/config" | |
90 | if test -d "$d" && test -f "$d/config.c"; then | |
91 | vi_cv_path_python_conf="$d" | |
92 | *************** | |
93 | *** 2557,2567 **** | |
94 | AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group]) | |
95 | else | |
96 | vim_cv_tty_group=world | |
97 | ! AC_MSG_RESULT([ptys are world accessable]) | |
98 | fi | |
99 | ],[ | |
100 | vim_cv_tty_group=world | |
101 | ! AC_MSG_RESULT([can't determine - assume ptys are world accessable]) | |
102 | ],[ | |
103 | AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode') | |
104 | ]) | |
105 | --- 2557,2567 ---- | |
106 | AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group]) | |
107 | else | |
108 | vim_cv_tty_group=world | |
109 | ! AC_MSG_RESULT([ptys are world accessible]) | |
110 | fi | |
111 | ],[ | |
112 | vim_cv_tty_group=world | |
113 | ! AC_MSG_RESULT([can't determine - assume ptys are world accessible]) | |
114 | ],[ | |
115 | AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode') | |
116 | ]) | |
117 | *** ../vim-7.2.314/src/version.c 2009-12-02 17:47:46.000000000 +0100 | |
118 | --- src/version.c 2009-12-02 17:57:39.000000000 +0100 | |
119 | *************** | |
120 | *** 683,684 **** | |
121 | --- 683,686 ---- | |
122 | { /* Add new patch number below this line */ | |
123 | + /**/ | |
124 | + 315, | |
125 | /**/ | |
126 | ||
127 | -- | |
128 | hundred-and-one symptoms of being an internet addict: | |
129 | 10. And even your night dreams are in HTML. | |
130 | ||
131 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
132 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
133 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
134 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |