]>
Commit | Line | Data |
---|---|---|
3e054f6c AM |
1 | diff -ur gdb-6.7.org/gdb/Makefile.in gdb-6.7/gdb/Makefile.in |
2 | --- gdb-6.7.org/gdb/Makefile.in 2007-09-05 02:14:02.000000000 +0200 | |
3 | +++ gdb-6.7/gdb/Makefile.in 2007-10-10 21:11:18.119976680 +0200 | |
4 | @@ -126,11 +126,11 @@ | |
de7d4c89 AM |
5 | BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC) |
6 | ||
7 | # Where is the READLINE library? Typically in ../readline. | |
8 | -READLINE_DIR = ../readline | |
de7d4c89 | 9 | -READLINE_SRC = $(srcdir)/$(READLINE_DIR) |
3e054f6c AM |
10 | -READLINE = @READLINE@ |
11 | -READLINE_DEPS = @READLINE_DEPS@ | |
12 | -READLINE_CFLAGS = @READLINE_CFLAGS@ | |
de7d4c89 AM |
13 | +READLINE_DIR = /usr/include/readline |
14 | +READLINE = -lreadline | |
15 | +READLINE_SRC = /usr/include/readline | |
3e054f6c | 16 | +READLINE_DEPS = |
de7d4c89 AM |
17 | +READLINE_CFLAGS = -I/usr/include/readline |
18 | ||
3e054f6c AM |
19 | # Where is expat? This will be empty if expat was not available. |
20 | LIBEXPAT = @LIBEXPAT@ | |
14e76236 AM |
21 | @@ -416,7 +416,7 @@ |
22 | $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \ | |
3e054f6c | 23 | $(LIBICONV) $(LIBEXPAT) \ |
562ea884 | 24 | $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) |
14e76236 AM |
25 | -CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ |
26 | +CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) \ | |
562ea884 | 27 | $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) |
b7499d66 PS |
28 | |
29 | ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES) | |
3e054f6c AM |
30 | diff -ur gdb-6.7.org/Makefile.in gdb-6.7/Makefile.in |
31 | --- gdb-6.7.org/Makefile.in 2007-10-10 19:09:32.000000000 +0200 | |
32 | +++ gdb-6.7/Makefile.in 2007-10-10 21:10:23.310556251 +0200 | |
33 | @@ -664,7 +664,6 @@ | |
2ee06e07 AM |
34 | maybe-configure-perl \ |
35 | maybe-configure-prms \ | |
36 | maybe-configure-rcs \ | |
37 | - maybe-configure-readline \ | |
38 | maybe-configure-release \ | |
39 | maybe-configure-recode \ | |
40 | maybe-configure-sed \ | |
3e054f6c | 41 | @@ -812,7 +811,6 @@ |
2ebec1f7 JB |
42 | all-host: maybe-all-perl |
43 | all-host: maybe-all-prms | |
44 | all-host: maybe-all-rcs | |
45 | -all-host: maybe-all-readline | |
46 | all-host: maybe-all-release | |
47 | all-host: maybe-all-recode | |
48 | all-host: maybe-all-sed | |
3e054f6c | 49 | @@ -927,7 +925,6 @@ |
2ebec1f7 JB |
50 | info-host: maybe-info-perl |
51 | info-host: maybe-info-prms | |
52 | info-host: maybe-info-rcs | |
53 | -info-host: maybe-info-readline | |
54 | info-host: maybe-info-release | |
55 | info-host: maybe-info-recode | |
56 | info-host: maybe-info-sed | |
3e054f6c | 57 | @@ -1033,7 +1030,6 @@ |
2ebec1f7 JB |
58 | dvi-host: maybe-dvi-perl |
59 | dvi-host: maybe-dvi-prms | |
60 | dvi-host: maybe-dvi-rcs | |
61 | -dvi-host: maybe-dvi-readline | |
62 | dvi-host: maybe-dvi-release | |
63 | dvi-host: maybe-dvi-recode | |
64 | dvi-host: maybe-dvi-sed | |
3e054f6c | 65 | @@ -1245,7 +1241,6 @@ |
2ebec1f7 JB |
66 | html-host: maybe-html-perl |
67 | html-host: maybe-html-prms | |
68 | html-host: maybe-html-rcs | |
69 | -html-host: maybe-html-readline | |
70 | html-host: maybe-html-release | |
71 | html-host: maybe-html-recode | |
72 | html-host: maybe-html-sed | |
3e054f6c | 73 | @@ -1351,7 +1346,6 @@ |
2ebec1f7 JB |
74 | TAGS-host: maybe-TAGS-perl |
75 | TAGS-host: maybe-TAGS-prms | |
76 | TAGS-host: maybe-TAGS-rcs | |
77 | -TAGS-host: maybe-TAGS-readline | |
78 | TAGS-host: maybe-TAGS-release | |
79 | TAGS-host: maybe-TAGS-recode | |
80 | TAGS-host: maybe-TAGS-sed | |
3e054f6c | 81 | @@ -1457,7 +1451,6 @@ |
2ebec1f7 JB |
82 | install-info-host: maybe-install-info-perl |
83 | install-info-host: maybe-install-info-prms | |
84 | install-info-host: maybe-install-info-rcs | |
85 | -install-info-host: maybe-install-info-readline | |
86 | install-info-host: maybe-install-info-release | |
87 | install-info-host: maybe-install-info-recode | |
88 | install-info-host: maybe-install-info-sed | |
3e054f6c | 89 | @@ -1669,7 +1662,6 @@ |
2ebec1f7 JB |
90 | install-html-host: maybe-install-html-perl |
91 | install-html-host: maybe-install-html-prms | |
92 | install-html-host: maybe-install-html-rcs | |
93 | -install-html-host: maybe-install-html-readline | |
94 | install-html-host: maybe-install-html-release | |
95 | install-html-host: maybe-install-html-recode | |
96 | install-html-host: maybe-install-html-sed | |
3e054f6c | 97 | @@ -1775,7 +1767,6 @@ |
2ebec1f7 JB |
98 | installcheck-host: maybe-installcheck-perl |
99 | installcheck-host: maybe-installcheck-prms | |
100 | installcheck-host: maybe-installcheck-rcs | |
101 | -installcheck-host: maybe-installcheck-readline | |
102 | installcheck-host: maybe-installcheck-release | |
103 | installcheck-host: maybe-installcheck-recode | |
104 | installcheck-host: maybe-installcheck-sed | |
3e054f6c | 105 | @@ -1881,7 +1872,6 @@ |
2ebec1f7 JB |
106 | mostlyclean-host: maybe-mostlyclean-perl |
107 | mostlyclean-host: maybe-mostlyclean-prms | |
108 | mostlyclean-host: maybe-mostlyclean-rcs | |
109 | -mostlyclean-host: maybe-mostlyclean-readline | |
110 | mostlyclean-host: maybe-mostlyclean-release | |
111 | mostlyclean-host: maybe-mostlyclean-recode | |
112 | mostlyclean-host: maybe-mostlyclean-sed | |
3e054f6c | 113 | @@ -1987,7 +1977,6 @@ |
2ebec1f7 JB |
114 | clean-host: maybe-clean-perl |
115 | clean-host: maybe-clean-prms | |
116 | clean-host: maybe-clean-rcs | |
117 | -clean-host: maybe-clean-readline | |
118 | clean-host: maybe-clean-release | |
119 | clean-host: maybe-clean-recode | |
120 | clean-host: maybe-clean-sed | |
3e054f6c | 121 | @@ -2093,7 +2082,6 @@ |
2ebec1f7 JB |
122 | distclean-host: maybe-distclean-perl |
123 | distclean-host: maybe-distclean-prms | |
124 | distclean-host: maybe-distclean-rcs | |
125 | -distclean-host: maybe-distclean-readline | |
126 | distclean-host: maybe-distclean-release | |
127 | distclean-host: maybe-distclean-recode | |
128 | distclean-host: maybe-distclean-sed | |
3e054f6c | 129 | @@ -2199,7 +2187,6 @@ |
2ebec1f7 JB |
130 | maintainer-clean-host: maybe-maintainer-clean-perl |
131 | maintainer-clean-host: maybe-maintainer-clean-prms | |
132 | maintainer-clean-host: maybe-maintainer-clean-rcs | |
133 | -maintainer-clean-host: maybe-maintainer-clean-readline | |
134 | maintainer-clean-host: maybe-maintainer-clean-release | |
135 | maintainer-clean-host: maybe-maintainer-clean-recode | |
136 | maintainer-clean-host: maybe-maintainer-clean-sed | |
3e054f6c | 137 | @@ -2359,7 +2346,6 @@ |
2ee06e07 AM |
138 | maybe-check-perl \ |
139 | maybe-check-prms \ | |
140 | maybe-check-rcs \ | |
141 | - maybe-check-readline \ | |
142 | maybe-check-release \ | |
143 | maybe-check-recode \ | |
144 | maybe-check-sed \ | |
3e054f6c | 145 | @@ -2491,7 +2477,6 @@ |
2ee06e07 AM |
146 | maybe-install-perl \ |
147 | maybe-install-prms \ | |
148 | maybe-install-rcs \ | |
149 | - maybe-install-readline \ | |
150 | maybe-install-release \ | |
151 | maybe-install-recode \ | |
152 | maybe-install-sed \ | |
3e054f6c | 153 | @@ -2564,7 +2549,6 @@ |
2ee06e07 AM |
154 | maybe-install-perl \ |
155 | maybe-install-prms \ | |
156 | maybe-install-rcs \ | |
157 | - maybe-install-readline \ | |
158 | maybe-install-release \ | |
159 | maybe-install-recode \ | |
160 | maybe-install-sed \ | |
3e054f6c AM |
161 | @@ -51494,7 +51478,6 @@ |
162 | all-gdb: maybe-all-intl | |
b3d93c17 JB |
163 | all-gdb: maybe-all-libiberty |
164 | all-gdb: maybe-all-opcodes | |
b3d93c17 JB |
165 | -all-gdb: maybe-all-readline |
166 | all-gdb: maybe-all-build-bison | |
167 | all-gdb: maybe-all-build-byacc | |
168 | all-gdb: maybe-all-sim | |
3e054f6c | 169 | @@ -51826,7 +51809,6 @@ |
b3d93c17 JB |
170 | all-sim: maybe-all-libiberty |
171 | all-sim: maybe-all-bfd | |
172 | all-sim: maybe-all-opcodes | |
173 | -all-sim: maybe-all-readline | |
174 | all-sim: maybe-configure-gdb | |
175 | all-fastjar: maybe-all-zlib | |
176 | all-fastjar: maybe-all-build-texinfo | |
17bcb6f5 AM |
177 | --- gdb-6.8.50.20090224/gdb/tui/tui-io.c~ 2009-02-24 09:17:18.617891690 +0100 |
178 | +++ gdb-6.8.50.20090224/gdb/tui/tui-io.c 2009-02-24 09:17:43.554606911 +0100 | |
179 | @@ -512,7 +512,7 @@ | |
180 | void | |
181 | tui_setup_io (int mode) | |
182 | { | |
183 | - extern int readline_echoing_p; | |
184 | + extern int _rl_echoing_p; | |
185 | ||
186 | if (mode) | |
187 | { | |
188 | @@ -522,12 +522,12 @@ | |
189 | tui_old_rl_prep_terminal = rl_prep_term_function; | |
190 | tui_old_rl_getc_function = rl_getc_function; | |
191 | tui_old_rl_outstream = rl_outstream; | |
192 | - tui_old_readline_echoing_p = readline_echoing_p; | |
193 | + tui_old_readline_echoing_p = _rl_echoing_p; | |
194 | rl_redisplay_function = tui_redisplay_readline; | |
195 | rl_deprep_term_function = tui_deprep_terminal; | |
196 | rl_prep_term_function = tui_prep_terminal; | |
197 | rl_getc_function = tui_getc; | |
198 | - readline_echoing_p = 0; | |
199 | + _rl_echoing_p = 0; | |
200 | rl_outstream = tui_rl_outstream; | |
201 | rl_prompt = 0; | |
202 | rl_completion_display_matches_hook = tui_rl_display_match_list; | |
203 | @@ -564,7 +564,7 @@ | |
204 | rl_getc_function = tui_old_rl_getc_function; | |
205 | rl_outstream = tui_old_rl_outstream; | |
206 | rl_completion_display_matches_hook = 0; | |
207 | - readline_echoing_p = tui_old_readline_echoing_p; | |
208 | + _rl_echoing_p = tui_old_readline_echoing_p; | |
209 | rl_already_prompted = 0; | |
210 | ||
211 | /* Save tty for SIGCONT. */ |