Merge lp:~noskcaj/ubuntu/vivid/xfce4-diskperf-plugin/2.5.5 into lp:ubuntu/vivid/xfce4-diskperf-plugin
- Vivid (15.04)
- 2.5.5
- Merge into vivid
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merged at revision: | 19 |
Proposed branch: | lp:~noskcaj/ubuntu/vivid/xfce4-diskperf-plugin/2.5.5 |
Merge into: | lp:ubuntu/vivid/xfce4-diskperf-plugin |
Diff against target: | 23121 lines |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/vivid/xfce4-diskperf-plugin/2.5.5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Approve | ||
Review via email: mp+251659@code.launchpad.net |
Commit message
Description of the change
New upstream bugfix release
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2012-06-30 15:21:33 +0000 |
3 | +++ ChangeLog 2015-03-03 21:10:41 +0000 |
4 | @@ -1,3 +1,445 @@ |
5 | +commit 768a1689fca7017edd2b35bcce56b59455db5ee1 |
6 | +Author: Justin Gassner <justin.gassner@web.de> |
7 | +Date: Thu Jan 22 20:21:37 2015 +0100 |
8 | + |
9 | + Use the new GtkTooltip API |
10 | + |
11 | + GtkTooltips has been deprecated since 2.12 |
12 | + |
13 | + Signed-off-by: Landry Breuil <landry@xfce.org> |
14 | + |
15 | +commit f3ebfa561d1b3686e2f313099939d999f2732e19 |
16 | +Author: Pablo Roberto Francisco Lezaeta Reyes <prflr88@gmail.com> |
17 | +Date: Fri Dec 26 06:31:37 2014 +0100 |
18 | + |
19 | + I18n: Update translation es (100%). |
20 | + |
21 | + 38 translated messages. |
22 | + |
23 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
24 | + |
25 | +commit 5c8143716c625ad26e20651d09c0fc40ccacb1bb |
26 | +Author: Danilo Egea <daniloegea@yahoo.com.br> |
27 | +Date: Thu Sep 11 15:46:32 2014 +0200 |
28 | + |
29 | + Fix a memory leak in the FreeBSD codepath (#11153) |
30 | + |
31 | +commit 49cc8a172c862c85d58b2e6c87eb718ee9f4a1c2 |
32 | +Author: Yannick Le Guen <leguen.yannick@gmail.com> |
33 | +Date: Fri Aug 1 00:31:12 2014 +0200 |
34 | + |
35 | + I18n: Update translation fr (100%). |
36 | + |
37 | + 38 translated messages. |
38 | + |
39 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
40 | + |
41 | +commit 505667b9501de8e2f7c4673ce384bb25a079178f |
42 | +Author: Anonymous <noreply@xfce.org> |
43 | +Date: Mon Jul 7 12:31:13 2014 +0200 |
44 | + |
45 | + I18n: Update translation de (100%). |
46 | + |
47 | + 38 translated messages. |
48 | + |
49 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
50 | + |
51 | +commit 594464bd4867e2709726c20c0bc2934e20e91c8b |
52 | +Author: Pablo Lezaeta <prflr88@gmail.com> |
53 | +Date: Mon May 19 12:31:33 2014 +0200 |
54 | + |
55 | + I18n: Update translation es (100%). |
56 | + |
57 | + 38 translated messages. |
58 | + |
59 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
60 | + |
61 | +commit 66b54a1be6c78ba32d996d1eef2269762de873fb |
62 | +Author: Darkcircle <darkcircle.0426@gmail.com> |
63 | +Date: Fri May 16 18:31:16 2014 +0200 |
64 | + |
65 | + I18n: Update translation ko (100%). |
66 | + |
67 | + 38 translated messages. |
68 | + |
69 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
70 | + |
71 | +commit 1fff1a52b8c49b5bde4e2c5b39fa0035b01c8638 |
72 | +Author: haarek <haarektrans@gmail.com> |
73 | +Date: Wed Apr 30 06:31:10 2014 +0200 |
74 | + |
75 | + I18n: Update translation nb (100%). |
76 | + |
77 | + 38 translated messages. |
78 | + |
79 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
80 | + |
81 | +commit cc9772b8d1f9916301fb2f78063a41615c3b91c3 |
82 | +Author: haarek <haarektrans@gmail.com> |
83 | +Date: Sun Apr 27 18:31:16 2014 +0200 |
84 | + |
85 | + I18n: Update translation nb (89%). |
86 | + |
87 | + 34 translated messages, 4 untranslated messages. |
88 | + |
89 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
90 | + |
91 | +commit c8658b6ee94f38b33d70b91f37777b956b0c9472 |
92 | +Author: Tornes Llume <l.lumex03.tornes@gmail.com> |
93 | +Date: Mon Apr 14 06:31:20 2014 +0200 |
94 | + |
95 | + I18n: Update translation ast (100%). |
96 | + |
97 | + 38 translated messages. |
98 | + |
99 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
100 | + |
101 | +commit cf62888c28dfd12127a6f47ab64be736907957f2 |
102 | +Author: theppitak <theppitak@gmail.com> |
103 | +Date: Thu Apr 10 18:31:21 2014 +0200 |
104 | + |
105 | + I18n: Add new translation th (100%). |
106 | + |
107 | + 38 translated messages. |
108 | + |
109 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
110 | + |
111 | +commit 469275bece6d09a1e85857d8ca3794cf771807bf |
112 | +Author: schizo <eveskovic@gmail.com> |
113 | +Date: Thu Mar 13 00:31:22 2014 +0100 |
114 | + |
115 | + I18n: Update translation hr (100%). |
116 | + |
117 | + 38 translated messages. |
118 | + |
119 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
120 | + |
121 | +commit 9eb098fba778ea8e4817e4ac192276f4313c48d9 |
122 | +Author: abuyop <abuyop@gmail.com> |
123 | +Date: Sun Feb 23 06:31:40 2014 +0100 |
124 | + |
125 | + I18n: Add new translation ms (100%). |
126 | + |
127 | + 38 translated messages. |
128 | + |
129 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
130 | + |
131 | +commit 67543fa6e144e00de43721946a7ae0b5823c7596 |
132 | +Author: PavelNicklasson <pavelnicklasson@bahnhof.se> |
133 | +Date: Tue Feb 18 00:31:17 2014 +0100 |
134 | + |
135 | + I18n: Update translation sv (100%). |
136 | + |
137 | + 38 translated messages. |
138 | + |
139 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
140 | + |
141 | +commit 6f107b223f6323892625e8690bd48729827951a0 |
142 | +Author: Anonymous <noreply@xfce.org> |
143 | +Date: Mon Jan 13 12:31:16 2014 +0100 |
144 | + |
145 | + I18n: Update translation bg (100%). |
146 | + |
147 | + 38 translated messages. |
148 | + |
149 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
150 | + |
151 | +commit 840e13e178bedc5380f220d089fdc28ad3a9d0d4 |
152 | +Author: Anonymous <noreply@xfce.org> |
153 | +Date: Sun Jan 12 18:31:14 2014 +0100 |
154 | + |
155 | + I18n: Add new translation bg (84%). |
156 | + |
157 | + 32 translated messages, 6 untranslated messages. |
158 | + |
159 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
160 | + |
161 | +commit 2ff317e4ff85a64c28f9771b49df7fddd8ae87b9 |
162 | +Author: Walter Cheuk <wwycheuk@gmail.com> |
163 | +Date: Sat Jan 4 06:31:15 2014 +0100 |
164 | + |
165 | + I18n: Update translation zh_TW (100%). |
166 | + |
167 | + 38 translated messages. |
168 | + |
169 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
170 | + |
171 | +commit 6f47763d24d44475d96d6a212ba65d5b4c1f823a |
172 | +Author: Cedric31 <cvalmary@yahoo.fr> |
173 | +Date: Thu Dec 5 00:31:18 2013 +0100 |
174 | + |
175 | + I18n: Add new translation oc (100%). |
176 | + |
177 | + 38 translated messages. |
178 | + |
179 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
180 | + |
181 | +commit 7465e1bba572eb9c18df313b1238149382b55bc6 |
182 | +Author: Ivica Kolić <ikoli@yahoo.com> |
183 | +Date: Sun Nov 3 06:31:16 2013 +0100 |
184 | + |
185 | + I18n: Add new translation hr (55%). |
186 | + |
187 | + 21 translated messages, 17 untranslated messages. |
188 | + |
189 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
190 | + |
191 | +commit bcad7d1ceae4953ddbb61c374c2ba4ec8c7eb5df |
192 | +Author: Pjotr123 <pjotrvertaalt@gmail.com> |
193 | +Date: Thu Sep 19 18:31:48 2013 +0200 |
194 | + |
195 | + I18n: Update translation nl (100%). |
196 | + |
197 | + 38 translated messages. |
198 | + |
199 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
200 | + |
201 | +commit 0faba9adc585a02071b4ab1d8761413b4cc35a9a |
202 | +Author: Danilo Egea <daniloegea@yahoo.com.br> |
203 | +Date: Sat Sep 14 10:13:23 2013 +0200 |
204 | + |
205 | + Add support for FreeBSD (bug #10350) |
206 | + |
207 | +commit b1167d15ad443ac1b97a4c1f360e5e345d25747a |
208 | +Author: Necdet Yücel <necdetyucel@gmail.com> |
209 | +Date: Fri Sep 6 18:31:35 2013 +0200 |
210 | + |
211 | + I18n: Update translation tr (100%). |
212 | + |
213 | + 38 translated messages. |
214 | + |
215 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
216 | + |
217 | +commit 63964fbb5bc620c9b0225d271d8732947209e65e |
218 | +Author: cri <cri.penta@gmail.com> |
219 | +Date: Fri Aug 16 18:31:26 2013 +0200 |
220 | + |
221 | + I18n: Update translation it (100%). |
222 | + |
223 | + 38 translated messages. |
224 | + |
225 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
226 | + |
227 | +commit ef367445ca6acd914da962605bc063f83dbd0c9e |
228 | +Author: jc1 <jc1.quebecos@gmail.com> |
229 | +Date: Sat Aug 3 18:31:29 2013 +0200 |
230 | + |
231 | + I18n: Update translation fr (100%). |
232 | + |
233 | + 38 translated messages. |
234 | + |
235 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
236 | + |
237 | +commit 2a3022866c8c197648c10b4fd7c139da02811b7b |
238 | +Author: Necdet Yücel <necdetyucel@gmail.com> |
239 | +Date: Fri Aug 2 18:31:26 2013 +0200 |
240 | + |
241 | + I18n: Update translation tr (97%). |
242 | + |
243 | + 37 translated messages, 1 untranslated message. |
244 | + |
245 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
246 | + |
247 | +commit e01926a788f84f88d12b71f8e4c11e541020fc80 |
248 | +Author: k3lt01 <keltoiboy@gmail.com> |
249 | +Date: Mon Jul 29 12:32:52 2013 +0200 |
250 | + |
251 | + I18n: Add new translation en_AU (100%). |
252 | + |
253 | + 38 translated messages. |
254 | + |
255 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
256 | + |
257 | +commit 597ad0c26661e9ebef0ee8353bc49d20252fe2ad |
258 | +Author: Anonymous <noreply@xfce.org> |
259 | +Date: Wed Jul 17 12:31:41 2013 +0200 |
260 | + |
261 | + I18n: Update translation ug (100%). |
262 | + |
263 | + 38 translated messages. |
264 | + |
265 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
266 | + |
267 | +commit 22a346cc85438b05aa7b7522b41d3fe0f81b62f5 |
268 | +Author: Pjotr vertaalt <pjotrvertaalt@gmail.com> |
269 | +Date: Fri Apr 26 22:31:23 2013 +0200 |
270 | + |
271 | + l10n: Updated Dutch (Flemish) (nl) translation to 100% |
272 | + |
273 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
274 | + |
275 | + Transmitted-via: Transifex (translations.xfce.org). |
276 | + |
277 | +commit dc5b3b0913341cdf877d7d636109389c4f5ac6b1 |
278 | +Author: Imre Benedek <nucleo@indamail.hu> |
279 | +Date: Tue Mar 12 22:10:55 2013 +0100 |
280 | + |
281 | + l10n: Updated Hungarian (hu) translation to 100% |
282 | + |
283 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
284 | + |
285 | + Transmitted-via: Transifex (translations.xfce.org). |
286 | + |
287 | +commit b5a39c9fc5609607fefaa78e7a712eb5b3c4ac37 |
288 | +Author: Саша Петровић <salepetronije@gmail.com> |
289 | +Date: Fri Jan 25 20:48:49 2013 +0100 |
290 | + |
291 | + l10n: Serbian translations |
292 | + |
293 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
294 | + |
295 | + Transmitted-via: Transifex (translations.xfce.org). |
296 | + |
297 | +commit f55c5baee337762404159cc82599cca88924f377 |
298 | +Author: jc jc1 <jc1.quebecos@gmail.com> |
299 | +Date: Sat Dec 15 16:57:54 2012 +0100 |
300 | + |
301 | + l10n: Updated French (fr) translation to 100% |
302 | + |
303 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
304 | + |
305 | + Transmitted-via: Transifex (translations.xfce.org). |
306 | + |
307 | +commit 48797b022f36d72b3bdbc8236515e108a63a297e |
308 | +Author: محمد الحرقان <malham1@gmail.com> |
309 | +Date: Sun Nov 18 17:37:10 2012 +0100 |
310 | + |
311 | + l10n: Updated Arabic (ar) translation to 100% |
312 | + |
313 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
314 | + |
315 | + Transmitted-via: Transifex (translations.xfce.org). |
316 | + |
317 | +commit a7a8a9faf0b5fb5625b04ca5c9ef081014a36bb1 |
318 | +Author: Michal Várady <miko.vaji@gmail.com> |
319 | +Date: Wed Nov 14 01:11:32 2012 +0100 |
320 | + |
321 | + l10n: Updated Czech (cs) translation to 100% |
322 | + |
323 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
324 | + |
325 | + Transmitted-via: Transifex (translations.xfce.org). |
326 | + |
327 | +commit 9328d6ff1bea4fd9282b7fb191fe032c5cbf0ddb |
328 | +Author: Michal Várady <miko.vaji@gmail.com> |
329 | +Date: Wed Nov 14 01:11:20 2012 +0100 |
330 | + |
331 | + l10n: Updated Czech (cs) translation to 97% |
332 | + |
333 | + New status: 37 messages complete with 1 fuzzy and 0 untranslated. |
334 | + |
335 | + Transmitted-via: Transifex (translations.xfce.org). |
336 | + |
337 | +commit 86358be025dfa7a90fb6f290f4f00bdeaede25b0 |
338 | +Author: Michal Várady <miko.vaji@gmail.com> |
339 | +Date: Wed Nov 14 01:11:02 2012 +0100 |
340 | + |
341 | + l10n: Updated Czech (cs) translation to 97% |
342 | + |
343 | + New status: 37 messages complete with 1 fuzzy and 0 untranslated. |
344 | + |
345 | + Transmitted-via: Transifex (translations.xfce.org). |
346 | + |
347 | +commit eca87b8daf6ddf921cb64f232fe524531f17aef1 |
348 | +Author: Hunt Xu <mhuntxu@gmail.com> |
349 | +Date: Sun Nov 11 15:06:49 2012 +0100 |
350 | + |
351 | + l10n: Updated Chinese (China) (zh_CN) translation to 100% |
352 | + |
353 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
354 | + |
355 | + Transmitted-via: Transifex (translations.xfce.org). |
356 | + |
357 | +commit 237fb9cd118b1304ced944a9c3738ac66fedbc5f |
358 | +Author: Harald Judt <h.judt@gmx.at> |
359 | +Date: Wed Nov 7 02:23:58 2012 +0100 |
360 | + |
361 | + l10n: Updated German (de) translation to 100% |
362 | + |
363 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
364 | + |
365 | + Transmitted-via: Transifex (translations.xfce.org). |
366 | + |
367 | +commit 63a3925db4402575bc5cb4fd48ceec4d095fb35b |
368 | +Author: Gheyret Kenji <gheyret@yahoo.com> |
369 | +Date: Thu Oct 25 07:24:51 2012 +0200 |
370 | + |
371 | + l10n: Updated Uyghur (ug) translation to 100% |
372 | + |
373 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
374 | + |
375 | + Transmitted-via: Transifex (translations.xfce.org). |
376 | + |
377 | +commit dac020daebac16707a3fcbc0a99e5814dfcb061d |
378 | +Author: Piotr Strębski <strebski@o2.pl> |
379 | +Date: Mon Sep 24 19:42:56 2012 +0200 |
380 | + |
381 | + l10n: Updated Polish (pl) translation to 100% |
382 | + |
383 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
384 | + |
385 | + Transmitted-via: Transifex (translations.xfce.org). |
386 | + |
387 | +commit f513b60e5debb298cef6c9ceb673f3622adc23de |
388 | +Author: Piotr Strębski <strebski@o2.pl> |
389 | +Date: Mon Sep 24 19:37:49 2012 +0200 |
390 | + |
391 | + l10n: Updated Polish (pl) translation to 94% |
392 | + |
393 | + New status: 36 messages complete with 0 fuzzies and 2 untranslated. |
394 | + |
395 | + Transmitted-via: Transifex (translations.xfce.org). |
396 | + |
397 | +commit ab1904d57f2542dcbe51ce125a925382e34a1394 |
398 | +Author: jc jc1 <jc1.quebecos@gmail.com> |
399 | +Date: Thu Aug 30 13:52:05 2012 +0200 |
400 | + |
401 | + l10n: Updated French (fr) translation to 94% |
402 | + |
403 | + New status: 36 messages complete with 2 fuzzies and 0 untranslated. |
404 | + |
405 | + Transmitted-via: Transifex (translations.xfce.org). |
406 | + |
407 | +commit 5235bce3668a60a43169c7468ed6298e66861963 |
408 | +Author: Gheyret Kenji <gheyret@yahoo.com> |
409 | +Date: Tue Aug 7 04:22:40 2012 +0200 |
410 | + |
411 | + l10n: Updated Uyghur (ug) translation to 100% |
412 | + |
413 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
414 | + |
415 | + Transmitted-via: Transifex (translations.xfce.org). |
416 | + |
417 | +commit bd3d6bf11b5fb44dd03ea8221e8623fe22f3486c |
418 | +Author: Johannes Lips <johannes.lips@googlemail.com> |
419 | +Date: Tue Jul 24 00:20:03 2012 +0200 |
420 | + |
421 | + l10n: Updated German (de) translation to 97% |
422 | + |
423 | + New status: 37 messages complete with 1 fuzzy and 0 untranslated. |
424 | + |
425 | + Transmitted-via: Transifex (translations.xfce.org). |
426 | + |
427 | +commit a686c1999f17d64771ad97508a5a680fa4660fb2 |
428 | +Author: Cheng-Chia Tseng <pswo10680@gmail.com> |
429 | +Date: Thu Jul 19 16:00:47 2012 +0200 |
430 | + |
431 | + l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% |
432 | + |
433 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
434 | + |
435 | + Transmitted-via: Transifex (translations.xfce.org). |
436 | + |
437 | +commit 13d7b93dcf9f0bedbc46746b0bb691677fc8a1cb |
438 | +Author: prflr88 <prflr88@gmail.com> |
439 | +Date: Wed Jul 11 18:39:57 2012 +0200 |
440 | + |
441 | + l10n: Updated Spanish (Castilian) (es) translation to 100% |
442 | + |
443 | + New status: 38 messages complete with 0 fuzzies and 0 untranslated. |
444 | + |
445 | + Transmitted-via: Transifex (translations.xfce.org). |
446 | + |
447 | commit cf7b839726f2b08c298022b041f324af94565d2a |
448 | Author: Landry Breuil <landry@xfce.org> |
449 | Date: Sat Jun 30 09:38:03 2012 +0200 |
450 | |
451 | === modified file 'INSTALL' |
452 | --- INSTALL 2012-04-08 15:04:30 +0000 |
453 | +++ INSTALL 2015-03-03 21:10:41 +0000 |
454 | @@ -1,16 +1,25 @@ |
455 | Installation Instructions |
456 | ************************* |
457 | |
458 | -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free |
459 | -Software Foundation, Inc. |
460 | +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, |
461 | +Inc. |
462 | |
463 | -This file is free documentation; the Free Software Foundation gives |
464 | -unlimited permission to copy, distribute and modify it. |
465 | + Copying and distribution of this file, with or without modification, |
466 | +are permitted in any medium without royalty provided the copyright |
467 | +notice and this notice are preserved. This file is offered as-is, |
468 | +without warranty of any kind. |
469 | |
470 | Basic Installation |
471 | ================== |
472 | |
473 | -These are generic installation instructions. |
474 | + Briefly, the shell commands `./configure; make; make install' should |
475 | +configure, build, and install this package. The following |
476 | +more-detailed instructions are generic; see the `README' file for |
477 | +instructions specific to this package. Some packages provide this |
478 | +`INSTALL' file but do not implement all of the features documented |
479 | +below. The lack of an optional feature in a given package is not |
480 | +necessarily a bug. More recommendations for GNU packages can be found |
481 | +in *note Makefile Conventions: (standards)Makefile Conventions. |
482 | |
483 | The `configure' shell script attempts to guess correct values for |
484 | various system-dependent variables used during compilation. It uses |
485 | @@ -23,9 +32,9 @@ |
486 | |
487 | It can also use an optional file (typically called `config.cache' |
488 | and enabled with `--cache-file=config.cache' or simply `-C') that saves |
489 | -the results of its tests to speed up reconfiguring. (Caching is |
490 | +the results of its tests to speed up reconfiguring. Caching is |
491 | disabled by default to prevent problems with accidental use of stale |
492 | -cache files.) |
493 | +cache files. |
494 | |
495 | If you need to do unusual things to compile the package, please try |
496 | to figure out how `configure' could check whether to do them, and mail |
497 | @@ -35,30 +44,37 @@ |
498 | may remove or edit it. |
499 | |
500 | The file `configure.ac' (or `configure.in') is used to create |
501 | -`configure' by a program called `autoconf'. You only need |
502 | -`configure.ac' if you want to change it or regenerate `configure' using |
503 | -a newer version of `autoconf'. |
504 | +`configure' by a program called `autoconf'. You need `configure.ac' if |
505 | +you want to change it or regenerate `configure' using a newer version |
506 | +of `autoconf'. |
507 | |
508 | -The simplest way to compile this package is: |
509 | + The simplest way to compile this package is: |
510 | |
511 | 1. `cd' to the directory containing the package's source code and type |
512 | - `./configure' to configure the package for your system. If you're |
513 | - using `csh' on an old version of System V, you might need to type |
514 | - `sh ./configure' instead to prevent `csh' from trying to execute |
515 | - `configure' itself. |
516 | + `./configure' to configure the package for your system. |
517 | |
518 | - Running `configure' takes awhile. While running, it prints some |
519 | - messages telling which features it is checking for. |
520 | + Running `configure' might take a while. While running, it prints |
521 | + some messages telling which features it is checking for. |
522 | |
523 | 2. Type `make' to compile the package. |
524 | |
525 | 3. Optionally, type `make check' to run any self-tests that come with |
526 | - the package. |
527 | + the package, generally using the just-built uninstalled binaries. |
528 | |
529 | 4. Type `make install' to install the programs and any data files and |
530 | - documentation. |
531 | - |
532 | - 5. You can remove the program binaries and object files from the |
533 | + documentation. When installing into a prefix owned by root, it is |
534 | + recommended that the package be configured and built as a regular |
535 | + user, and only the `make install' phase executed with root |
536 | + privileges. |
537 | + |
538 | + 5. Optionally, type `make installcheck' to repeat any self-tests, but |
539 | + this time using the binaries in their final installed location. |
540 | + This target does not install anything. Running this target as a |
541 | + regular user, particularly if the prior `make install' required |
542 | + root privileges, verifies that the installation completed |
543 | + correctly. |
544 | + |
545 | + 6. You can remove the program binaries and object files from the |
546 | source code directory by typing `make clean'. To also remove the |
547 | files that `configure' created (so you can compile the package for |
548 | a different kind of computer), type `make distclean'. There is |
549 | @@ -67,45 +83,69 @@ |
550 | all sorts of other programs in order to regenerate files that came |
551 | with the distribution. |
552 | |
553 | + 7. Often, you can also type `make uninstall' to remove the installed |
554 | + files again. In practice, not all packages have tested that |
555 | + uninstallation works correctly, even though it is required by the |
556 | + GNU Coding Standards. |
557 | + |
558 | + 8. Some packages, particularly those that use Automake, provide `make |
559 | + distcheck', which can by used by developers to test that all other |
560 | + targets like `make install' and `make uninstall' work correctly. |
561 | + This target is generally not run by end users. |
562 | + |
563 | Compilers and Options |
564 | ===================== |
565 | |
566 | -Some systems require unusual options for compilation or linking that the |
567 | -`configure' script does not know about. Run `./configure --help' for |
568 | -details on some of the pertinent environment variables. |
569 | + Some systems require unusual options for compilation or linking that |
570 | +the `configure' script does not know about. Run `./configure --help' |
571 | +for details on some of the pertinent environment variables. |
572 | |
573 | You can give `configure' initial values for configuration parameters |
574 | by setting variables in the command line or in the environment. Here |
575 | is an example: |
576 | |
577 | - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix |
578 | + ./configure CC=c99 CFLAGS=-g LIBS=-lposix |
579 | |
580 | *Note Defining Variables::, for more details. |
581 | |
582 | Compiling For Multiple Architectures |
583 | ==================================== |
584 | |
585 | -You can compile the package for more than one kind of computer at the |
586 | + You can compile the package for more than one kind of computer at the |
587 | same time, by placing the object files for each architecture in their |
588 | -own directory. To do this, you must use a version of `make' that |
589 | -supports the `VPATH' variable, such as GNU `make'. `cd' to the |
590 | +own directory. To do this, you can use GNU `make'. `cd' to the |
591 | directory where you want the object files and executables to go and run |
592 | the `configure' script. `configure' automatically checks for the |
593 | -source code in the directory that `configure' is in and in `..'. |
594 | - |
595 | - If you have to use a `make' that does not support the `VPATH' |
596 | -variable, you have to compile the package for one architecture at a |
597 | -time in the source code directory. After you have installed the |
598 | -package for one architecture, use `make distclean' before reconfiguring |
599 | -for another architecture. |
600 | +source code in the directory that `configure' is in and in `..'. This |
601 | +is known as a "VPATH" build. |
602 | + |
603 | + With a non-GNU `make', it is safer to compile the package for one |
604 | +architecture at a time in the source code directory. After you have |
605 | +installed the package for one architecture, use `make distclean' before |
606 | +reconfiguring for another architecture. |
607 | + |
608 | + On MacOS X 10.5 and later systems, you can create libraries and |
609 | +executables that work on multiple system types--known as "fat" or |
610 | +"universal" binaries--by specifying multiple `-arch' options to the |
611 | +compiler but only a single `-arch' option to the preprocessor. Like |
612 | +this: |
613 | + |
614 | + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ |
615 | + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ |
616 | + CPP="gcc -E" CXXCPP="g++ -E" |
617 | + |
618 | + This is not guaranteed to produce working output in all cases, you |
619 | +may have to build one architecture at a time and combine the results |
620 | +using the `lipo' tool if you have problems. |
621 | |
622 | Installation Names |
623 | ================== |
624 | |
625 | -By default, `make install' installs the package's commands under |
626 | + By default, `make install' installs the package's commands under |
627 | `/usr/local/bin', include files under `/usr/local/include', etc. You |
628 | can specify an installation prefix other than `/usr/local' by giving |
629 | -`configure' the option `--prefix=PREFIX'. |
630 | +`configure' the option `--prefix=PREFIX', where PREFIX must be an |
631 | +absolute file name. |
632 | |
633 | You can specify separate installation prefixes for |
634 | architecture-specific files and architecture-independent files. If you |
635 | @@ -116,16 +156,47 @@ |
636 | In addition, if you use an unusual directory layout you can give |
637 | options like `--bindir=DIR' to specify different values for particular |
638 | kinds of files. Run `configure --help' for a list of the directories |
639 | -you can set and what kinds of files go in them. |
640 | +you can set and what kinds of files go in them. In general, the |
641 | +default for these options is expressed in terms of `${prefix}', so that |
642 | +specifying just `--prefix' will affect all of the other directory |
643 | +specifications that were not explicitly provided. |
644 | + |
645 | + The most portable way to affect installation locations is to pass the |
646 | +correct locations to `configure'; however, many packages provide one or |
647 | +both of the following shortcuts of passing variable assignments to the |
648 | +`make install' command line to change installation locations without |
649 | +having to reconfigure or recompile. |
650 | + |
651 | + The first method involves providing an override variable for each |
652 | +affected directory. For example, `make install |
653 | +prefix=/alternate/directory' will choose an alternate location for all |
654 | +directory configuration variables that were expressed in terms of |
655 | +`${prefix}'. Any directories that were specified during `configure', |
656 | +but not in terms of `${prefix}', must each be overridden at install |
657 | +time for the entire installation to be relocated. The approach of |
658 | +makefile variable overrides for each directory variable is required by |
659 | +the GNU Coding Standards, and ideally causes no recompilation. |
660 | +However, some platforms have known limitations with the semantics of |
661 | +shared libraries that end up requiring recompilation when using this |
662 | +method, particularly noticeable in packages that use GNU Libtool. |
663 | + |
664 | + The second method involves providing the `DESTDIR' variable. For |
665 | +example, `make install DESTDIR=/alternate/directory' will prepend |
666 | +`/alternate/directory' before all installation names. The approach of |
667 | +`DESTDIR' overrides is not required by the GNU Coding Standards, and |
668 | +does not work on platforms that have drive letters. On the other hand, |
669 | +it does better at avoiding recompilation issues, and works well even |
670 | +when some directory options were not specified in terms of `${prefix}' |
671 | +at `configure' time. |
672 | + |
673 | +Optional Features |
674 | +================= |
675 | |
676 | If the package supports it, you can cause programs to be installed |
677 | with an extra prefix or suffix on their names by giving `configure' the |
678 | option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. |
679 | |
680 | -Optional Features |
681 | -================= |
682 | - |
683 | -Some packages pay attention to `--enable-FEATURE' options to |
684 | + Some packages pay attention to `--enable-FEATURE' options to |
685 | `configure', where FEATURE indicates an optional part of the package. |
686 | They may also pay attention to `--with-PACKAGE' options, where PACKAGE |
687 | is something like `gnu-as' or `x' (for the X Window System). The |
688 | @@ -137,14 +208,58 @@ |
689 | you can use the `configure' options `--x-includes=DIR' and |
690 | `--x-libraries=DIR' to specify their locations. |
691 | |
692 | + Some packages offer the ability to configure how verbose the |
693 | +execution of `make' will be. For these packages, running `./configure |
694 | +--enable-silent-rules' sets the default to minimal output, which can be |
695 | +overridden with `make V=1'; while running `./configure |
696 | +--disable-silent-rules' sets the default to verbose, which can be |
697 | +overridden with `make V=0'. |
698 | + |
699 | +Particular systems |
700 | +================== |
701 | + |
702 | + On HP-UX, the default C compiler is not ANSI C compatible. If GNU |
703 | +CC is not installed, it is recommended to use the following options in |
704 | +order to use an ANSI C compiler: |
705 | + |
706 | + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" |
707 | + |
708 | +and if that doesn't work, install pre-built binaries of GCC for HP-UX. |
709 | + |
710 | + HP-UX `make' updates targets which have the same time stamps as |
711 | +their prerequisites, which makes it generally unusable when shipped |
712 | +generated files such as `configure' are involved. Use GNU `make' |
713 | +instead. |
714 | + |
715 | + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot |
716 | +parse its `<wchar.h>' header file. The option `-nodtk' can be used as |
717 | +a workaround. If GNU CC is not installed, it is therefore recommended |
718 | +to try |
719 | + |
720 | + ./configure CC="cc" |
721 | + |
722 | +and if that doesn't work, try |
723 | + |
724 | + ./configure CC="cc -nodtk" |
725 | + |
726 | + On Solaris, don't put `/usr/ucb' early in your `PATH'. This |
727 | +directory contains several dysfunctional programs; working variants of |
728 | +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' |
729 | +in your `PATH', put it _after_ `/usr/bin'. |
730 | + |
731 | + On Haiku, software installed for all users goes in `/boot/common', |
732 | +not `/usr/local'. It is recommended to use the following options: |
733 | + |
734 | + ./configure --prefix=/boot/common |
735 | + |
736 | Specifying the System Type |
737 | ========================== |
738 | |
739 | -There may be some features `configure' cannot figure out automatically, |
740 | -but needs to determine by the type of machine the package will run on. |
741 | -Usually, assuming the package is built to be run on the _same_ |
742 | -architectures, `configure' can figure that out, but if it prints a |
743 | -message saying it cannot guess the machine type, give it the |
744 | + There may be some features `configure' cannot figure out |
745 | +automatically, but needs to determine by the type of machine the package |
746 | +will run on. Usually, assuming the package is built to be run on the |
747 | +_same_ architectures, `configure' can figure that out, but if it prints |
748 | +a message saying it cannot guess the machine type, give it the |
749 | `--build=TYPE' option. TYPE can either be a short name for the system |
750 | type, such as `sun4', or a canonical name which has the form: |
751 | |
752 | @@ -152,7 +267,8 @@ |
753 | |
754 | where SYSTEM can have one of these forms: |
755 | |
756 | - OS KERNEL-OS |
757 | + OS |
758 | + KERNEL-OS |
759 | |
760 | See the file `config.sub' for the possible values of each field. If |
761 | `config.sub' isn't included in this package, then this package doesn't |
762 | @@ -170,9 +286,9 @@ |
763 | Sharing Defaults |
764 | ================ |
765 | |
766 | -If you want to set default values for `configure' scripts to share, you |
767 | -can create a site shell script called `config.site' that gives default |
768 | -values for variables like `CC', `cache_file', and `prefix'. |
769 | + If you want to set default values for `configure' scripts to share, |
770 | +you can create a site shell script called `config.site' that gives |
771 | +default values for variables like `CC', `cache_file', and `prefix'. |
772 | `configure' looks for `PREFIX/share/config.site' if it exists, then |
773 | `PREFIX/etc/config.site' if it exists. Or, you can set the |
774 | `CONFIG_SITE' environment variable to the location of the site script. |
775 | @@ -181,7 +297,7 @@ |
776 | Defining Variables |
777 | ================== |
778 | |
779 | -Variables not defined in a site shell script can be set in the |
780 | + Variables not defined in a site shell script can be set in the |
781 | environment passed to `configure'. However, some packages may run |
782 | configure again during the build, and the customized values of these |
783 | variables may be lost. In order to avoid this problem, you should set |
784 | @@ -190,21 +306,29 @@ |
785 | ./configure CC=/usr/local2/bin/gcc |
786 | |
787 | causes the specified `gcc' to be used as the C compiler (unless it is |
788 | -overridden in the site shell script). Here is a another example: |
789 | - |
790 | - /bin/bash ./configure CONFIG_SHELL=/bin/bash |
791 | - |
792 | -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent |
793 | -configuration-related scripts to be executed by `/bin/bash'. |
794 | +overridden in the site shell script). |
795 | + |
796 | +Unfortunately, this technique does not work for `CONFIG_SHELL' due to |
797 | +an Autoconf bug. Until the bug is fixed you can use this workaround: |
798 | + |
799 | + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash |
800 | |
801 | `configure' Invocation |
802 | ====================== |
803 | |
804 | -`configure' recognizes the following options to control how it operates. |
805 | + `configure' recognizes the following options to control how it |
806 | +operates. |
807 | |
808 | `--help' |
809 | `-h' |
810 | - Print a summary of the options to `configure', and exit. |
811 | + Print a summary of all of the options to `configure', and exit. |
812 | + |
813 | +`--help=short' |
814 | +`--help=recursive' |
815 | + Print a summary of the options unique to this package's |
816 | + `configure', and exit. The `short' variant lists options used |
817 | + only in the top level, while the `recursive' variant lists options |
818 | + also present in any nested packages. |
819 | |
820 | `--version' |
821 | `-V' |
822 | @@ -231,6 +355,16 @@ |
823 | Look for the package's source code in directory DIR. Usually |
824 | `configure' can determine that directory automatically. |
825 | |
826 | +`--prefix=DIR' |
827 | + Use DIR as the installation prefix. *note Installation Names:: |
828 | + for more details, including other options available for fine-tuning |
829 | + the installation locations. |
830 | + |
831 | +`--no-create' |
832 | +`-n' |
833 | + Run the configure checks, but stop before creating any output |
834 | + files. |
835 | + |
836 | `configure' also accepts some other, not widely useful, options. Run |
837 | `configure --help' for more details. |
838 | |
839 | |
840 | === modified file 'Makefile.in' |
841 | --- Makefile.in 2012-04-08 15:04:30 +0000 |
842 | +++ Makefile.in 2015-03-03 21:10:41 +0000 |
843 | @@ -1,8 +1,9 @@ |
844 | -# Makefile.in generated by automake 1.9.6 from Makefile.am. |
845 | +# Makefile.in generated by automake 1.11.6 from Makefile.am. |
846 | # @configure_input@ |
847 | |
848 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
849 | -# 2003, 2004, 2005 Free Software Foundation, Inc. |
850 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
851 | +# Foundation, Inc. |
852 | # This Makefile.in is free software; the Free Software Foundation |
853 | # gives unlimited permission to copy and/or distribute it, |
854 | # with or without modifications, as long as this notice is preserved. |
855 | @@ -13,18 +14,32 @@ |
856 | # PARTICULAR PURPOSE. |
857 | |
858 | @SET_MAKE@ |
859 | -srcdir = @srcdir@ |
860 | -top_srcdir = @top_srcdir@ |
861 | VPATH = @srcdir@ |
862 | +am__make_dryrun = \ |
863 | + { \ |
864 | + am__dry=no; \ |
865 | + case $$MAKEFLAGS in \ |
866 | + *\\[\ \ ]*) \ |
867 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
868 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
869 | + *) \ |
870 | + for am__flg in $$MAKEFLAGS; do \ |
871 | + case $$am__flg in \ |
872 | + *=*|--*) ;; \ |
873 | + *n*) am__dry=yes; break;; \ |
874 | + esac; \ |
875 | + done;; \ |
876 | + esac; \ |
877 | + test $$am__dry = yes; \ |
878 | + } |
879 | pkgdatadir = $(datadir)/@PACKAGE@ |
880 | +pkgincludedir = $(includedir)/@PACKAGE@ |
881 | pkglibdir = $(libdir)/@PACKAGE@ |
882 | -pkgincludedir = $(includedir)/@PACKAGE@ |
883 | -top_builddir = . |
884 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ |
885 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
886 | -INSTALL = @INSTALL@ |
887 | -install_sh_DATA = ${SHELL} $(install_sh) -c -m 644 |
888 | -install_sh_PROGRAM = ${SHELL} $(install_sh) -c |
889 | -install_sh_SCRIPT = ${SHELL} $(install_sh) -c |
890 | +install_sh_DATA = $(install_sh) -c -m 644 |
891 | +install_sh_PROGRAM = $(install_sh) -c |
892 | +install_sh_SCRIPT = $(install_sh) -c |
893 | INSTALL_HEADER = $(INSTALL_DATA) |
894 | transform = $(program_transform_name) |
895 | NORMAL_INSTALL = : |
896 | @@ -36,29 +51,41 @@ |
897 | build_triplet = @build@ |
898 | host_triplet = @host@ |
899 | target_triplet = @target@ |
900 | +subdir = . |
901 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
902 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
903 | $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ |
904 | compile config.guess config.sub depcomp install-sh ltmain.sh \ |
905 | missing mkinstalldirs |
906 | -subdir = . |
907 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
908 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
909 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
910 | $(ACLOCAL_M4) |
911 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
912 | - configure.lineno configure.status.lineno |
913 | + configure.lineno config.status.lineno |
914 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
915 | CONFIG_HEADER = config.h |
916 | CONFIG_CLEAN_FILES = |
917 | +CONFIG_CLEAN_VPATH_FILES = |
918 | SOURCES = |
919 | DIST_SOURCES = |
920 | RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
921 | html-recursive info-recursive install-data-recursive \ |
922 | - install-exec-recursive install-info-recursive \ |
923 | - install-recursive installcheck-recursive installdirs-recursive \ |
924 | - pdf-recursive ps-recursive uninstall-info-recursive \ |
925 | - uninstall-recursive |
926 | + install-dvi-recursive install-exec-recursive \ |
927 | + install-html-recursive install-info-recursive \ |
928 | + install-pdf-recursive install-ps-recursive install-recursive \ |
929 | + installcheck-recursive installdirs-recursive pdf-recursive \ |
930 | + ps-recursive uninstall-recursive |
931 | +am__can_run_installinfo = \ |
932 | + case $$AM_UPDATE_INFO_DIR in \ |
933 | + n|no|NO) false;; \ |
934 | + *) (install-info --version) >/dev/null 2>&1;; \ |
935 | + esac |
936 | +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
937 | + distclean-recursive maintainer-clean-recursive |
938 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
939 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
940 | + distdir dist dist-all distcheck |
941 | ETAGS = etags |
942 | CTAGS = ctags |
943 | DIST_SUBDIRS = $(SUBDIRS) |
944 | @@ -66,17 +93,44 @@ |
945 | distdir = $(PACKAGE)-$(VERSION) |
946 | top_distdir = $(distdir) |
947 | am__remove_distdir = \ |
948 | - { test ! -d $(distdir) \ |
949 | - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ |
950 | - && rm -fr $(distdir); }; } |
951 | + if test -d "$(distdir)"; then \ |
952 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
953 | + && rm -rf "$(distdir)" \ |
954 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
955 | + else :; fi |
956 | +am__relativize = \ |
957 | + dir0=`pwd`; \ |
958 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
959 | + sed_rest='s,^[^/]*/*,,'; \ |
960 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ |
961 | + sed_butlast='s,/*[^/]*$$,,'; \ |
962 | + while test -n "$$dir1"; do \ |
963 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ |
964 | + if test "$$first" != "."; then \ |
965 | + if test "$$first" = ".."; then \ |
966 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ |
967 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ |
968 | + else \ |
969 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ |
970 | + if test "$$first2" = "$$first"; then \ |
971 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ |
972 | + else \ |
973 | + dir2="../$$dir2"; \ |
974 | + fi; \ |
975 | + dir0="$$dir0"/"$$first"; \ |
976 | + fi; \ |
977 | + fi; \ |
978 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ |
979 | + done; \ |
980 | + reldir="$$dir2" |
981 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 |
982 | GZIP_ENV = --best |
983 | distuninstallcheck_listfiles = find . -type f -print |
984 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
985 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
986 | distcleancheck_listfiles = find . -type f -print |
987 | ACLOCAL = @ACLOCAL@ |
988 | ALL_LINGUAS = @ALL_LINGUAS@ |
989 | -AMDEP_FALSE = @AMDEP_FALSE@ |
990 | -AMDEP_TRUE = @AMDEP_TRUE@ |
991 | AMTAR = @AMTAR@ |
992 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
993 | AR = @AR@ |
994 | @@ -108,37 +162,19 @@ |
995 | GMOFILES = @GMOFILES@ |
996 | GMSGFMT = @GMSGFMT@ |
997 | GREP = @GREP@ |
998 | +INSTALL = @INSTALL@ |
999 | INSTALL_DATA = @INSTALL_DATA@ |
1000 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
1001 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
1002 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
1003 | INSTOBJEXT = @INSTOBJEXT@ |
1004 | INTLLIBS = @INTLLIBS@ |
1005 | -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ |
1006 | -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ |
1007 | -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ |
1008 | INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ |
1009 | -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ |
1010 | -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ |
1011 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
1012 | -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ |
1013 | INTLTOOL_PERL = @INTLTOOL_PERL@ |
1014 | -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ |
1015 | -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ |
1016 | -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ |
1017 | -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ |
1018 | -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ |
1019 | -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ |
1020 | -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ |
1021 | -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ |
1022 | -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ |
1023 | -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ |
1024 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
1025 | INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ |
1026 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1027 | -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ |
1028 | -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ |
1029 | -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ |
1030 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1031 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1032 | LD = @LD@ |
1033 | @@ -159,10 +195,9 @@ |
1034 | LN_S = @LN_S@ |
1035 | LTLIBOBJS = @LTLIBOBJS@ |
1036 | MAINT = @MAINT@ |
1037 | -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
1038 | -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
1039 | MAKEINFO = @MAKEINFO@ |
1040 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
1041 | +MKDIR_P = @MKDIR_P@ |
1042 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
1043 | MSGFMT = @MSGFMT@ |
1044 | MSGFMT_OPTS = @MSGFMT_OPTS@ |
1045 | @@ -181,6 +216,8 @@ |
1046 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
1047 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
1048 | PKG_CONFIG = @PKG_CONFIG@ |
1049 | +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
1050 | +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
1051 | POFILES = @POFILES@ |
1052 | POSUB = @POSUB@ |
1053 | PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ |
1054 | @@ -194,11 +231,13 @@ |
1055 | VERSION = @VERSION@ |
1056 | XGETTEXT = @XGETTEXT@ |
1057 | XGETTEXT_ARGS = @XGETTEXT_ARGS@ |
1058 | +abs_builddir = @abs_builddir@ |
1059 | +abs_srcdir = @abs_srcdir@ |
1060 | +abs_top_builddir = @abs_top_builddir@ |
1061 | +abs_top_srcdir = @abs_top_srcdir@ |
1062 | ac_ct_AR = @ac_ct_AR@ |
1063 | ac_ct_CC = @ac_ct_CC@ |
1064 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
1065 | -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ |
1066 | -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ |
1067 | am__include = @am__include@ |
1068 | am__leading_dot = @am__leading_dot@ |
1069 | am__quote = @am__quote@ |
1070 | @@ -210,6 +249,7 @@ |
1071 | build_cpu = @build_cpu@ |
1072 | build_os = @build_os@ |
1073 | build_vendor = @build_vendor@ |
1074 | +builddir = @builddir@ |
1075 | datadir = @datadir@ |
1076 | datarootdir = @datarootdir@ |
1077 | docdir = @docdir@ |
1078 | @@ -239,12 +279,16 @@ |
1079 | psdir = @psdir@ |
1080 | sbindir = @sbindir@ |
1081 | sharedstatedir = @sharedstatedir@ |
1082 | +srcdir = @srcdir@ |
1083 | sysconfdir = @sysconfdir@ |
1084 | target = @target@ |
1085 | target_alias = @target_alias@ |
1086 | target_cpu = @target_cpu@ |
1087 | target_os = @target_os@ |
1088 | target_vendor = @target_vendor@ |
1089 | +top_build_prefix = @top_build_prefix@ |
1090 | +top_builddir = @top_builddir@ |
1091 | +top_srcdir = @top_srcdir@ |
1092 | SUBDIRS = \ |
1093 | panel-plugin \ |
1094 | po |
1095 | @@ -264,21 +308,21 @@ |
1096 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
1097 | |
1098 | .SUFFIXES: |
1099 | -am--refresh: |
1100 | +am--refresh: Makefile |
1101 | @: |
1102 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
1103 | @for dep in $?; do \ |
1104 | case '$(am__configure_deps)' in \ |
1105 | *$$dep*) \ |
1106 | - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ |
1107 | - cd $(srcdir) && $(AUTOMAKE) --gnu \ |
1108 | + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ |
1109 | + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ |
1110 | && exit 0; \ |
1111 | exit 1;; \ |
1112 | esac; \ |
1113 | done; \ |
1114 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ |
1115 | - cd $(top_srcdir) && \ |
1116 | - $(AUTOMAKE) --gnu Makefile |
1117 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ |
1118 | + $(am__cd) $(top_srcdir) && \ |
1119 | + $(AUTOMAKE) --gnu Makefile |
1120 | .PRECIOUS: Makefile |
1121 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
1122 | @case '$?' in \ |
1123 | @@ -294,21 +338,20 @@ |
1124 | $(SHELL) ./config.status --recheck |
1125 | |
1126 | $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
1127 | - cd $(srcdir) && $(AUTOCONF) |
1128 | + $(am__cd) $(srcdir) && $(AUTOCONF) |
1129 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
1130 | - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
1131 | + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
1132 | +$(am__aclocal_m4_deps): |
1133 | |
1134 | config.h: stamp-h1 |
1135 | - @if test ! -f $@; then \ |
1136 | - rm -f stamp-h1; \ |
1137 | - $(MAKE) stamp-h1; \ |
1138 | - else :; fi |
1139 | + @if test ! -f $@; then rm -f stamp-h1; else :; fi |
1140 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
1141 | |
1142 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
1143 | @rm -f stamp-h1 |
1144 | cd $(top_builddir) && $(SHELL) ./config.status config.h |
1145 | $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
1146 | - cd $(top_srcdir) && $(AUTOHEADER) |
1147 | + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) |
1148 | rm -f stamp-h1 |
1149 | touch $@ |
1150 | |
1151 | @@ -322,8 +365,7 @@ |
1152 | -rm -rf .libs _libs |
1153 | |
1154 | distclean-libtool: |
1155 | - -rm -f libtool |
1156 | -uninstall-info-am: |
1157 | + -rm -f libtool config.lt |
1158 | |
1159 | # This directory's subdirectories are mostly independent; you can cd |
1160 | # into them and run `make' without going through this Makefile. |
1161 | @@ -332,7 +374,7 @@ |
1162 | # (which will cause the Makefiles to be regenerated when you run `make'); |
1163 | # (2) otherwise, pass the desired values on the `make' command line. |
1164 | $(RECURSIVE_TARGETS): |
1165 | - @failcom='exit 1'; \ |
1166 | + @fail= failcom='exit 1'; \ |
1167 | for f in x $$MAKEFLAGS; do \ |
1168 | case $$f in \ |
1169 | *=* | --[!k]*);; \ |
1170 | @@ -349,16 +391,15 @@ |
1171 | else \ |
1172 | local_target="$$target"; \ |
1173 | fi; \ |
1174 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
1175 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
1176 | || eval $$failcom; \ |
1177 | done; \ |
1178 | if test "$$dot_seen" = "no"; then \ |
1179 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
1180 | fi; test -z "$$fail" |
1181 | |
1182 | -mostlyclean-recursive clean-recursive distclean-recursive \ |
1183 | -maintainer-clean-recursive: |
1184 | - @failcom='exit 1'; \ |
1185 | +$(RECURSIVE_CLEAN_TARGETS): |
1186 | + @fail= failcom='exit 1'; \ |
1187 | for f in x $$MAKEFLAGS; do \ |
1188 | case $$f in \ |
1189 | *=* | --[!k]*);; \ |
1190 | @@ -384,16 +425,16 @@ |
1191 | else \ |
1192 | local_target="$$target"; \ |
1193 | fi; \ |
1194 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
1195 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
1196 | || eval $$failcom; \ |
1197 | done && test -z "$$fail" |
1198 | tags-recursive: |
1199 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
1200 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
1201 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
1202 | done |
1203 | ctags-recursive: |
1204 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
1205 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
1206 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
1207 | done |
1208 | |
1209 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
1210 | @@ -401,14 +442,14 @@ |
1211 | unique=`for i in $$list; do \ |
1212 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1213 | done | \ |
1214 | - $(AWK) ' { files[$$0] = 1; } \ |
1215 | - END { for (i in files) print i; }'`; \ |
1216 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1217 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1218 | mkid -fID $$unique |
1219 | tags: TAGS |
1220 | |
1221 | TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
1222 | $(TAGS_FILES) $(LISP) |
1223 | - tags=; \ |
1224 | + set x; \ |
1225 | here=`pwd`; \ |
1226 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
1227 | include_option=--etags-include; \ |
1228 | @@ -420,84 +461,100 @@ |
1229 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
1230 | if test "$$subdir" = .; then :; else \ |
1231 | test ! -f $$subdir/TAGS || \ |
1232 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ |
1233 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
1234 | fi; \ |
1235 | done; \ |
1236 | list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
1237 | unique=`for i in $$list; do \ |
1238 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1239 | done | \ |
1240 | - $(AWK) ' { files[$$0] = 1; } \ |
1241 | - END { for (i in files) print i; }'`; \ |
1242 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ |
1243 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1244 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1245 | + shift; \ |
1246 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
1247 | test -n "$$unique" || unique=$$empty_fix; \ |
1248 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
1249 | - $$tags $$unique; \ |
1250 | + if test $$# -gt 0; then \ |
1251 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
1252 | + "$$@" $$unique; \ |
1253 | + else \ |
1254 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
1255 | + $$unique; \ |
1256 | + fi; \ |
1257 | fi |
1258 | ctags: CTAGS |
1259 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
1260 | $(TAGS_FILES) $(LISP) |
1261 | - tags=; \ |
1262 | - here=`pwd`; \ |
1263 | list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
1264 | unique=`for i in $$list; do \ |
1265 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1266 | done | \ |
1267 | - $(AWK) ' { files[$$0] = 1; } \ |
1268 | - END { for (i in files) print i; }'`; \ |
1269 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ |
1270 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1271 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1272 | + test -z "$(CTAGS_ARGS)$$unique" \ |
1273 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
1274 | - $$tags $$unique |
1275 | + $$unique |
1276 | |
1277 | GTAGS: |
1278 | here=`$(am__cd) $(top_builddir) && pwd` \ |
1279 | - && cd $(top_srcdir) \ |
1280 | - && gtags -i $(GTAGS_ARGS) $$here |
1281 | + && $(am__cd) $(top_srcdir) \ |
1282 | + && gtags -i $(GTAGS_ARGS) "$$here" |
1283 | |
1284 | distclean-tags: |
1285 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
1286 | |
1287 | distdir: $(DISTFILES) |
1288 | $(am__remove_distdir) |
1289 | - mkdir $(distdir) |
1290 | - $(mkdir_p) $(distdir)/po |
1291 | - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ |
1292 | - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ |
1293 | - list='$(DISTFILES)'; for file in $$list; do \ |
1294 | - case $$file in \ |
1295 | - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ |
1296 | - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ |
1297 | - esac; \ |
1298 | + test -d "$(distdir)" || mkdir "$(distdir)" |
1299 | + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
1300 | + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
1301 | + list='$(DISTFILES)'; \ |
1302 | + dist_files=`for file in $$list; do echo $$file; done | \ |
1303 | + sed -e "s|^$$srcdirstrip/||;t" \ |
1304 | + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ |
1305 | + case $$dist_files in \ |
1306 | + */*) $(MKDIR_P) `echo "$$dist_files" | \ |
1307 | + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ |
1308 | + sort -u` ;; \ |
1309 | + esac; \ |
1310 | + for file in $$dist_files; do \ |
1311 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
1312 | - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ |
1313 | - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ |
1314 | - dir="/$$dir"; \ |
1315 | - $(mkdir_p) "$(distdir)$$dir"; \ |
1316 | - else \ |
1317 | - dir=''; \ |
1318 | - fi; \ |
1319 | if test -d $$d/$$file; then \ |
1320 | + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
1321 | + if test -d "$(distdir)/$$file"; then \ |
1322 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
1323 | + fi; \ |
1324 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
1325 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ |
1326 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ |
1327 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
1328 | fi; \ |
1329 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ |
1330 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ |
1331 | else \ |
1332 | - test -f $(distdir)/$$file \ |
1333 | - || cp -p $$d/$$file $(distdir)/$$file \ |
1334 | + test -f "$(distdir)/$$file" \ |
1335 | + || cp -p $$d/$$file "$(distdir)/$$file" \ |
1336 | || exit 1; \ |
1337 | fi; \ |
1338 | done |
1339 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
1340 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
1341 | if test "$$subdir" = .; then :; else \ |
1342 | - test -d "$(distdir)/$$subdir" \ |
1343 | - || $(mkdir_p) "$(distdir)/$$subdir" \ |
1344 | - || exit 1; \ |
1345 | - distdir=`$(am__cd) $(distdir) && pwd`; \ |
1346 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ |
1347 | - (cd $$subdir && \ |
1348 | + $(am__make_dryrun) \ |
1349 | + || test -d "$(distdir)/$$subdir" \ |
1350 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
1351 | + || exit 1; \ |
1352 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
1353 | + $(am__relativize); \ |
1354 | + new_distdir=$$reldir; \ |
1355 | + dir1=$$subdir; dir2="$(top_distdir)"; \ |
1356 | + $(am__relativize); \ |
1357 | + new_top_distdir=$$reldir; \ |
1358 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ |
1359 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ |
1360 | + ($(am__cd) $$subdir && \ |
1361 | $(MAKE) $(AM_MAKEFLAGS) \ |
1362 | - top_distdir="$$top_distdir" \ |
1363 | - distdir="$$distdir/$$subdir" \ |
1364 | + top_distdir="$$new_top_distdir" \ |
1365 | + distdir="$$new_distdir" \ |
1366 | + am__remove_distdir=: \ |
1367 | + am__skip_length_check=: \ |
1368 | + am__skip_mode_fix=: \ |
1369 | distdir) \ |
1370 | || exit 1; \ |
1371 | fi; \ |
1372 | @@ -505,16 +562,30 @@ |
1373 | $(MAKE) $(AM_MAKEFLAGS) \ |
1374 | top_distdir="$(top_distdir)" distdir="$(distdir)" \ |
1375 | dist-hook |
1376 | - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ |
1377 | + -test -n "$(am__skip_mode_fix)" \ |
1378 | + || find "$(distdir)" -type d ! -perm -755 \ |
1379 | + -exec chmod u+rwx,go+rx {} \; -o \ |
1380 | ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ |
1381 | ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ |
1382 | - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ |
1383 | - || chmod -R a+r $(distdir) |
1384 | + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
1385 | + || chmod -R a+r "$(distdir)" |
1386 | dist-gzip: distdir |
1387 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
1388 | $(am__remove_distdir) |
1389 | dist-bzip2: distdir |
1390 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
1391 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
1392 | + $(am__remove_distdir) |
1393 | + |
1394 | +dist-lzip: distdir |
1395 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
1396 | + $(am__remove_distdir) |
1397 | + |
1398 | +dist-lzma: distdir |
1399 | + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
1400 | + $(am__remove_distdir) |
1401 | + |
1402 | +dist-xz: distdir |
1403 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
1404 | $(am__remove_distdir) |
1405 | |
1406 | dist-tarZ: distdir |
1407 | @@ -532,7 +603,7 @@ |
1408 | |
1409 | dist dist-all: distdir |
1410 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
1411 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
1412 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
1413 | $(am__remove_distdir) |
1414 | |
1415 | # This target untars the dist file and tries a VPATH configuration. Then |
1416 | @@ -541,24 +612,33 @@ |
1417 | distcheck: dist |
1418 | case '$(DIST_ARCHIVES)' in \ |
1419 | *.tar.gz*) \ |
1420 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ |
1421 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
1422 | *.tar.bz2*) \ |
1423 | - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ |
1424 | + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
1425 | + *.tar.lzma*) \ |
1426 | + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
1427 | + *.tar.lz*) \ |
1428 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
1429 | + *.tar.xz*) \ |
1430 | + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
1431 | *.tar.Z*) \ |
1432 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
1433 | *.shar.gz*) \ |
1434 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ |
1435 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ |
1436 | *.zip*) \ |
1437 | unzip $(distdir).zip ;;\ |
1438 | esac |
1439 | - chmod -R a-w $(distdir); chmod a+w $(distdir) |
1440 | + chmod -R a-w $(distdir); chmod u+w $(distdir) |
1441 | mkdir $(distdir)/_build |
1442 | mkdir $(distdir)/_inst |
1443 | chmod a-w $(distdir) |
1444 | + test -d $(distdir)/_build || exit 0; \ |
1445 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
1446 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
1447 | - && cd $(distdir)/_build \ |
1448 | + && am__cwd=`pwd` \ |
1449 | + && $(am__cd) $(distdir)/_build \ |
1450 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
1451 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
1452 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
1453 | && $(MAKE) $(AM_MAKEFLAGS) \ |
1454 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
1455 | @@ -579,14 +659,24 @@ |
1456 | && rm -rf "$$dc_destdir" \ |
1457 | && $(MAKE) $(AM_MAKEFLAGS) dist \ |
1458 | && rm -rf $(DIST_ARCHIVES) \ |
1459 | - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck |
1460 | + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
1461 | + && cd "$$am__cwd" \ |
1462 | + || exit 1 |
1463 | $(am__remove_distdir) |
1464 | @(echo "$(distdir) archives ready for distribution: "; \ |
1465 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
1466 | - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' |
1467 | + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
1468 | distuninstallcheck: |
1469 | - @cd $(distuninstallcheck_dir) \ |
1470 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
1471 | + @test -n '$(distuninstallcheck_dir)' || { \ |
1472 | + echo 'ERROR: trying to run $@ with an empty' \ |
1473 | + '$$(distuninstallcheck_dir)' >&2; \ |
1474 | + exit 1; \ |
1475 | + }; \ |
1476 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
1477 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
1478 | + exit 1; \ |
1479 | + }; \ |
1480 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
1481 | || { echo "ERROR: files left after uninstall:" ; \ |
1482 | if test -n "$(DESTDIR)"; then \ |
1483 | echo " (check DESTDIR support)"; \ |
1484 | @@ -617,16 +707,22 @@ |
1485 | |
1486 | installcheck: installcheck-recursive |
1487 | install-strip: |
1488 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1489 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1490 | - `test -z '$(STRIP)' || \ |
1491 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1492 | + if test -z '$(STRIP)'; then \ |
1493 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1494 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1495 | + install; \ |
1496 | + else \ |
1497 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1498 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1499 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1500 | + fi |
1501 | mostlyclean-generic: |
1502 | |
1503 | clean-generic: |
1504 | |
1505 | distclean-generic: |
1506 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
1507 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
1508 | -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) |
1509 | |
1510 | maintainer-clean-generic: |
1511 | @@ -648,18 +744,38 @@ |
1512 | |
1513 | html: html-recursive |
1514 | |
1515 | +html-am: |
1516 | + |
1517 | info: info-recursive |
1518 | |
1519 | info-am: |
1520 | |
1521 | install-data-am: |
1522 | |
1523 | +install-dvi: install-dvi-recursive |
1524 | + |
1525 | +install-dvi-am: |
1526 | + |
1527 | install-exec-am: |
1528 | |
1529 | +install-html: install-html-recursive |
1530 | + |
1531 | +install-html-am: |
1532 | + |
1533 | install-info: install-info-recursive |
1534 | |
1535 | +install-info-am: |
1536 | + |
1537 | install-man: |
1538 | |
1539 | +install-pdf: install-pdf-recursive |
1540 | + |
1541 | +install-pdf-am: |
1542 | + |
1543 | +install-ps: install-ps-recursive |
1544 | + |
1545 | +install-ps-am: |
1546 | + |
1547 | installcheck-am: |
1548 | |
1549 | maintainer-clean: maintainer-clean-recursive |
1550 | @@ -680,25 +796,27 @@ |
1551 | |
1552 | ps-am: |
1553 | |
1554 | -uninstall-am: uninstall-info-am |
1555 | - |
1556 | -uninstall-info: uninstall-info-recursive |
1557 | - |
1558 | -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ |
1559 | - check-am clean clean-generic clean-libtool clean-recursive \ |
1560 | - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ |
1561 | - dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ |
1562 | - distclean-generic distclean-hdr distclean-libtool \ |
1563 | - distclean-local distclean-recursive distclean-tags \ |
1564 | +uninstall-am: |
1565 | + |
1566 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
1567 | + ctags-recursive install-am install-strip tags-recursive |
1568 | + |
1569 | +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
1570 | + all all-am am--refresh check check-am clean clean-generic \ |
1571 | + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
1572 | + dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ |
1573 | + dist-xz dist-zip distcheck distclean distclean-generic \ |
1574 | + distclean-hdr distclean-libtool distclean-local distclean-tags \ |
1575 | distcleancheck distdir distuninstallcheck dvi dvi-am html \ |
1576 | html-am info info-am install install-am install-data \ |
1577 | - install-data-am install-exec install-exec-am install-info \ |
1578 | - install-info-am install-man install-strip installcheck \ |
1579 | + install-data-am install-dvi install-dvi-am install-exec \ |
1580 | + install-exec-am install-html install-html-am install-info \ |
1581 | + install-info-am install-man install-pdf install-pdf-am \ |
1582 | + install-ps install-ps-am install-strip installcheck \ |
1583 | installcheck-am installdirs installdirs-am maintainer-clean \ |
1584 | - maintainer-clean-generic maintainer-clean-recursive \ |
1585 | - mostlyclean mostlyclean-generic mostlyclean-libtool \ |
1586 | - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ |
1587 | - uninstall uninstall-am uninstall-info-am |
1588 | + maintainer-clean-generic mostlyclean mostlyclean-generic \ |
1589 | + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
1590 | + uninstall uninstall-am |
1591 | |
1592 | |
1593 | distclean-local: |
1594 | @@ -718,6 +836,7 @@ |
1595 | dist-hook: ChangeLog |
1596 | |
1597 | # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: |
1598 | + |
1599 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
1600 | # Otherwise a system limit (for SysV at least) may be exceeded. |
1601 | .NOEXPORT: |
1602 | |
1603 | === modified file 'NEWS' |
1604 | --- NEWS 2012-06-30 15:21:33 +0000 |
1605 | +++ NEWS 2015-03-03 21:10:41 +0000 |
1606 | @@ -1,4 +1,14 @@ |
1607 | +2.5.5 (2015/3/3): |
1608 | +----------------- |
1609 | +* Use the new GtkTooltip API |
1610 | +* Fix a memory leak in the FreeBSD codepath (#11153) |
1611 | +* Add support for FreeBSD (bug #10350) |
1612 | +* New translations: th, ms, bg, oc, hr, en_AU, sr |
1613 | +* Updated translations: ar, ast, bg, cs, de, es, fr, it, |
1614 | + hr, hu. ko, nb, nl, ug, pl, sv, tr, zh_CN, zh_TW |
1615 | + |
1616 | 2.5.4 (2012/6/30): |
1617 | +----------------- |
1618 | * Better compliance with panel plugin HIG |
1619 | * Use double values for progress bars (bug #8882) |
1620 | * Facilitate bringing up the configuration dialog (bug #8899) |
1621 | |
1622 | === modified file 'aclocal.m4' |
1623 | --- aclocal.m4 2012-06-30 15:21:33 +0000 |
1624 | +++ aclocal.m4 2015-03-03 21:10:41 +0000 |
1625 | @@ -1,7 +1,8 @@ |
1626 | -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- |
1627 | +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- |
1628 | |
1629 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
1630 | -# 2005 Free Software Foundation, Inc. |
1631 | +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
1632 | +# Inc. |
1633 | # This file is free software; the Free Software Foundation |
1634 | # gives unlimited permission to copy and/or distribute it, |
1635 | # with or without modifications, as long as this notice is preserved. |
1636 | @@ -11,6 +12,14 @@ |
1637 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1638 | # PARTICULAR PURPOSE. |
1639 | |
1640 | +m4_ifndef([AC_AUTOCONF_VERSION], |
1641 | + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1642 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, |
1643 | +[m4_warning([this file was generated for autoconf 2.63. |
1644 | +You have another version of autoconf. It may work, but is not guaranteed to. |
1645 | +If you have problems, you may need to regenerate the build system entirely. |
1646 | +To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
1647 | + |
1648 | # Copyright (C) 1995-2002 Free Software Foundation, Inc. |
1649 | # Copyright (C) 2001-2003,2004 Red Hat, Inc. |
1650 | # |
1651 | @@ -328,7 +337,6 @@ |
1652 | dnl |
1653 | glib_DEFUN([GLIB_GNU_GETTEXT], |
1654 | [AC_REQUIRE([AC_PROG_CC])dnl |
1655 | - AC_REQUIRE([AC_HEADER_STDC])dnl |
1656 | |
1657 | GLIB_LC_MESSAGES |
1658 | GLIB_WITH_NLS |
1659 | @@ -9254,7 +9262,7 @@ |
1660 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) |
1661 | |
1662 | # nls.m4 serial 5 (gettext-0.18) |
1663 | -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, |
1664 | +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, |
1665 | dnl Inc. |
1666 | dnl This file is free software; the Free Software Foundation |
1667 | dnl gives unlimited permission to copy and/or distribute it, |
1668 | @@ -9287,6 +9295,7 @@ |
1669 | ]) |
1670 | |
1671 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
1672 | +# serial 1 (pkg-config-0.24) |
1673 | # |
1674 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
1675 | # |
1676 | @@ -9313,8 +9322,12 @@ |
1677 | # ---------------------------------- |
1678 | AC_DEFUN([PKG_PROG_PKG_CONFIG], |
1679 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
1680 | -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
1681 | -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl |
1682 | +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) |
1683 | +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) |
1684 | +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
1685 | +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
1686 | +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
1687 | + |
1688 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
1689 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
1690 | fi |
1691 | @@ -9327,7 +9340,6 @@ |
1692 | AC_MSG_RESULT([no]) |
1693 | PKG_CONFIG="" |
1694 | fi |
1695 | - |
1696 | fi[]dnl |
1697 | ])# PKG_PROG_PKG_CONFIG |
1698 | |
1699 | @@ -9336,34 +9348,32 @@ |
1700 | # Check to see whether a particular set of modules exists. Similar |
1701 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. |
1702 | # |
1703 | -# |
1704 | -# Similar to PKG_CHECK_MODULES, make sure that the first instance of |
1705 | -# this or PKG_CHECK_MODULES is called, or make sure to call |
1706 | -# PKG_CHECK_EXISTS manually |
1707 | +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
1708 | +# only at the first occurence in configure.ac, so if the first place |
1709 | +# it's called might be skipped (such as if it is within an "if", you |
1710 | +# have to call PKG_CHECK_EXISTS manually |
1711 | # -------------------------------------------------------------- |
1712 | AC_DEFUN([PKG_CHECK_EXISTS], |
1713 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
1714 | if test -n "$PKG_CONFIG" && \ |
1715 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
1716 | - m4_ifval([$2], [$2], [:]) |
1717 | + m4_default([$2], [:]) |
1718 | m4_ifvaln([$3], [else |
1719 | $3])dnl |
1720 | fi]) |
1721 | |
1722 | - |
1723 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
1724 | # --------------------------------------------- |
1725 | m4_define([_PKG_CONFIG], |
1726 | -[if test -n "$PKG_CONFIG"; then |
1727 | - if test -n "$$1"; then |
1728 | - pkg_cv_[]$1="$$1" |
1729 | - else |
1730 | - PKG_CHECK_EXISTS([$3], |
1731 | - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
1732 | - [pkg_failed=yes]) |
1733 | - fi |
1734 | -else |
1735 | - pkg_failed=untried |
1736 | +[if test -n "$$1"; then |
1737 | + pkg_cv_[]$1="$$1" |
1738 | + elif test -n "$PKG_CONFIG"; then |
1739 | + PKG_CHECK_EXISTS([$3], |
1740 | + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` |
1741 | + test "x$?" != "x0" && pkg_failed=yes ], |
1742 | + [pkg_failed=yes]) |
1743 | + else |
1744 | + pkg_failed=untried |
1745 | fi[]dnl |
1746 | ])# _PKG_CONFIG |
1747 | |
1748 | @@ -9405,16 +9415,17 @@ |
1749 | See the pkg-config man page for more details.]) |
1750 | |
1751 | if test $pkg_failed = yes; then |
1752 | + AC_MSG_RESULT([no]) |
1753 | _PKG_SHORT_ERRORS_SUPPORTED |
1754 | if test $_pkg_short_errors_supported = yes; then |
1755 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` |
1756 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` |
1757 | else |
1758 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` |
1759 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` |
1760 | fi |
1761 | # Put the nasty error message in config.log where it belongs |
1762 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
1763 | |
1764 | - ifelse([$4], , [AC_MSG_ERROR(dnl |
1765 | + m4_default([$4], [AC_MSG_ERROR( |
1766 | [Package requirements ($2) were not met: |
1767 | |
1768 | $$1_PKG_ERRORS |
1769 | @@ -9422,55 +9433,116 @@ |
1770 | Consider adjusting the PKG_CONFIG_PATH environment variable if you |
1771 | installed software in a non-standard prefix. |
1772 | |
1773 | -_PKG_TEXT |
1774 | -])], |
1775 | - [AC_MSG_RESULT([no]) |
1776 | - $4]) |
1777 | +_PKG_TEXT])[]dnl |
1778 | + ]) |
1779 | elif test $pkg_failed = untried; then |
1780 | - ifelse([$4], , [AC_MSG_FAILURE(dnl |
1781 | + AC_MSG_RESULT([no]) |
1782 | + m4_default([$4], [AC_MSG_FAILURE( |
1783 | [The pkg-config script could not be found or is too old. Make sure it |
1784 | is in your PATH or set the PKG_CONFIG environment variable to the full |
1785 | path to pkg-config. |
1786 | |
1787 | _PKG_TEXT |
1788 | |
1789 | -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], |
1790 | - [$4]) |
1791 | +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl |
1792 | + ]) |
1793 | else |
1794 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
1795 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
1796 | AC_MSG_RESULT([yes]) |
1797 | - ifelse([$3], , :, [$3]) |
1798 | + $3 |
1799 | fi[]dnl |
1800 | ])# PKG_CHECK_MODULES |
1801 | |
1802 | -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. |
1803 | + |
1804 | +# PKG_INSTALLDIR(DIRECTORY) |
1805 | +# ------------------------- |
1806 | +# Substitutes the variable pkgconfigdir as the location where a module |
1807 | +# should install pkg-config .pc files. By default the directory is |
1808 | +# $libdir/pkgconfig, but the default can be changed by passing |
1809 | +# DIRECTORY. The user can override through the --with-pkgconfigdir |
1810 | +# parameter. |
1811 | +AC_DEFUN([PKG_INSTALLDIR], |
1812 | +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) |
1813 | +m4_pushdef([pkg_description], |
1814 | + [pkg-config installation directory @<:@]pkg_default[@:>@]) |
1815 | +AC_ARG_WITH([pkgconfigdir], |
1816 | + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, |
1817 | + [with_pkgconfigdir=]pkg_default) |
1818 | +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) |
1819 | +m4_popdef([pkg_default]) |
1820 | +m4_popdef([pkg_description]) |
1821 | +]) dnl PKG_INSTALLDIR |
1822 | + |
1823 | + |
1824 | +# PKG_NOARCH_INSTALLDIR(DIRECTORY) |
1825 | +# ------------------------- |
1826 | +# Substitutes the variable noarch_pkgconfigdir as the location where a |
1827 | +# module should install arch-independent pkg-config .pc files. By |
1828 | +# default the directory is $datadir/pkgconfig, but the default can be |
1829 | +# changed by passing DIRECTORY. The user can override through the |
1830 | +# --with-noarch-pkgconfigdir parameter. |
1831 | +AC_DEFUN([PKG_NOARCH_INSTALLDIR], |
1832 | +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) |
1833 | +m4_pushdef([pkg_description], |
1834 | + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) |
1835 | +AC_ARG_WITH([noarch-pkgconfigdir], |
1836 | + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, |
1837 | + [with_noarch_pkgconfigdir=]pkg_default) |
1838 | +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) |
1839 | +m4_popdef([pkg_default]) |
1840 | +m4_popdef([pkg_description]) |
1841 | +]) dnl PKG_NOARCH_INSTALLDIR |
1842 | + |
1843 | +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
1844 | +# Foundation, Inc. |
1845 | # |
1846 | # This file is free software; the Free Software Foundation |
1847 | # gives unlimited permission to copy and/or distribute it, |
1848 | # with or without modifications, as long as this notice is preserved. |
1849 | |
1850 | +# serial 1 |
1851 | + |
1852 | # AM_AUTOMAKE_VERSION(VERSION) |
1853 | # ---------------------------- |
1854 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
1855 | # generated from the m4 files accompanying Automake X.Y. |
1856 | -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) |
1857 | +# (This private macro should not be called outside this file.) |
1858 | +AC_DEFUN([AM_AUTOMAKE_VERSION], |
1859 | +[am__api_version='1.11' |
1860 | +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
1861 | +dnl require some minimum version. Point them to the right macro. |
1862 | +m4_if([$1], [1.11.6], [], |
1863 | + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
1864 | +]) |
1865 | + |
1866 | +# _AM_AUTOCONF_VERSION(VERSION) |
1867 | +# ----------------------------- |
1868 | +# aclocal traces this macro to find the Autoconf version. |
1869 | +# This is a private macro too. Using m4_define simplifies |
1870 | +# the logic in aclocal, which can simply ignore this definition. |
1871 | +m4_define([_AM_AUTOCONF_VERSION], []) |
1872 | |
1873 | # AM_SET_CURRENT_AUTOMAKE_VERSION |
1874 | # ------------------------------- |
1875 | -# Call AM_AUTOMAKE_VERSION so it can be traced. |
1876 | -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. |
1877 | +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
1878 | +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
1879 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
1880 | - [AM_AUTOMAKE_VERSION([1.9.6])]) |
1881 | +[AM_AUTOMAKE_VERSION([1.11.6])dnl |
1882 | +m4_ifndef([AC_AUTOCONF_VERSION], |
1883 | + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1884 | +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
1885 | |
1886 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
1887 | |
1888 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
1889 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
1890 | # |
1891 | # This file is free software; the Free Software Foundation |
1892 | # gives unlimited permission to copy and/or distribute it, |
1893 | # with or without modifications, as long as this notice is preserved. |
1894 | |
1895 | +# serial 1 |
1896 | + |
1897 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
1898 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
1899 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
1900 | @@ -9518,14 +9590,14 @@ |
1901 | |
1902 | # AM_CONDITIONAL -*- Autoconf -*- |
1903 | |
1904 | -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 |
1905 | +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 |
1906 | # Free Software Foundation, Inc. |
1907 | # |
1908 | # This file is free software; the Free Software Foundation |
1909 | # gives unlimited permission to copy and/or distribute it, |
1910 | # with or without modifications, as long as this notice is preserved. |
1911 | |
1912 | -# serial 7 |
1913 | +# serial 9 |
1914 | |
1915 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
1916 | # ------------------------------------- |
1917 | @@ -9534,8 +9606,11 @@ |
1918 | [AC_PREREQ(2.52)dnl |
1919 | ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
1920 | [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
1921 | -AC_SUBST([$1_TRUE]) |
1922 | -AC_SUBST([$1_FALSE]) |
1923 | +AC_SUBST([$1_TRUE])dnl |
1924 | +AC_SUBST([$1_FALSE])dnl |
1925 | +_AM_SUBST_NOTMAKE([$1_TRUE])dnl |
1926 | +_AM_SUBST_NOTMAKE([$1_FALSE])dnl |
1927 | +m4_define([_AM_COND_VALUE_$1], [$2])dnl |
1928 | if $2; then |
1929 | $1_TRUE= |
1930 | $1_FALSE='#' |
1931 | @@ -9549,15 +9624,14 @@ |
1932 | Usually this means the macro was only invoked conditionally.]]) |
1933 | fi])]) |
1934 | |
1935 | - |
1936 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
1937 | -# Free Software Foundation, Inc. |
1938 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
1939 | +# 2010, 2011 Free Software Foundation, Inc. |
1940 | # |
1941 | # This file is free software; the Free Software Foundation |
1942 | # gives unlimited permission to copy and/or distribute it, |
1943 | # with or without modifications, as long as this notice is preserved. |
1944 | |
1945 | -# serial 8 |
1946 | +# serial 12 |
1947 | |
1948 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
1949 | # written in clear, in which case automake, when reading aclocal.m4, |
1950 | @@ -9585,6 +9659,7 @@ |
1951 | ifelse([$1], CC, [depcc="$CC" am_compiler_list=], |
1952 | [$1], CXX, [depcc="$CXX" am_compiler_list=], |
1953 | [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
1954 | + [$1], UPC, [depcc="$UPC" am_compiler_list=], |
1955 | [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
1956 | [depcc="$$1" am_compiler_list=]) |
1957 | |
1958 | @@ -9596,6 +9671,7 @@ |
1959 | # instance it was reported that on HP-UX the gcc test will end up |
1960 | # making a dummy file named `D' -- because `-MD' means `put the output |
1961 | # in D'. |
1962 | + rm -rf conftest.dir |
1963 | mkdir conftest.dir |
1964 | # Copy depcomp to subdir because otherwise we won't find it if we're |
1965 | # using a relative directory. |
1966 | @@ -9613,6 +9689,16 @@ |
1967 | if test "$am_compiler_list" = ""; then |
1968 | am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` |
1969 | fi |
1970 | + am__universal=false |
1971 | + m4_case([$1], [CC], |
1972 | + [case " $depcc " in #( |
1973 | + *\ -arch\ *\ -arch\ *) am__universal=true ;; |
1974 | + esac], |
1975 | + [CXX], |
1976 | + [case " $depcc " in #( |
1977 | + *\ -arch\ *\ -arch\ *) am__universal=true ;; |
1978 | + esac]) |
1979 | + |
1980 | for depmode in $am_compiler_list; do |
1981 | # Setup a source with many dependencies, because some compilers |
1982 | # like to wrap large dependency lists on column 80 (with \), and |
1983 | @@ -9630,7 +9716,17 @@ |
1984 | done |
1985 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
1986 | |
1987 | + # We check with `-c' and `-o' for the sake of the "dashmstdout" |
1988 | + # mode. It turns out that the SunPro C++ compiler does not properly |
1989 | + # handle `-M -o', and we need to detect this. Also, some Intel |
1990 | + # versions had trouble with output in subdirs |
1991 | + am__obj=sub/conftest.${OBJEXT-o} |
1992 | + am__minus_obj="-o $am__obj" |
1993 | case $depmode in |
1994 | + gcc) |
1995 | + # This depmode causes a compiler race in universal mode. |
1996 | + test "$am__universal" = false || continue |
1997 | + ;; |
1998 | nosideeffect) |
1999 | # after this tag, mechanisms are not by side-effect, so they'll |
2000 | # only be used when explicitly requested |
2001 | @@ -9640,18 +9736,23 @@ |
2002 | break |
2003 | fi |
2004 | ;; |
2005 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2006 | + # This compiler won't grok `-c -o', but also, the minuso test has |
2007 | + # not run yet. These depmodes are late enough in the game, and |
2008 | + # so weak that their functioning should not be impacted. |
2009 | + am__obj=conftest.${OBJEXT-o} |
2010 | + am__minus_obj= |
2011 | + ;; |
2012 | none) break ;; |
2013 | esac |
2014 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
2015 | - # mode. It turns out that the SunPro C++ compiler does not properly |
2016 | - # handle `-M -o', and we need to detect this. |
2017 | if depmode=$depmode \ |
2018 | - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ |
2019 | + source=sub/conftest.c object=$am__obj \ |
2020 | depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
2021 | - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ |
2022 | + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ |
2023 | >/dev/null 2>conftest.err && |
2024 | + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
2025 | grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
2026 | - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && |
2027 | + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && |
2028 | ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
2029 | # icc doesn't choke on unknown options, it will just issue warnings |
2030 | # or remarks (even with -Werror). So we grep stderr for any message |
2031 | @@ -9700,63 +9801,79 @@ |
2032 | if test "x$enable_dependency_tracking" != xno; then |
2033 | am_depcomp="$ac_aux_dir/depcomp" |
2034 | AMDEPBACKSLASH='\' |
2035 | + am__nodep='_no' |
2036 | fi |
2037 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
2038 | -AC_SUBST([AMDEPBACKSLASH]) |
2039 | +AC_SUBST([AMDEPBACKSLASH])dnl |
2040 | +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
2041 | +AC_SUBST([am__nodep])dnl |
2042 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
2043 | ]) |
2044 | |
2045 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
2046 | |
2047 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
2048 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
2049 | # Free Software Foundation, Inc. |
2050 | # |
2051 | # This file is free software; the Free Software Foundation |
2052 | # gives unlimited permission to copy and/or distribute it, |
2053 | # with or without modifications, as long as this notice is preserved. |
2054 | |
2055 | -#serial 3 |
2056 | +#serial 5 |
2057 | |
2058 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
2059 | # ------------------------------ |
2060 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
2061 | -[for mf in $CONFIG_FILES; do |
2062 | - # Strip MF so we end up with the name of the file. |
2063 | - mf=`echo "$mf" | sed -e 's/:.*$//'` |
2064 | - # Check whether this is an Automake generated Makefile or not. |
2065 | - # We used to match only the files named `Makefile.in', but |
2066 | - # some people rename them; so instead we look at the file content. |
2067 | - # Grep'ing the first line is not enough: some people post-process |
2068 | - # each Makefile.in and add a new line on top of each file to say so. |
2069 | - # So let's grep whole file. |
2070 | - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then |
2071 | - dirpart=`AS_DIRNAME("$mf")` |
2072 | - else |
2073 | - continue |
2074 | - fi |
2075 | - # Extract the definition of DEPDIR, am__include, and am__quote |
2076 | - # from the Makefile without running `make'. |
2077 | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
2078 | - test -z "$DEPDIR" && continue |
2079 | - am__include=`sed -n 's/^am__include = //p' < "$mf"` |
2080 | - test -z "am__include" && continue |
2081 | - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
2082 | - # When using ansi2knr, U may be empty or an underscore; expand it |
2083 | - U=`sed -n 's/^U = //p' < "$mf"` |
2084 | - # Find all dependency output files, they are included files with |
2085 | - # $(DEPDIR) in their names. We invoke sed twice because it is the |
2086 | - # simplest approach to changing $(DEPDIR) to its actual value in the |
2087 | - # expansion. |
2088 | - for file in `sed -n " |
2089 | - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
2090 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
2091 | - # Make sure the directory exists. |
2092 | - test -f "$dirpart/$file" && continue |
2093 | - fdir=`AS_DIRNAME(["$file"])` |
2094 | - AS_MKDIR_P([$dirpart/$fdir]) |
2095 | - # echo "creating $dirpart/$file" |
2096 | - echo '# dummy' > "$dirpart/$file" |
2097 | +[{ |
2098 | + # Autoconf 2.62 quotes --file arguments for eval, but not when files |
2099 | + # are listed without --file. Let's play safe and only enable the eval |
2100 | + # if we detect the quoting. |
2101 | + case $CONFIG_FILES in |
2102 | + *\'*) eval set x "$CONFIG_FILES" ;; |
2103 | + *) set x $CONFIG_FILES ;; |
2104 | + esac |
2105 | + shift |
2106 | + for mf |
2107 | + do |
2108 | + # Strip MF so we end up with the name of the file. |
2109 | + mf=`echo "$mf" | sed -e 's/:.*$//'` |
2110 | + # Check whether this is an Automake generated Makefile or not. |
2111 | + # We used to match only the files named `Makefile.in', but |
2112 | + # some people rename them; so instead we look at the file content. |
2113 | + # Grep'ing the first line is not enough: some people post-process |
2114 | + # each Makefile.in and add a new line on top of each file to say so. |
2115 | + # Grep'ing the whole file is not good either: AIX grep has a line |
2116 | + # limit of 2048, but all sed's we know have understand at least 4000. |
2117 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
2118 | + dirpart=`AS_DIRNAME("$mf")` |
2119 | + else |
2120 | + continue |
2121 | + fi |
2122 | + # Extract the definition of DEPDIR, am__include, and am__quote |
2123 | + # from the Makefile without running `make'. |
2124 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
2125 | + test -z "$DEPDIR" && continue |
2126 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` |
2127 | + test -z "am__include" && continue |
2128 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
2129 | + # When using ansi2knr, U may be empty or an underscore; expand it |
2130 | + U=`sed -n 's/^U = //p' < "$mf"` |
2131 | + # Find all dependency output files, they are included files with |
2132 | + # $(DEPDIR) in their names. We invoke sed twice because it is the |
2133 | + # simplest approach to changing $(DEPDIR) to its actual value in the |
2134 | + # expansion. |
2135 | + for file in `sed -n " |
2136 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
2137 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
2138 | + # Make sure the directory exists. |
2139 | + test -f "$dirpart/$file" && continue |
2140 | + fdir=`AS_DIRNAME(["$file"])` |
2141 | + AS_MKDIR_P([$dirpart/$fdir]) |
2142 | + # echo "creating $dirpart/$file" |
2143 | + echo '# dummy' > "$dirpart/$file" |
2144 | + done |
2145 | done |
2146 | -done |
2147 | +} |
2148 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS |
2149 | |
2150 | |
2151 | @@ -9787,14 +9904,14 @@ |
2152 | |
2153 | # Do all the work for Automake. -*- Autoconf -*- |
2154 | |
2155 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
2156 | -# Free Software Foundation, Inc. |
2157 | +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
2158 | +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. |
2159 | # |
2160 | # This file is free software; the Free Software Foundation |
2161 | # gives unlimited permission to copy and/or distribute it, |
2162 | # with or without modifications, as long as this notice is preserved. |
2163 | |
2164 | -# serial 12 |
2165 | +# serial 16 |
2166 | |
2167 | # This macro actually does too much. Some checks are only needed if |
2168 | # your package does certain things. But this isn't really a big deal. |
2169 | @@ -9811,16 +9928,20 @@ |
2170 | # arguments mandatory, and then we can depend on a new Autoconf |
2171 | # release and drop the old call support. |
2172 | AC_DEFUN([AM_INIT_AUTOMAKE], |
2173 | -[AC_PREREQ([2.58])dnl |
2174 | +[AC_PREREQ([2.62])dnl |
2175 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
2176 | dnl the ones we care about. |
2177 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
2178 | AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl |
2179 | AC_REQUIRE([AC_PROG_INSTALL])dnl |
2180 | -# test to see if srcdir already configured |
2181 | -if test "`cd $srcdir && pwd`" != "`pwd`" && |
2182 | - test -f $srcdir/config.status; then |
2183 | - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) |
2184 | +if test "`cd $srcdir && pwd`" != "`pwd`"; then |
2185 | + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output |
2186 | + # is not polluted with repeated "-I." |
2187 | + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl |
2188 | + # test to see if srcdir already configured |
2189 | + if test -f $srcdir/config.status; then |
2190 | + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) |
2191 | + fi |
2192 | fi |
2193 | |
2194 | # test whether we have cygpath |
2195 | @@ -9840,6 +9961,9 @@ |
2196 | AC_SUBST([PACKAGE], [$1])dnl |
2197 | AC_SUBST([VERSION], [$2])], |
2198 | [_AM_SET_OPTIONS([$1])dnl |
2199 | +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
2200 | +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, |
2201 | + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
2202 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
2203 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
2204 | |
2205 | @@ -9855,8 +9979,8 @@ |
2206 | AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) |
2207 | AM_MISSING_PROG(AUTOHEADER, autoheader) |
2208 | AM_MISSING_PROG(MAKEINFO, makeinfo) |
2209 | -AM_PROG_INSTALL_SH |
2210 | -AM_PROG_INSTALL_STRIP |
2211 | +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
2212 | +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
2213 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl |
2214 | # We need awk for the "check" target. The system "awk" is bad on |
2215 | # some platforms. |
2216 | @@ -9864,19 +9988,36 @@ |
2217 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
2218 | AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
2219 | _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], |
2220 | - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], |
2221 | - [_AM_PROG_TAR([v7])])]) |
2222 | + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], |
2223 | + [_AM_PROG_TAR([v7])])]) |
2224 | _AM_IF_OPTION([no-dependencies],, |
2225 | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
2226 | - [_AM_DEPENDENCIES(CC)], |
2227 | - [define([AC_PROG_CC], |
2228 | - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl |
2229 | + [_AM_DEPENDENCIES(CC)], |
2230 | + [define([AC_PROG_CC], |
2231 | + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl |
2232 | AC_PROVIDE_IFELSE([AC_PROG_CXX], |
2233 | - [_AM_DEPENDENCIES(CXX)], |
2234 | - [define([AC_PROG_CXX], |
2235 | - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
2236 | -]) |
2237 | -]) |
2238 | + [_AM_DEPENDENCIES(CXX)], |
2239 | + [define([AC_PROG_CXX], |
2240 | + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
2241 | +AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
2242 | + [_AM_DEPENDENCIES(OBJC)], |
2243 | + [define([AC_PROG_OBJC], |
2244 | + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl |
2245 | +]) |
2246 | +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
2247 | +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the |
2248 | +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
2249 | +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
2250 | +AC_CONFIG_COMMANDS_PRE(dnl |
2251 | +[m4_provide_if([_AM_COMPILER_EXEEXT], |
2252 | + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
2253 | +]) |
2254 | + |
2255 | +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
2256 | +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
2257 | +dnl mangled by Autoconf and run in a shell conditional statement. |
2258 | +m4_define([_AC_COMPILER_EXEEXT], |
2259 | +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
2260 | |
2261 | |
2262 | # When config.status generates a header, we must update the stamp-h file. |
2263 | @@ -9888,29 +10029,40 @@ |
2264 | # our stamp files there. |
2265 | AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], |
2266 | [# Compute $1's index in $config_headers. |
2267 | +_am_arg=$1 |
2268 | _am_stamp_count=1 |
2269 | for _am_header in $config_headers :; do |
2270 | case $_am_header in |
2271 | - $1 | $1:* ) |
2272 | + $_am_arg | $_am_arg:* ) |
2273 | break ;; |
2274 | * ) |
2275 | _am_stamp_count=`expr $_am_stamp_count + 1` ;; |
2276 | esac |
2277 | done |
2278 | -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) |
2279 | +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
2280 | |
2281 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
2282 | +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
2283 | +# Inc. |
2284 | # |
2285 | # This file is free software; the Free Software Foundation |
2286 | # gives unlimited permission to copy and/or distribute it, |
2287 | # with or without modifications, as long as this notice is preserved. |
2288 | |
2289 | +# serial 1 |
2290 | + |
2291 | # AM_PROG_INSTALL_SH |
2292 | # ------------------ |
2293 | # Define $install_sh. |
2294 | AC_DEFUN([AM_PROG_INSTALL_SH], |
2295 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
2296 | -install_sh=${install_sh-"$am_aux_dir/install-sh"} |
2297 | +if test x"${install_sh}" != xset; then |
2298 | + case $am_aux_dir in |
2299 | + *\ * | *\ *) |
2300 | + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; |
2301 | + *) |
2302 | + install_sh="\${SHELL} $am_aux_dir/install-sh" |
2303 | + esac |
2304 | +fi |
2305 | AC_SUBST(install_sh)]) |
2306 | |
2307 | # Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
2308 | @@ -9937,27 +10089,38 @@ |
2309 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
2310 | # From Jim Meyering |
2311 | |
2312 | -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 |
2313 | -# Free Software Foundation, Inc. |
2314 | +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, |
2315 | +# 2011 Free Software Foundation, Inc. |
2316 | # |
2317 | # This file is free software; the Free Software Foundation |
2318 | # gives unlimited permission to copy and/or distribute it, |
2319 | # with or without modifications, as long as this notice is preserved. |
2320 | |
2321 | -# serial 4 |
2322 | +# serial 5 |
2323 | |
2324 | +# AM_MAINTAINER_MODE([DEFAULT-MODE]) |
2325 | +# ---------------------------------- |
2326 | +# Control maintainer-specific portions of Makefiles. |
2327 | +# Default is to disable them, unless `enable' is passed literally. |
2328 | +# For symmetry, `disable' may be passed as well. Anyway, the user |
2329 | +# can override the default with the --enable/--disable switch. |
2330 | AC_DEFUN([AM_MAINTAINER_MODE], |
2331 | -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
2332 | - dnl maintainer-mode is disabled by default |
2333 | - AC_ARG_ENABLE(maintainer-mode, |
2334 | -[ --enable-maintainer-mode enable make rules and dependencies not useful |
2335 | +[m4_case(m4_default([$1], [disable]), |
2336 | + [enable], [m4_define([am_maintainer_other], [disable])], |
2337 | + [disable], [m4_define([am_maintainer_other], [enable])], |
2338 | + [m4_define([am_maintainer_other], [enable]) |
2339 | + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) |
2340 | +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
2341 | + dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
2342 | + AC_ARG_ENABLE([maintainer-mode], |
2343 | +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful |
2344 | (and sometimes confusing) to the casual installer], |
2345 | - USE_MAINTAINER_MODE=$enableval, |
2346 | - USE_MAINTAINER_MODE=no) |
2347 | + [USE_MAINTAINER_MODE=$enableval], |
2348 | + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
2349 | AC_MSG_RESULT([$USE_MAINTAINER_MODE]) |
2350 | - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) |
2351 | + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) |
2352 | MAINT=$MAINTAINER_MODE_TRUE |
2353 | - AC_SUBST(MAINT)dnl |
2354 | + AC_SUBST([MAINT])dnl |
2355 | ] |
2356 | ) |
2357 | |
2358 | @@ -9965,13 +10128,13 @@ |
2359 | |
2360 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
2361 | |
2362 | -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. |
2363 | +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. |
2364 | # |
2365 | # This file is free software; the Free Software Foundation |
2366 | # gives unlimited permission to copy and/or distribute it, |
2367 | # with or without modifications, as long as this notice is preserved. |
2368 | |
2369 | -# serial 3 |
2370 | +# serial 4 |
2371 | |
2372 | # AM_MAKE_INCLUDE() |
2373 | # ----------------- |
2374 | @@ -9980,7 +10143,7 @@ |
2375 | [am_make=${MAKE-make} |
2376 | cat > confinc << 'END' |
2377 | am__doit: |
2378 | - @echo done |
2379 | + @echo this is the am__doit target |
2380 | .PHONY: am__doit |
2381 | END |
2382 | # If we don't find an include directive, just comment out the code. |
2383 | @@ -9990,24 +10153,24 @@ |
2384 | _am_result=none |
2385 | # First try GNU make style include. |
2386 | echo "include confinc" > confmf |
2387 | -# We grep out `Entering directory' and `Leaving directory' |
2388 | -# messages which can occur if `w' ends up in MAKEFLAGS. |
2389 | -# In particular we don't look at `^make:' because GNU make might |
2390 | -# be invoked under some other name (usually "gmake"), in which |
2391 | -# case it prints its new name instead of `make'. |
2392 | -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then |
2393 | - am__include=include |
2394 | - am__quote= |
2395 | - _am_result=GNU |
2396 | -fi |
2397 | +# Ignore all kinds of additional output from `make'. |
2398 | +case `$am_make -s -f confmf 2> /dev/null` in #( |
2399 | +*the\ am__doit\ target*) |
2400 | + am__include=include |
2401 | + am__quote= |
2402 | + _am_result=GNU |
2403 | + ;; |
2404 | +esac |
2405 | # Now try BSD make style include. |
2406 | if test "$am__include" = "#"; then |
2407 | echo '.include "confinc"' > confmf |
2408 | - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then |
2409 | - am__include=.include |
2410 | - am__quote="\"" |
2411 | - _am_result=BSD |
2412 | - fi |
2413 | + case `$am_make -s -f confmf 2> /dev/null` in #( |
2414 | + *the\ am__doit\ target*) |
2415 | + am__include=.include |
2416 | + am__quote="\"" |
2417 | + _am_result=BSD |
2418 | + ;; |
2419 | + esac |
2420 | fi |
2421 | AC_SUBST([am__include]) |
2422 | AC_SUBST([am__quote]) |
2423 | @@ -10017,14 +10180,14 @@ |
2424 | |
2425 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
2426 | |
2427 | -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 |
2428 | +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 |
2429 | # Free Software Foundation, Inc. |
2430 | # |
2431 | # This file is free software; the Free Software Foundation |
2432 | # gives unlimited permission to copy and/or distribute it, |
2433 | # with or without modifications, as long as this notice is preserved. |
2434 | |
2435 | -# serial 4 |
2436 | +# serial 6 |
2437 | |
2438 | # AM_MISSING_PROG(NAME, PROGRAM) |
2439 | # ------------------------------ |
2440 | @@ -10040,7 +10203,15 @@ |
2441 | # If it does, set am_missing_run to use it, otherwise, to nothing. |
2442 | AC_DEFUN([AM_MISSING_HAS_RUN], |
2443 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
2444 | -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" |
2445 | +AC_REQUIRE_AUX_FILE([missing])dnl |
2446 | +if test x"${MISSING+set}" != xset; then |
2447 | + case $am_aux_dir in |
2448 | + *\ * | *\ *) |
2449 | + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; |
2450 | + *) |
2451 | + MISSING="\${SHELL} $am_aux_dir/missing" ;; |
2452 | + esac |
2453 | +fi |
2454 | # Use eval to expand $SHELL |
2455 | if eval "$MISSING --run true"; then |
2456 | am_missing_run="$MISSING --run " |
2457 | @@ -10050,78 +10221,45 @@ |
2458 | fi |
2459 | ]) |
2460 | |
2461 | -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. |
2462 | +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
2463 | +# Inc. |
2464 | # |
2465 | # This file is free software; the Free Software Foundation |
2466 | # gives unlimited permission to copy and/or distribute it, |
2467 | # with or without modifications, as long as this notice is preserved. |
2468 | |
2469 | +# serial 1 |
2470 | + |
2471 | # AM_PROG_MKDIR_P |
2472 | # --------------- |
2473 | -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. |
2474 | -# |
2475 | -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories |
2476 | -# created by `make install' are always world readable, even if the |
2477 | -# installer happens to have an overly restrictive umask (e.g. 077). |
2478 | -# This was a mistake. There are at least two reasons why we must not |
2479 | -# use `-m 0755': |
2480 | -# - it causes special bits like SGID to be ignored, |
2481 | -# - it may be too restrictive (some setups expect 775 directories). |
2482 | -# |
2483 | -# Do not use -m 0755 and let people choose whatever they expect by |
2484 | -# setting umask. |
2485 | -# |
2486 | -# We cannot accept any implementation of `mkdir' that recognizes `-p'. |
2487 | -# Some implementations (such as Solaris 8's) are not thread-safe: if a |
2488 | -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' |
2489 | -# concurrently, both version can detect that a/ is missing, but only |
2490 | -# one can create it and the other will error out. Consequently we |
2491 | -# restrict ourselves to GNU make (using the --version option ensures |
2492 | -# this.) |
2493 | +# Check for `mkdir -p'. |
2494 | AC_DEFUN([AM_PROG_MKDIR_P], |
2495 | -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then |
2496 | - # We used to keeping the `.' as first argument, in order to |
2497 | - # allow $(mkdir_p) to be used without argument. As in |
2498 | - # $(mkdir_p) $(somedir) |
2499 | - # where $(somedir) is conditionally defined. However this is wrong |
2500 | - # for two reasons: |
2501 | - # 1. if the package is installed by a user who cannot write `.' |
2502 | - # make install will fail, |
2503 | - # 2. the above comment should most certainly read |
2504 | - # $(mkdir_p) $(DESTDIR)$(somedir) |
2505 | - # so it does not work when $(somedir) is undefined and |
2506 | - # $(DESTDIR) is not. |
2507 | - # To support the latter case, we have to write |
2508 | - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), |
2509 | - # so the `.' trick is pointless. |
2510 | - mkdir_p='mkdir -p --' |
2511 | -else |
2512 | - # On NextStep and OpenStep, the `mkdir' command does not |
2513 | - # recognize any option. It will interpret all options as |
2514 | - # directories to create, and then abort because `.' already |
2515 | - # exists. |
2516 | - for d in ./-p ./--version; |
2517 | - do |
2518 | - test -d $d && rmdir $d |
2519 | - done |
2520 | - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. |
2521 | - if test -f "$ac_aux_dir/mkinstalldirs"; then |
2522 | - mkdir_p='$(mkinstalldirs)' |
2523 | - else |
2524 | - mkdir_p='$(SHELL) $(install_sh) -d' |
2525 | - fi |
2526 | -fi |
2527 | -AC_SUBST([mkdir_p])]) |
2528 | +[AC_PREREQ([2.60])dnl |
2529 | +AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
2530 | +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, |
2531 | +dnl while keeping a definition of mkdir_p for backward compatibility. |
2532 | +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. |
2533 | +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of |
2534 | +dnl Makefile.ins that do not define MKDIR_P, so we do our own |
2535 | +dnl adjustment using top_builddir (which is defined more often than |
2536 | +dnl MKDIR_P). |
2537 | +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl |
2538 | +case $mkdir_p in |
2539 | + [[\\/$]]* | ?:[[\\/]]*) ;; |
2540 | + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
2541 | +esac |
2542 | +]) |
2543 | |
2544 | # Helper functions for option handling. -*- Autoconf -*- |
2545 | |
2546 | -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. |
2547 | +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
2548 | +# Foundation, Inc. |
2549 | # |
2550 | # This file is free software; the Free Software Foundation |
2551 | # gives unlimited permission to copy and/or distribute it, |
2552 | # with or without modifications, as long as this notice is preserved. |
2553 | |
2554 | -# serial 3 |
2555 | +# serial 5 |
2556 | |
2557 | # _AM_MANGLE_OPTION(NAME) |
2558 | # ----------------------- |
2559 | @@ -10129,16 +10267,16 @@ |
2560 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
2561 | |
2562 | # _AM_SET_OPTION(NAME) |
2563 | -# ------------------------------ |
2564 | +# -------------------- |
2565 | # Set option NAME. Presently that only means defining a flag for this option. |
2566 | AC_DEFUN([_AM_SET_OPTION], |
2567 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
2568 | |
2569 | # _AM_SET_OPTIONS(OPTIONS) |
2570 | -# ---------------------------------- |
2571 | +# ------------------------ |
2572 | # OPTIONS is a space-separated list of Automake options. |
2573 | AC_DEFUN([_AM_SET_OPTIONS], |
2574 | -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
2575 | +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
2576 | |
2577 | # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) |
2578 | # ------------------------------------------- |
2579 | @@ -10146,12 +10284,14 @@ |
2580 | AC_DEFUN([_AM_IF_OPTION], |
2581 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
2582 | |
2583 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
2584 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
2585 | # |
2586 | # This file is free software; the Free Software Foundation |
2587 | # gives unlimited permission to copy and/or distribute it, |
2588 | # with or without modifications, as long as this notice is preserved. |
2589 | |
2590 | +# serial 1 |
2591 | + |
2592 | # AM_RUN_LOG(COMMAND) |
2593 | # ------------------- |
2594 | # Run COMMAND, save the exit status in ac_status, and log it. |
2595 | @@ -10163,12 +10303,14 @@ |
2596 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2597 | (exit $ac_status); }]) |
2598 | |
2599 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
2600 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
2601 | # |
2602 | # This file is free software; the Free Software Foundation |
2603 | # gives unlimited permission to copy and/or distribute it, |
2604 | # with or without modifications, as long as this notice is preserved. |
2605 | |
2606 | +# serial 1 |
2607 | + |
2608 | # AM_PROG_INSTALL_STRIP |
2609 | # --------------------- |
2610 | # One issue with vendor `install' (even GNU) is that you can't |
2611 | @@ -10188,12 +10330,31 @@ |
2612 | if test "$cross_compiling" != no; then |
2613 | AC_CHECK_TOOL([STRIP], [strip], :) |
2614 | fi |
2615 | -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" |
2616 | +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
2617 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
2618 | |
2619 | +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
2620 | +# |
2621 | +# This file is free software; the Free Software Foundation |
2622 | +# gives unlimited permission to copy and/or distribute it, |
2623 | +# with or without modifications, as long as this notice is preserved. |
2624 | + |
2625 | +# serial 3 |
2626 | + |
2627 | +# _AM_SUBST_NOTMAKE(VARIABLE) |
2628 | +# --------------------------- |
2629 | +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
2630 | +# This macro is traced by Automake. |
2631 | +AC_DEFUN([_AM_SUBST_NOTMAKE]) |
2632 | + |
2633 | +# AM_SUBST_NOTMAKE(VARIABLE) |
2634 | +# -------------------------- |
2635 | +# Public sister of _AM_SUBST_NOTMAKE. |
2636 | +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
2637 | + |
2638 | # Check how to create a tarball. -*- Autoconf -*- |
2639 | |
2640 | -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
2641 | +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
2642 | # |
2643 | # This file is free software; the Free Software Foundation |
2644 | # gives unlimited permission to copy and/or distribute it, |
2645 | @@ -10215,10 +10376,11 @@ |
2646 | # a tarball read from stdin. |
2647 | # $(am__untar) < result.tar |
2648 | AC_DEFUN([_AM_PROG_TAR], |
2649 | -[# Always define AMTAR for backward compatibility. |
2650 | -AM_MISSING_PROG([AMTAR], [tar]) |
2651 | +[# Always define AMTAR for backward compatibility. Yes, it's still used |
2652 | +# in the wild :-( We should find a proper way to deprecate it ... |
2653 | +AC_SUBST([AMTAR], ['$${TAR-tar}']) |
2654 | m4_if([$1], [v7], |
2655 | - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], |
2656 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
2657 | [m4_case([$1], [ustar],, [pax],, |
2658 | [m4_fatal([Unknown tar format])]) |
2659 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
2660 | @@ -10287,9 +10449,7 @@ |
2661 | AC_SUBST([am__untar]) |
2662 | ]) # _AM_PROG_TAR |
2663 | |
2664 | -dnl $Id$ |
2665 | -dnl |
2666 | -dnl Copyright (c) 2002-2006 |
2667 | +dnl Copyright (c) 2002-2015 |
2668 | dnl The Xfce development team. All rights reserved. |
2669 | dnl |
2670 | dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>. |
2671 | @@ -10317,7 +10477,7 @@ |
2672 | |
2673 | |
2674 | dnl We need recent a autoconf version |
2675 | -AC_PREREQ([2.53]) |
2676 | +AC_PREREQ([2.60]) |
2677 | |
2678 | |
2679 | |
2680 | @@ -10627,9 +10787,7 @@ |
2681 | ]) |
2682 | |
2683 | |
2684 | -dnl $Id$ |
2685 | -dnl |
2686 | -dnl Copyright (c) 2002-2006 |
2687 | +dnl Copyright (c) 2002-2015 |
2688 | dnl The Xfce development team. All rights reserved. |
2689 | dnl |
2690 | dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>. |
2691 | @@ -10657,7 +10815,7 @@ |
2692 | |
2693 | |
2694 | dnl We need recent a autoconf version |
2695 | -AC_PREREQ([2.53]) |
2696 | +AC_PREREQ([2.60]) |
2697 | |
2698 | |
2699 | dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS) |
2700 | @@ -10671,7 +10829,7 @@ |
2701 | AC_MSG_CHECKING([if $CC supports $flag]) |
2702 | saved_CFLAGS="$CFLAGS" |
2703 | CFLAGS="$CFLAGS $flag" |
2704 | - AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no]) |
2705 | + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no]) |
2706 | CFLAGS="$saved_CFLAGS" |
2707 | AC_MSG_RESULT([$flag_supported]) |
2708 | |
2709 | @@ -10705,10 +10863,10 @@ |
2710 | -Wdeclaration-after-statement \ |
2711 | -Wmissing-declarations \ |
2712 | -Wmissing-noreturn -Wshadow -Wpointer-arith \ |
2713 | - -Wcast-align -Wformat-security \ |
2714 | + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ |
2715 | -Winit-self -Wmissing-include-dirs -Wundef \ |
2716 | - -Wmissing-format-attribute -Wnested-externs" |
2717 | - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" |
2718 | + -Wnested-externs" |
2719 | + CPPFLAGS="$CPPFLAGS" |
2720 | |
2721 | if test x`uname` = x"Linux"; then |
2722 | xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" |
2723 | @@ -10775,7 +10933,7 @@ |
2724 | saved_CFLAGS="$CFLAGS" |
2725 | CFLAGS="$CFLAGS $xdt_vis_test_cflags" |
2726 | AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) |
2727 | - AC_COMPILE_IFELSE(AC_LANG_SOURCE( |
2728 | + AC_COMPILE_IFELSE([AC_LANG_SOURCE( |
2729 | [ |
2730 | void test_default (void); |
2731 | void test_hidden (void); |
2732 | @@ -10788,7 +10946,7 @@ |
2733 | test_hidden (); |
2734 | return 0; |
2735 | } |
2736 | - ]), |
2737 | + ])], |
2738 | [ |
2739 | have_gnuc_visibility=yes |
2740 | AC_MSG_RESULT([yes]) |
2741 | @@ -10849,9 +11007,7 @@ |
2742 | fi |
2743 | ]) |
2744 | |
2745 | -dnl $Id$ |
2746 | -dnl |
2747 | -dnl Copyright (c) 2002-2006 |
2748 | +dnl Copyright (c) 2002-2015 |
2749 | dnl The Xfce development team. All rights reserved. |
2750 | dnl |
2751 | dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>. |
2752 | |
2753 | === modified file 'config.guess' |
2754 | --- config.guess 2012-04-08 15:04:30 +0000 |
2755 | +++ config.guess 2015-03-03 21:10:41 +0000 |
2756 | @@ -1,9 +1,10 @@ |
2757 | #! /bin/sh |
2758 | # Attempt to guess a canonical system name. |
2759 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
2760 | -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
2761 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
2762 | +# 2011, 2012 Free Software Foundation, Inc. |
2763 | |
2764 | -timestamp='2005-07-08' |
2765 | +timestamp='2012-02-10' |
2766 | |
2767 | # This file is free software; you can redistribute it and/or modify it |
2768 | # under the terms of the GNU General Public License as published by |
2769 | @@ -16,9 +17,7 @@ |
2770 | # General Public License for more details. |
2771 | # |
2772 | # You should have received a copy of the GNU General Public License |
2773 | -# along with this program; if not, write to the Free Software |
2774 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
2775 | -# 02110-1301, USA. |
2776 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
2777 | # |
2778 | # As a special exception to the GNU General Public License, if you |
2779 | # distribute this file as part of a program that contains a |
2780 | @@ -26,16 +25,16 @@ |
2781 | # the same distribution terms that you use for the rest of that program. |
2782 | |
2783 | |
2784 | -# Originally written by Per Bothner <per@bothner.com>. |
2785 | -# Please send patches to <config-patches@gnu.org>. Submit a context |
2786 | -# diff and a properly formatted ChangeLog entry. |
2787 | +# Originally written by Per Bothner. Please send patches (context |
2788 | +# diff format) to <config-patches@gnu.org> and include a ChangeLog |
2789 | +# entry. |
2790 | # |
2791 | # This script attempts to guess a canonical system name similar to |
2792 | # config.sub. If it succeeds, it prints the system name on stdout, and |
2793 | # exits with 0. Otherwise, it exits with 1. |
2794 | # |
2795 | -# The plan is that this can be called by configure scripts if you |
2796 | -# don't specify an explicit build system type. |
2797 | +# You can get the latest version of this script from: |
2798 | +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
2799 | |
2800 | me=`echo "$0" | sed -e 's,.*/,,'` |
2801 | |
2802 | @@ -55,7 +54,8 @@ |
2803 | GNU config.guess ($timestamp) |
2804 | |
2805 | Originally written by Per Bothner. |
2806 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
2807 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
2808 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
2809 | Free Software Foundation, Inc. |
2810 | |
2811 | This is free software; see the source for copying conditions. There is NO |
2812 | @@ -106,7 +106,7 @@ |
2813 | trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; |
2814 | trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; |
2815 | : ${TMPDIR=/tmp} ; |
2816 | - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || |
2817 | + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || |
2818 | { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || |
2819 | { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || |
2820 | { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; |
2821 | @@ -143,7 +143,7 @@ |
2822 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
2823 | *:NetBSD:*:*) |
2824 | # NetBSD (nbsd) targets should (where applicable) match one or |
2825 | - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, |
2826 | + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
2827 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
2828 | # switched to ELF, *-*-netbsd* would select the old |
2829 | # object file format. This provides both forward |
2830 | @@ -160,6 +160,7 @@ |
2831 | arm*) machine=arm-unknown ;; |
2832 | sh3el) machine=shl-unknown ;; |
2833 | sh3eb) machine=sh-unknown ;; |
2834 | + sh5el) machine=sh5le-unknown ;; |
2835 | *) machine=${UNAME_MACHINE_ARCH}-unknown ;; |
2836 | esac |
2837 | # The Operating System including object format, if it has switched |
2838 | @@ -168,7 +169,7 @@ |
2839 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
2840 | eval $set_cc_for_build |
2841 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
2842 | - | grep __ELF__ >/dev/null |
2843 | + | grep -q __ELF__ |
2844 | then |
2845 | # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). |
2846 | # Return netbsd for either. FIX? |
2847 | @@ -178,7 +179,7 @@ |
2848 | fi |
2849 | ;; |
2850 | *) |
2851 | - os=netbsd |
2852 | + os=netbsd |
2853 | ;; |
2854 | esac |
2855 | # The OS release |
2856 | @@ -206,8 +207,11 @@ |
2857 | *:ekkoBSD:*:*) |
2858 | echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} |
2859 | exit ;; |
2860 | + *:SolidBSD:*:*) |
2861 | + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} |
2862 | + exit ;; |
2863 | macppc:MirBSD:*:*) |
2864 | - echo powerppc-unknown-mirbsd${UNAME_RELEASE} |
2865 | + echo powerpc-unknown-mirbsd${UNAME_RELEASE} |
2866 | exit ;; |
2867 | *:MirBSD:*:*) |
2868 | echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} |
2869 | @@ -218,7 +222,7 @@ |
2870 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
2871 | ;; |
2872 | *5.*) |
2873 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
2874 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
2875 | ;; |
2876 | esac |
2877 | # According to Compaq, /usr/sbin/psrinfo has been available on |
2878 | @@ -264,7 +268,10 @@ |
2879 | # A Xn.n version is an unreleased experimental baselevel. |
2880 | # 1.2 uses "1.2" for uname -r. |
2881 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
2882 | - exit ;; |
2883 | + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
2884 | + exitcode=$? |
2885 | + trap '' 0 |
2886 | + exit $exitcode ;; |
2887 | Alpha\ *:Windows_NT*:*) |
2888 | # How do we know it's Interix rather than the generic POSIX subsystem? |
2889 | # Should we change UNAME_MACHINE based on the output of uname instead |
2890 | @@ -290,7 +297,7 @@ |
2891 | echo s390-ibm-zvmoe |
2892 | exit ;; |
2893 | *:OS400:*:*) |
2894 | - echo powerpc-ibm-os400 |
2895 | + echo powerpc-ibm-os400 |
2896 | exit ;; |
2897 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
2898 | echo arm-acorn-riscix${UNAME_RELEASE} |
2899 | @@ -319,14 +326,33 @@ |
2900 | case `/usr/bin/uname -p` in |
2901 | sparc) echo sparc-icl-nx7; exit ;; |
2902 | esac ;; |
2903 | + s390x:SunOS:*:*) |
2904 | + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
2905 | + exit ;; |
2906 | sun4H:SunOS:5.*:*) |
2907 | echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
2908 | exit ;; |
2909 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
2910 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
2911 | exit ;; |
2912 | - i86pc:SunOS:5.*:*) |
2913 | - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
2914 | + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
2915 | + echo i386-pc-auroraux${UNAME_RELEASE} |
2916 | + exit ;; |
2917 | + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
2918 | + eval $set_cc_for_build |
2919 | + SUN_ARCH="i386" |
2920 | + # If there is a compiler, see if it is configured for 64-bit objects. |
2921 | + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. |
2922 | + # This test works for both compilers. |
2923 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
2924 | + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ |
2925 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
2926 | + grep IS_64BIT_ARCH >/dev/null |
2927 | + then |
2928 | + SUN_ARCH="x86_64" |
2929 | + fi |
2930 | + fi |
2931 | + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
2932 | exit ;; |
2933 | sun4*:SunOS:6*:*) |
2934 | # According to config.sub, this is the proper way to canonicalize |
2935 | @@ -370,23 +396,23 @@ |
2936 | # MiNT. But MiNT is downward compatible to TOS, so this should |
2937 | # be no problem. |
2938 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
2939 | - echo m68k-atari-mint${UNAME_RELEASE} |
2940 | + echo m68k-atari-mint${UNAME_RELEASE} |
2941 | exit ;; |
2942 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
2943 | echo m68k-atari-mint${UNAME_RELEASE} |
2944 | - exit ;; |
2945 | + exit ;; |
2946 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
2947 | - echo m68k-atari-mint${UNAME_RELEASE} |
2948 | + echo m68k-atari-mint${UNAME_RELEASE} |
2949 | exit ;; |
2950 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
2951 | - echo m68k-milan-mint${UNAME_RELEASE} |
2952 | - exit ;; |
2953 | + echo m68k-milan-mint${UNAME_RELEASE} |
2954 | + exit ;; |
2955 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
2956 | - echo m68k-hades-mint${UNAME_RELEASE} |
2957 | - exit ;; |
2958 | + echo m68k-hades-mint${UNAME_RELEASE} |
2959 | + exit ;; |
2960 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
2961 | - echo m68k-unknown-mint${UNAME_RELEASE} |
2962 | - exit ;; |
2963 | + echo m68k-unknown-mint${UNAME_RELEASE} |
2964 | + exit ;; |
2965 | m68k:machten:*:*) |
2966 | echo m68k-apple-machten${UNAME_RELEASE} |
2967 | exit ;; |
2968 | @@ -456,8 +482,8 @@ |
2969 | echo m88k-motorola-sysv3 |
2970 | exit ;; |
2971 | AViiON:dgux:*:*) |
2972 | - # DG/UX returns AViiON for all architectures |
2973 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
2974 | + # DG/UX returns AViiON for all architectures |
2975 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
2976 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
2977 | then |
2978 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
2979 | @@ -470,7 +496,7 @@ |
2980 | else |
2981 | echo i586-dg-dgux${UNAME_RELEASE} |
2982 | fi |
2983 | - exit ;; |
2984 | + exit ;; |
2985 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
2986 | echo m88k-dolphin-sysv3 |
2987 | exit ;; |
2988 | @@ -527,7 +553,7 @@ |
2989 | echo rs6000-ibm-aix3.2 |
2990 | fi |
2991 | exit ;; |
2992 | - *:AIX:*:[45]) |
2993 | + *:AIX:*:[4567]) |
2994 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
2995 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
2996 | IBM_ARCH=rs6000 |
2997 | @@ -570,52 +596,52 @@ |
2998 | 9000/[678][0-9][0-9]) |
2999 | if [ -x /usr/bin/getconf ]; then |
3000 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
3001 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
3002 | - case "${sc_cpu_version}" in |
3003 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
3004 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
3005 | - 532) # CPU_PA_RISC2_0 |
3006 | - case "${sc_kernel_bits}" in |
3007 | - 32) HP_ARCH="hppa2.0n" ;; |
3008 | - 64) HP_ARCH="hppa2.0w" ;; |
3009 | + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
3010 | + case "${sc_cpu_version}" in |
3011 | + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
3012 | + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
3013 | + 532) # CPU_PA_RISC2_0 |
3014 | + case "${sc_kernel_bits}" in |
3015 | + 32) HP_ARCH="hppa2.0n" ;; |
3016 | + 64) HP_ARCH="hppa2.0w" ;; |
3017 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
3018 | - esac ;; |
3019 | - esac |
3020 | + esac ;; |
3021 | + esac |
3022 | fi |
3023 | if [ "${HP_ARCH}" = "" ]; then |
3024 | eval $set_cc_for_build |
3025 | - sed 's/^ //' << EOF >$dummy.c |
3026 | - |
3027 | - #define _HPUX_SOURCE |
3028 | - #include <stdlib.h> |
3029 | - #include <unistd.h> |
3030 | - |
3031 | - int main () |
3032 | - { |
3033 | - #if defined(_SC_KERNEL_BITS) |
3034 | - long bits = sysconf(_SC_KERNEL_BITS); |
3035 | - #endif |
3036 | - long cpu = sysconf (_SC_CPU_VERSION); |
3037 | - |
3038 | - switch (cpu) |
3039 | - { |
3040 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
3041 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
3042 | - case CPU_PA_RISC2_0: |
3043 | - #if defined(_SC_KERNEL_BITS) |
3044 | - switch (bits) |
3045 | - { |
3046 | - case 64: puts ("hppa2.0w"); break; |
3047 | - case 32: puts ("hppa2.0n"); break; |
3048 | - default: puts ("hppa2.0"); break; |
3049 | - } break; |
3050 | - #else /* !defined(_SC_KERNEL_BITS) */ |
3051 | - puts ("hppa2.0"); break; |
3052 | - #endif |
3053 | - default: puts ("hppa1.0"); break; |
3054 | - } |
3055 | - exit (0); |
3056 | - } |
3057 | + sed 's/^ //' << EOF >$dummy.c |
3058 | + |
3059 | + #define _HPUX_SOURCE |
3060 | + #include <stdlib.h> |
3061 | + #include <unistd.h> |
3062 | + |
3063 | + int main () |
3064 | + { |
3065 | + #if defined(_SC_KERNEL_BITS) |
3066 | + long bits = sysconf(_SC_KERNEL_BITS); |
3067 | + #endif |
3068 | + long cpu = sysconf (_SC_CPU_VERSION); |
3069 | + |
3070 | + switch (cpu) |
3071 | + { |
3072 | + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
3073 | + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
3074 | + case CPU_PA_RISC2_0: |
3075 | + #if defined(_SC_KERNEL_BITS) |
3076 | + switch (bits) |
3077 | + { |
3078 | + case 64: puts ("hppa2.0w"); break; |
3079 | + case 32: puts ("hppa2.0n"); break; |
3080 | + default: puts ("hppa2.0"); break; |
3081 | + } break; |
3082 | + #else /* !defined(_SC_KERNEL_BITS) */ |
3083 | + puts ("hppa2.0"); break; |
3084 | + #endif |
3085 | + default: puts ("hppa1.0"); break; |
3086 | + } |
3087 | + exit (0); |
3088 | + } |
3089 | EOF |
3090 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
3091 | test -z "$HP_ARCH" && HP_ARCH=hppa |
3092 | @@ -635,7 +661,7 @@ |
3093 | # => hppa64-hp-hpux11.23 |
3094 | |
3095 | if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | |
3096 | - grep __LP64__ >/dev/null |
3097 | + grep -q __LP64__ |
3098 | then |
3099 | HP_ARCH="hppa2.0w" |
3100 | else |
3101 | @@ -706,22 +732,22 @@ |
3102 | exit ;; |
3103 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
3104 | echo c1-convex-bsd |
3105 | - exit ;; |
3106 | + exit ;; |
3107 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
3108 | if getsysinfo -f scalar_acc |
3109 | then echo c32-convex-bsd |
3110 | else echo c2-convex-bsd |
3111 | fi |
3112 | - exit ;; |
3113 | + exit ;; |
3114 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
3115 | echo c34-convex-bsd |
3116 | - exit ;; |
3117 | + exit ;; |
3118 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
3119 | echo c38-convex-bsd |
3120 | - exit ;; |
3121 | + exit ;; |
3122 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
3123 | echo c4-convex-bsd |
3124 | - exit ;; |
3125 | + exit ;; |
3126 | CRAY*Y-MP:*:*:*) |
3127 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
3128 | exit ;; |
3129 | @@ -745,14 +771,14 @@ |
3130 | exit ;; |
3131 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
3132 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
3133 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3134 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
3135 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3136 | - exit ;; |
3137 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3138 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
3139 | + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3140 | + exit ;; |
3141 | 5000:UNIX_System_V:4.*:*) |
3142 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3143 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
3144 | - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3145 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3146 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
3147 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3148 | exit ;; |
3149 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
3150 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
3151 | @@ -764,27 +790,48 @@ |
3152 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
3153 | exit ;; |
3154 | *:FreeBSD:*:*) |
3155 | - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
3156 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
3157 | + case ${UNAME_PROCESSOR} in |
3158 | + amd64) |
3159 | + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
3160 | + *) |
3161 | + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
3162 | + esac |
3163 | exit ;; |
3164 | i*:CYGWIN*:*) |
3165 | echo ${UNAME_MACHINE}-pc-cygwin |
3166 | exit ;; |
3167 | - i*:MINGW*:*) |
3168 | + *:MINGW*:*) |
3169 | echo ${UNAME_MACHINE}-pc-mingw32 |
3170 | exit ;; |
3171 | + i*:MSYS*:*) |
3172 | + echo ${UNAME_MACHINE}-pc-msys |
3173 | + exit ;; |
3174 | i*:windows32*:*) |
3175 | - # uname -m includes "-pc" on this system. |
3176 | - echo ${UNAME_MACHINE}-mingw32 |
3177 | + # uname -m includes "-pc" on this system. |
3178 | + echo ${UNAME_MACHINE}-mingw32 |
3179 | exit ;; |
3180 | i*:PW*:*) |
3181 | echo ${UNAME_MACHINE}-pc-pw32 |
3182 | exit ;; |
3183 | - x86:Interix*:[34]*) |
3184 | - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' |
3185 | - exit ;; |
3186 | + *:Interix*:*) |
3187 | + case ${UNAME_MACHINE} in |
3188 | + x86) |
3189 | + echo i586-pc-interix${UNAME_RELEASE} |
3190 | + exit ;; |
3191 | + authenticamd | genuineintel | EM64T) |
3192 | + echo x86_64-unknown-interix${UNAME_RELEASE} |
3193 | + exit ;; |
3194 | + IA64) |
3195 | + echo ia64-unknown-interix${UNAME_RELEASE} |
3196 | + exit ;; |
3197 | + esac ;; |
3198 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
3199 | echo i${UNAME_MACHINE}-pc-mks |
3200 | exit ;; |
3201 | + 8664:Windows_NT:*) |
3202 | + echo x86_64-pc-mks |
3203 | + exit ;; |
3204 | i*:Windows_NT*:* | Pentium*:Windows_NT*:*) |
3205 | # How do we know it's Interix rather than the generic POSIX subsystem? |
3206 | # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we |
3207 | @@ -794,7 +841,7 @@ |
3208 | i*:UWIN*:*) |
3209 | echo ${UNAME_MACHINE}-pc-uwin |
3210 | exit ;; |
3211 | - amd64:CYGWIN*:*:*) |
3212 | + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) |
3213 | echo x86_64-unknown-cygwin |
3214 | exit ;; |
3215 | p*:CYGWIN*:*) |
3216 | @@ -814,70 +861,12 @@ |
3217 | i*86:Minix:*:*) |
3218 | echo ${UNAME_MACHINE}-pc-minix |
3219 | exit ;; |
3220 | - arm*:Linux:*:*) |
3221 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3222 | - exit ;; |
3223 | - cris:Linux:*:*) |
3224 | - echo cris-axis-linux-gnu |
3225 | - exit ;; |
3226 | - crisv32:Linux:*:*) |
3227 | - echo crisv32-axis-linux-gnu |
3228 | - exit ;; |
3229 | - frv:Linux:*:*) |
3230 | - echo frv-unknown-linux-gnu |
3231 | - exit ;; |
3232 | - ia64:Linux:*:*) |
3233 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3234 | - exit ;; |
3235 | - m32r*:Linux:*:*) |
3236 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3237 | - exit ;; |
3238 | - m68*:Linux:*:*) |
3239 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3240 | - exit ;; |
3241 | - mips:Linux:*:*) |
3242 | - eval $set_cc_for_build |
3243 | - sed 's/^ //' << EOF >$dummy.c |
3244 | - #undef CPU |
3245 | - #undef mips |
3246 | - #undef mipsel |
3247 | - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) |
3248 | - CPU=mipsel |
3249 | - #else |
3250 | - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) |
3251 | - CPU=mips |
3252 | - #else |
3253 | - CPU= |
3254 | - #endif |
3255 | - #endif |
3256 | -EOF |
3257 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` |
3258 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
3259 | - ;; |
3260 | - mips64:Linux:*:*) |
3261 | - eval $set_cc_for_build |
3262 | - sed 's/^ //' << EOF >$dummy.c |
3263 | - #undef CPU |
3264 | - #undef mips64 |
3265 | - #undef mips64el |
3266 | - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) |
3267 | - CPU=mips64el |
3268 | - #else |
3269 | - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) |
3270 | - CPU=mips64 |
3271 | - #else |
3272 | - CPU= |
3273 | - #endif |
3274 | - #endif |
3275 | -EOF |
3276 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` |
3277 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
3278 | - ;; |
3279 | - ppc:Linux:*:*) |
3280 | - echo powerpc-unknown-linux-gnu |
3281 | - exit ;; |
3282 | - ppc64:Linux:*:*) |
3283 | - echo powerpc64-unknown-linux-gnu |
3284 | + aarch64:Linux:*:*) |
3285 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3286 | + exit ;; |
3287 | + aarch64_be:Linux:*:*) |
3288 | + UNAME_MACHINE=aarch64_be |
3289 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3290 | exit ;; |
3291 | alpha:Linux:*:*) |
3292 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
3293 | @@ -888,11 +877,90 @@ |
3294 | EV6) UNAME_MACHINE=alphaev6 ;; |
3295 | EV67) UNAME_MACHINE=alphaev67 ;; |
3296 | EV68*) UNAME_MACHINE=alphaev68 ;; |
3297 | - esac |
3298 | - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null |
3299 | + esac |
3300 | + objdump --private-headers /bin/sh | grep -q ld.so.1 |
3301 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
3302 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
3303 | exit ;; |
3304 | + arm*:Linux:*:*) |
3305 | + eval $set_cc_for_build |
3306 | + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
3307 | + | grep -q __ARM_EABI__ |
3308 | + then |
3309 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3310 | + else |
3311 | + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
3312 | + | grep -q __ARM_PCS_VFP |
3313 | + then |
3314 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
3315 | + else |
3316 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf |
3317 | + fi |
3318 | + fi |
3319 | + exit ;; |
3320 | + avr32*:Linux:*:*) |
3321 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3322 | + exit ;; |
3323 | + cris:Linux:*:*) |
3324 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
3325 | + exit ;; |
3326 | + crisv32:Linux:*:*) |
3327 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
3328 | + exit ;; |
3329 | + frv:Linux:*:*) |
3330 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3331 | + exit ;; |
3332 | + hexagon:Linux:*:*) |
3333 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3334 | + exit ;; |
3335 | + i*86:Linux:*:*) |
3336 | + LIBC=gnu |
3337 | + eval $set_cc_for_build |
3338 | + sed 's/^ //' << EOF >$dummy.c |
3339 | + #ifdef __dietlibc__ |
3340 | + LIBC=dietlibc |
3341 | + #endif |
3342 | +EOF |
3343 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
3344 | + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
3345 | + exit ;; |
3346 | + ia64:Linux:*:*) |
3347 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3348 | + exit ;; |
3349 | + m32r*:Linux:*:*) |
3350 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3351 | + exit ;; |
3352 | + m68*:Linux:*:*) |
3353 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3354 | + exit ;; |
3355 | + mips:Linux:*:* | mips64:Linux:*:*) |
3356 | + eval $set_cc_for_build |
3357 | + sed 's/^ //' << EOF >$dummy.c |
3358 | + #undef CPU |
3359 | + #undef ${UNAME_MACHINE} |
3360 | + #undef ${UNAME_MACHINE}el |
3361 | + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) |
3362 | + CPU=${UNAME_MACHINE}el |
3363 | + #else |
3364 | + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) |
3365 | + CPU=${UNAME_MACHINE} |
3366 | + #else |
3367 | + CPU= |
3368 | + #endif |
3369 | + #endif |
3370 | +EOF |
3371 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
3372 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
3373 | + ;; |
3374 | + or32:Linux:*:*) |
3375 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3376 | + exit ;; |
3377 | + padre:Linux:*:*) |
3378 | + echo sparc-unknown-linux-gnu |
3379 | + exit ;; |
3380 | + parisc64:Linux:*:* | hppa64:Linux:*:*) |
3381 | + echo hppa64-unknown-linux-gnu |
3382 | + exit ;; |
3383 | parisc:Linux:*:* | hppa:Linux:*:*) |
3384 | # Look for CPU level |
3385 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
3386 | @@ -901,14 +969,17 @@ |
3387 | *) echo hppa-unknown-linux-gnu ;; |
3388 | esac |
3389 | exit ;; |
3390 | - parisc64:Linux:*:* | hppa64:Linux:*:*) |
3391 | - echo hppa64-unknown-linux-gnu |
3392 | + ppc64:Linux:*:*) |
3393 | + echo powerpc64-unknown-linux-gnu |
3394 | + exit ;; |
3395 | + ppc:Linux:*:*) |
3396 | + echo powerpc-unknown-linux-gnu |
3397 | exit ;; |
3398 | s390:Linux:*:* | s390x:Linux:*:*) |
3399 | echo ${UNAME_MACHINE}-ibm-linux |
3400 | exit ;; |
3401 | sh64*:Linux:*:*) |
3402 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3403 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3404 | exit ;; |
3405 | sh*:Linux:*:*) |
3406 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
3407 | @@ -916,68 +987,18 @@ |
3408 | sparc:Linux:*:* | sparc64:Linux:*:*) |
3409 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
3410 | exit ;; |
3411 | + tile*:Linux:*:*) |
3412 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3413 | + exit ;; |
3414 | + vax:Linux:*:*) |
3415 | + echo ${UNAME_MACHINE}-dec-linux-gnu |
3416 | + exit ;; |
3417 | x86_64:Linux:*:*) |
3418 | - echo x86_64-unknown-linux-gnu |
3419 | - exit ;; |
3420 | - i*86:Linux:*:*) |
3421 | - # The BFD linker knows what the default object file format is, so |
3422 | - # first see if it will tell us. cd to the root directory to prevent |
3423 | - # problems with other programs or directories called `ld' in the path. |
3424 | - # Set LC_ALL=C to ensure ld outputs messages in English. |
3425 | - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ |
3426 | - | sed -ne '/supported targets:/!d |
3427 | - s/[ ][ ]*/ /g |
3428 | - s/.*supported targets: *// |
3429 | - s/ .*// |
3430 | - p'` |
3431 | - case "$ld_supported_targets" in |
3432 | - elf32-i386) |
3433 | - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" |
3434 | - ;; |
3435 | - a.out-i386-linux) |
3436 | - echo "${UNAME_MACHINE}-pc-linux-gnuaout" |
3437 | - exit ;; |
3438 | - coff-i386) |
3439 | - echo "${UNAME_MACHINE}-pc-linux-gnucoff" |
3440 | - exit ;; |
3441 | - "") |
3442 | - # Either a pre-BFD a.out linker (linux-gnuoldld) or |
3443 | - # one that does not give us useful --help. |
3444 | - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" |
3445 | - exit ;; |
3446 | - esac |
3447 | - # Determine whether the default compiler is a.out or elf |
3448 | - eval $set_cc_for_build |
3449 | - sed 's/^ //' << EOF >$dummy.c |
3450 | - #include <features.h> |
3451 | - #ifdef __ELF__ |
3452 | - # ifdef __GLIBC__ |
3453 | - # if __GLIBC__ >= 2 |
3454 | - LIBC=gnu |
3455 | - # else |
3456 | - LIBC=gnulibc1 |
3457 | - # endif |
3458 | - # else |
3459 | - LIBC=gnulibc1 |
3460 | - # endif |
3461 | - #else |
3462 | - #ifdef __INTEL_COMPILER |
3463 | - LIBC=gnu |
3464 | - #else |
3465 | - LIBC=gnuaout |
3466 | - #endif |
3467 | - #endif |
3468 | - #ifdef __dietlibc__ |
3469 | - LIBC=dietlibc |
3470 | - #endif |
3471 | -EOF |
3472 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` |
3473 | - test x"${LIBC}" != x && { |
3474 | - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
3475 | - exit |
3476 | - } |
3477 | - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } |
3478 | - ;; |
3479 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3480 | + exit ;; |
3481 | + xtensa*:Linux:*:*) |
3482 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3483 | + exit ;; |
3484 | i*86:DYNIX/ptx:4*:*) |
3485 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
3486 | # earlier versions are messed up and put the nodename in both |
3487 | @@ -985,11 +1006,11 @@ |
3488 | echo i386-sequent-sysv4 |
3489 | exit ;; |
3490 | i*86:UNIX_SV:4.2MP:2.*) |
3491 | - # Unixware is an offshoot of SVR4, but it has its own version |
3492 | - # number series starting with 2... |
3493 | - # I am not positive that other SVR4 systems won't match this, |
3494 | + # Unixware is an offshoot of SVR4, but it has its own version |
3495 | + # number series starting with 2... |
3496 | + # I am not positive that other SVR4 systems won't match this, |
3497 | # I just have to hope. -- rms. |
3498 | - # Use sysv4.2uw... so that sysv4* matches it. |
3499 | + # Use sysv4.2uw... so that sysv4* matches it. |
3500 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
3501 | exit ;; |
3502 | i*86:OS/2:*:*) |
3503 | @@ -1006,7 +1027,7 @@ |
3504 | i*86:syllable:*:*) |
3505 | echo ${UNAME_MACHINE}-pc-syllable |
3506 | exit ;; |
3507 | - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) |
3508 | + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) |
3509 | echo i386-unknown-lynxos${UNAME_RELEASE} |
3510 | exit ;; |
3511 | i*86:*DOS:*:*) |
3512 | @@ -1021,7 +1042,7 @@ |
3513 | fi |
3514 | exit ;; |
3515 | i*86:*:5:[678]*) |
3516 | - # UnixWare 7.x, OpenUNIX and OpenServer 6. |
3517 | + # UnixWare 7.x, OpenUNIX and OpenServer 6. |
3518 | case `/bin/uname -X | grep "^Machine"` in |
3519 | *486*) UNAME_MACHINE=i486 ;; |
3520 | *Pentium) UNAME_MACHINE=i586 ;; |
3521 | @@ -1049,10 +1070,13 @@ |
3522 | exit ;; |
3523 | pc:*:*:*) |
3524 | # Left here for compatibility: |
3525 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
3526 | - # the processor, so we play safe by assuming i386. |
3527 | - echo i386-pc-msdosdjgpp |
3528 | - exit ;; |
3529 | + # uname -m prints for DJGPP always 'pc', but it prints nothing about |
3530 | + # the processor, so we play safe by assuming i586. |
3531 | + # Note: whatever this is, it MUST be the same as what config.sub |
3532 | + # prints for the "djgpp" host, or else GDB configury will decide that |
3533 | + # this is a cross-build. |
3534 | + echo i586-pc-msdosdjgpp |
3535 | + exit ;; |
3536 | Intel:Mach:3*:*) |
3537 | echo i386-pc-mach3 |
3538 | exit ;; |
3539 | @@ -1087,8 +1111,18 @@ |
3540 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
3541 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
3542 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
3543 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
3544 | - && { echo i486-ncr-sysv4; exit; } ;; |
3545 | + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
3546 | + && { echo i486-ncr-sysv4; exit; } ;; |
3547 | + NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
3548 | + OS_REL='.3' |
3549 | + test -r /etc/.relid \ |
3550 | + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
3551 | + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
3552 | + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } |
3553 | + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
3554 | + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } |
3555 | + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ |
3556 | + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
3557 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) |
3558 | echo m68k-unknown-lynxos${UNAME_RELEASE} |
3559 | exit ;; |
3560 | @@ -1101,7 +1135,7 @@ |
3561 | rs6000:LynxOS:2.*:*) |
3562 | echo rs6000-unknown-lynxos${UNAME_RELEASE} |
3563 | exit ;; |
3564 | - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) |
3565 | + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) |
3566 | echo powerpc-unknown-lynxos${UNAME_RELEASE} |
3567 | exit ;; |
3568 | SM[BE]S:UNIX_SV:*:*) |
3569 | @@ -1121,10 +1155,10 @@ |
3570 | echo ns32k-sni-sysv |
3571 | fi |
3572 | exit ;; |
3573 | - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
3574 | - # says <Richard.M.Bartel@ccMail.Census.GOV> |
3575 | - echo i586-unisys-sysv4 |
3576 | - exit ;; |
3577 | + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
3578 | + # says <Richard.M.Bartel@ccMail.Census.GOV> |
3579 | + echo i586-unisys-sysv4 |
3580 | + exit ;; |
3581 | *:UNIX_System_V:4*:FTX*) |
3582 | # From Gerald Hewes <hewes@openmarket.com>. |
3583 | # How about differentiating between stratus architectures? -djm |
3584 | @@ -1150,11 +1184,11 @@ |
3585 | exit ;; |
3586 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
3587 | if [ -d /usr/nec ]; then |
3588 | - echo mips-nec-sysv${UNAME_RELEASE} |
3589 | + echo mips-nec-sysv${UNAME_RELEASE} |
3590 | else |
3591 | - echo mips-unknown-sysv${UNAME_RELEASE} |
3592 | + echo mips-unknown-sysv${UNAME_RELEASE} |
3593 | fi |
3594 | - exit ;; |
3595 | + exit ;; |
3596 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
3597 | echo powerpc-be-beos |
3598 | exit ;; |
3599 | @@ -1164,6 +1198,9 @@ |
3600 | BePC:BeOS:*:*) # BeOS running on Intel PC compatible. |
3601 | echo i586-pc-beos |
3602 | exit ;; |
3603 | + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. |
3604 | + echo i586-pc-haiku |
3605 | + exit ;; |
3606 | SX-4:SUPER-UX:*:*) |
3607 | echo sx4-nec-superux${UNAME_RELEASE} |
3608 | exit ;; |
3609 | @@ -1173,6 +1210,15 @@ |
3610 | SX-6:SUPER-UX:*:*) |
3611 | echo sx6-nec-superux${UNAME_RELEASE} |
3612 | exit ;; |
3613 | + SX-7:SUPER-UX:*:*) |
3614 | + echo sx7-nec-superux${UNAME_RELEASE} |
3615 | + exit ;; |
3616 | + SX-8:SUPER-UX:*:*) |
3617 | + echo sx8-nec-superux${UNAME_RELEASE} |
3618 | + exit ;; |
3619 | + SX-8R:SUPER-UX:*:*) |
3620 | + echo sx8r-nec-superux${UNAME_RELEASE} |
3621 | + exit ;; |
3622 | Power*:Rhapsody:*:*) |
3623 | echo powerpc-apple-rhapsody${UNAME_RELEASE} |
3624 | exit ;; |
3625 | @@ -1182,7 +1228,16 @@ |
3626 | *:Darwin:*:*) |
3627 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
3628 | case $UNAME_PROCESSOR in |
3629 | - *86) UNAME_PROCESSOR=i686 ;; |
3630 | + i386) |
3631 | + eval $set_cc_for_build |
3632 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
3633 | + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
3634 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
3635 | + grep IS_64BIT_ARCH >/dev/null |
3636 | + then |
3637 | + UNAME_PROCESSOR="x86_64" |
3638 | + fi |
3639 | + fi ;; |
3640 | unknown) UNAME_PROCESSOR=powerpc ;; |
3641 | esac |
3642 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
3643 | @@ -1198,6 +1253,9 @@ |
3644 | *:QNX:*:4*) |
3645 | echo i386-pc-qnx |
3646 | exit ;; |
3647 | + NEO-?:NONSTOP_KERNEL:*:*) |
3648 | + echo neo-tandem-nsk${UNAME_RELEASE} |
3649 | + exit ;; |
3650 | NSE-?:NONSTOP_KERNEL:*:*) |
3651 | echo nse-tandem-nsk${UNAME_RELEASE} |
3652 | exit ;; |
3653 | @@ -1243,13 +1301,13 @@ |
3654 | echo pdp10-unknown-its |
3655 | exit ;; |
3656 | SEI:*:*:SEIUX) |
3657 | - echo mips-sei-seiux${UNAME_RELEASE} |
3658 | + echo mips-sei-seiux${UNAME_RELEASE} |
3659 | exit ;; |
3660 | *:DragonFly:*:*) |
3661 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
3662 | exit ;; |
3663 | *:*VMS:*:*) |
3664 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
3665 | + UNAME_MACHINE=`(uname -p) 2>/dev/null` |
3666 | case "${UNAME_MACHINE}" in |
3667 | A*) echo alpha-dec-vms ; exit ;; |
3668 | I*) echo ia64-dec-vms ; exit ;; |
3669 | @@ -1261,6 +1319,15 @@ |
3670 | i*86:skyos:*:*) |
3671 | echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' |
3672 | exit ;; |
3673 | + i*86:rdos:*:*) |
3674 | + echo ${UNAME_MACHINE}-pc-rdos |
3675 | + exit ;; |
3676 | + i*86:AROS:*:*) |
3677 | + echo ${UNAME_MACHINE}-pc-aros |
3678 | + exit ;; |
3679 | + x86_64:VMkernel:*:*) |
3680 | + echo ${UNAME_MACHINE}-unknown-esx |
3681 | + exit ;; |
3682 | esac |
3683 | |
3684 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
3685 | @@ -1283,11 +1350,11 @@ |
3686 | #include <sys/param.h> |
3687 | printf ("m68k-sony-newsos%s\n", |
3688 | #ifdef NEWSOS4 |
3689 | - "4" |
3690 | + "4" |
3691 | #else |
3692 | - "" |
3693 | + "" |
3694 | #endif |
3695 | - ); exit (0); |
3696 | + ); exit (0); |
3697 | #endif |
3698 | #endif |
3699 | |
3700 | @@ -1421,9 +1488,9 @@ |
3701 | the operating system you are using. It is advised that you |
3702 | download the most up to date version of the config scripts from |
3703 | |
3704 | - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess |
3705 | + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
3706 | and |
3707 | - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub |
3708 | + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
3709 | |
3710 | If the version you run ($0) is already up to date, please |
3711 | send the following data and any information you think might be |
3712 | |
3713 | === modified file 'config.sub' |
3714 | --- config.sub 2012-04-08 15:04:30 +0000 |
3715 | +++ config.sub 2015-03-03 21:10:41 +0000 |
3716 | @@ -1,9 +1,10 @@ |
3717 | #! /bin/sh |
3718 | # Configuration validation subroutine script. |
3719 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
3720 | -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
3721 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
3722 | +# 2011, 2012 Free Software Foundation, Inc. |
3723 | |
3724 | -timestamp='2005-07-08' |
3725 | +timestamp='2012-02-10' |
3726 | |
3727 | # This file is (in principle) common to ALL GNU software. |
3728 | # The presence of a machine in this file suggests that SOME GNU software |
3729 | @@ -20,9 +21,7 @@ |
3730 | # GNU General Public License for more details. |
3731 | # |
3732 | # You should have received a copy of the GNU General Public License |
3733 | -# along with this program; if not, write to the Free Software |
3734 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
3735 | -# 02110-1301, USA. |
3736 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
3737 | # |
3738 | # As a special exception to the GNU General Public License, if you |
3739 | # distribute this file as part of a program that contains a |
3740 | @@ -31,13 +30,16 @@ |
3741 | |
3742 | |
3743 | # Please send patches to <config-patches@gnu.org>. Submit a context |
3744 | -# diff and a properly formatted ChangeLog entry. |
3745 | +# diff and a properly formatted GNU ChangeLog entry. |
3746 | # |
3747 | # Configuration subroutine to validate and canonicalize a configuration type. |
3748 | # Supply the specified configuration type as an argument. |
3749 | # If it is invalid, we print an error message on stderr and exit with code 1. |
3750 | # Otherwise, we print the canonical config type on stdout and succeed. |
3751 | |
3752 | +# You can get the latest version of this script from: |
3753 | +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
3754 | + |
3755 | # This file is supposed to be the same for all GNU packages |
3756 | # and recognize all the CPU types, system types and aliases |
3757 | # that are meaningful with *any* GNU software. |
3758 | @@ -71,7 +73,8 @@ |
3759 | version="\ |
3760 | GNU config.sub ($timestamp) |
3761 | |
3762 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
3763 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
3764 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
3765 | Free Software Foundation, Inc. |
3766 | |
3767 | This is free software; see the source for copying conditions. There is NO |
3768 | @@ -119,11 +122,18 @@ |
3769 | # Here we must recognize all the valid KERNEL-OS combinations. |
3770 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
3771 | case $maybe_os in |
3772 | - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ |
3773 | - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) |
3774 | + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
3775 | + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
3776 | + knetbsd*-gnu* | netbsd*-gnu* | \ |
3777 | + kopensolaris*-gnu* | \ |
3778 | + storm-chaos* | os2-emx* | rtmk-nova*) |
3779 | os=-$maybe_os |
3780 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
3781 | ;; |
3782 | + android-linux) |
3783 | + os=-linux-android |
3784 | + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
3785 | + ;; |
3786 | *) |
3787 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
3788 | if [ $basic_machine != $1 ] |
3789 | @@ -146,10 +156,13 @@ |
3790 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
3791 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
3792 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
3793 | - -apple | -axis | -knuth | -cray) |
3794 | + -apple | -axis | -knuth | -cray | -microblaze) |
3795 | os= |
3796 | basic_machine=$1 |
3797 | ;; |
3798 | + -bluegene*) |
3799 | + os=-cnk |
3800 | + ;; |
3801 | -sim | -cisco | -oki | -wec | -winbond) |
3802 | os= |
3803 | basic_machine=$1 |
3804 | @@ -164,13 +177,17 @@ |
3805 | os=-chorusos |
3806 | basic_machine=$1 |
3807 | ;; |
3808 | - -chorusrdb) |
3809 | - os=-chorusrdb |
3810 | + -chorusrdb) |
3811 | + os=-chorusrdb |
3812 | basic_machine=$1 |
3813 | - ;; |
3814 | + ;; |
3815 | -hiux*) |
3816 | os=-hiuxwe2 |
3817 | ;; |
3818 | + -sco6) |
3819 | + os=-sco5v6 |
3820 | + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
3821 | + ;; |
3822 | -sco5) |
3823 | os=-sco3.2v5 |
3824 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
3825 | @@ -187,6 +204,10 @@ |
3826 | # Don't forget version if it is 3.2v4 or newer. |
3827 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
3828 | ;; |
3829 | + -sco5v6*) |
3830 | + # Don't forget version if it is 3.2v4 or newer. |
3831 | + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
3832 | + ;; |
3833 | -sco*) |
3834 | os=-sco3.2v2 |
3835 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
3836 | @@ -228,23 +249,32 @@ |
3837 | # Some are omitted here because they have special meanings below. |
3838 | 1750a | 580 \ |
3839 | | a29k \ |
3840 | + | aarch64 | aarch64_be \ |
3841 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
3842 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
3843 | | am33_2.0 \ |
3844 | - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ |
3845 | + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
3846 | + | be32 | be64 \ |
3847 | | bfin \ |
3848 | | c4x | clipper \ |
3849 | | d10v | d30v | dlx | dsp16xx \ |
3850 | - | fr30 | frv \ |
3851 | + | epiphany \ |
3852 | + | fido | fr30 | frv \ |
3853 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
3854 | + | hexagon \ |
3855 | | i370 | i860 | i960 | ia64 \ |
3856 | | ip2k | iq2000 \ |
3857 | - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ |
3858 | + | le32 | le64 \ |
3859 | + | lm32 \ |
3860 | + | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
3861 | + | maxq | mb | microblaze | mcore | mep | metag \ |
3862 | | mips | mipsbe | mipseb | mipsel | mipsle \ |
3863 | | mips16 \ |
3864 | | mips64 | mips64el \ |
3865 | + | mips64octeon | mips64octeonel \ |
3866 | + | mips64orion | mips64orionel \ |
3867 | + | mips64r5900 | mips64r5900el \ |
3868 | | mips64vr | mips64vrel \ |
3869 | - | mips64orion | mips64orionel \ |
3870 | | mips64vr4100 | mips64vr4100el \ |
3871 | | mips64vr4300 | mips64vr4300el \ |
3872 | | mips64vr5000 | mips64vr5000el \ |
3873 | @@ -257,35 +287,65 @@ |
3874 | | mipsisa64sr71k | mipsisa64sr71kel \ |
3875 | | mipstx39 | mipstx39el \ |
3876 | | mn10200 | mn10300 \ |
3877 | - | ms1 \ |
3878 | + | moxie \ |
3879 | + | mt \ |
3880 | | msp430 \ |
3881 | + | nds32 | nds32le | nds32be \ |
3882 | + | nios | nios2 \ |
3883 | | ns16k | ns32k \ |
3884 | + | open8 \ |
3885 | | or32 \ |
3886 | | pdp10 | pdp11 | pj | pjl \ |
3887 | - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
3888 | + | powerpc | powerpc64 | powerpc64le | powerpcle \ |
3889 | | pyramid \ |
3890 | - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ |
3891 | + | rl78 | rx \ |
3892 | + | score \ |
3893 | + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
3894 | | sh64 | sh64le \ |
3895 | - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ |
3896 | - | sparcv8 | sparcv9 | sparcv9b \ |
3897 | - | strongarm \ |
3898 | - | tahoe | thumb | tic4x | tic80 | tron \ |
3899 | - | v850 | v850e \ |
3900 | + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
3901 | + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
3902 | + | spu \ |
3903 | + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
3904 | + | ubicom32 \ |
3905 | + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
3906 | | we32k \ |
3907 | - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ |
3908 | - | z8k) |
3909 | - basic_machine=$basic_machine-unknown |
3910 | - ;; |
3911 | - m32c) |
3912 | - basic_machine=$basic_machine-unknown |
3913 | - ;; |
3914 | - m6811 | m68hc11 | m6812 | m68hc12) |
3915 | - # Motorola 68HC11/12. |
3916 | + | x86 | xc16x | xstormy16 | xtensa \ |
3917 | + | z8k | z80) |
3918 | + basic_machine=$basic_machine-unknown |
3919 | + ;; |
3920 | + c54x) |
3921 | + basic_machine=tic54x-unknown |
3922 | + ;; |
3923 | + c55x) |
3924 | + basic_machine=tic55x-unknown |
3925 | + ;; |
3926 | + c6x) |
3927 | + basic_machine=tic6x-unknown |
3928 | + ;; |
3929 | + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
3930 | basic_machine=$basic_machine-unknown |
3931 | os=-none |
3932 | ;; |
3933 | m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) |
3934 | ;; |
3935 | + ms1) |
3936 | + basic_machine=mt-unknown |
3937 | + ;; |
3938 | + |
3939 | + strongarm | thumb | xscale) |
3940 | + basic_machine=arm-unknown |
3941 | + ;; |
3942 | + xgate) |
3943 | + basic_machine=$basic_machine-unknown |
3944 | + os=-none |
3945 | + ;; |
3946 | + xscaleeb) |
3947 | + basic_machine=armeb-unknown |
3948 | + ;; |
3949 | + |
3950 | + xscaleel) |
3951 | + basic_machine=armel-unknown |
3952 | + ;; |
3953 | |
3954 | # We use `pc' rather than `unknown' |
3955 | # because (1) that's what they normally are, and |
3956 | @@ -301,29 +361,36 @@ |
3957 | # Recognize the basic CPU types with company name. |
3958 | 580-* \ |
3959 | | a29k-* \ |
3960 | + | aarch64-* | aarch64_be-* \ |
3961 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
3962 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
3963 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
3964 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
3965 | - | avr-* \ |
3966 | + | avr-* | avr32-* \ |
3967 | + | be32-* | be64-* \ |
3968 | | bfin-* | bs2000-* \ |
3969 | - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
3970 | + | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
3971 | | clipper-* | craynv-* | cydra-* \ |
3972 | | d10v-* | d30v-* | dlx-* \ |
3973 | | elxsi-* \ |
3974 | - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ |
3975 | + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
3976 | | h8300-* | h8500-* \ |
3977 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
3978 | + | hexagon-* \ |
3979 | | i*86-* | i860-* | i960-* | ia64-* \ |
3980 | | ip2k-* | iq2000-* \ |
3981 | - | m32r-* | m32rle-* \ |
3982 | + | le32-* | le64-* \ |
3983 | + | lm32-* \ |
3984 | + | m32c-* | m32r-* | m32rle-* \ |
3985 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
3986 | - | m88110-* | m88k-* | maxq-* | mcore-* \ |
3987 | + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
3988 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
3989 | | mips16-* \ |
3990 | | mips64-* | mips64el-* \ |
3991 | + | mips64octeon-* | mips64octeonel-* \ |
3992 | + | mips64orion-* | mips64orionel-* \ |
3993 | + | mips64r5900-* | mips64r5900el-* \ |
3994 | | mips64vr-* | mips64vrel-* \ |
3995 | - | mips64orion-* | mips64orionel-* \ |
3996 | | mips64vr4100-* | mips64vr4100el-* \ |
3997 | | mips64vr4300-* | mips64vr4300el-* \ |
3998 | | mips64vr5000-* | mips64vr5000el-* \ |
3999 | @@ -336,30 +403,38 @@ |
4000 | | mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
4001 | | mipstx39-* | mipstx39el-* \ |
4002 | | mmix-* \ |
4003 | - | ms1-* \ |
4004 | + | mt-* \ |
4005 | | msp430-* \ |
4006 | + | nds32-* | nds32le-* | nds32be-* \ |
4007 | + | nios-* | nios2-* \ |
4008 | | none-* | np1-* | ns16k-* | ns32k-* \ |
4009 | + | open8-* \ |
4010 | | orion-* \ |
4011 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
4012 | - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
4013 | + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
4014 | | pyramid-* \ |
4015 | - | romp-* | rs6000-* \ |
4016 | - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ |
4017 | + | rl78-* | romp-* | rs6000-* | rx-* \ |
4018 | + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
4019 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
4020 | - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ |
4021 | + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
4022 | | sparclite-* \ |
4023 | - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ |
4024 | - | tahoe-* | thumb-* \ |
4025 | + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
4026 | + | tahoe-* \ |
4027 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
4028 | + | tile*-* \ |
4029 | | tron-* \ |
4030 | - | v850-* | v850e-* | vax-* \ |
4031 | + | ubicom32-* \ |
4032 | + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
4033 | + | vax-* \ |
4034 | | we32k-* \ |
4035 | - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ |
4036 | - | xstormy16-* | xtensa-* \ |
4037 | + | x86-* | x86_64-* | xc16x-* | xps100-* \ |
4038 | + | xstormy16-* | xtensa*-* \ |
4039 | | ymp-* \ |
4040 | - | z8k-*) |
4041 | + | z8k-* | z80-*) |
4042 | ;; |
4043 | - m32c-*) |
4044 | + # Recognize the basic CPU types without company name, with glob match. |
4045 | + xtensa*) |
4046 | + basic_machine=$basic_machine-unknown |
4047 | ;; |
4048 | # Recognize the various machine names and aliases which stand |
4049 | # for a CPU type and a company and sometimes even an OS. |
4050 | @@ -377,7 +452,7 @@ |
4051 | basic_machine=a29k-amd |
4052 | os=-udi |
4053 | ;; |
4054 | - abacus) |
4055 | + abacus) |
4056 | basic_machine=abacus-unknown |
4057 | ;; |
4058 | adobe68k) |
4059 | @@ -423,6 +498,10 @@ |
4060 | basic_machine=m68k-apollo |
4061 | os=-bsd |
4062 | ;; |
4063 | + aros) |
4064 | + basic_machine=i386-pc |
4065 | + os=-aros |
4066 | + ;; |
4067 | aux) |
4068 | basic_machine=m68k-apple |
4069 | os=-aux |
4070 | @@ -431,10 +510,35 @@ |
4071 | basic_machine=ns32k-sequent |
4072 | os=-dynix |
4073 | ;; |
4074 | + blackfin) |
4075 | + basic_machine=bfin-unknown |
4076 | + os=-linux |
4077 | + ;; |
4078 | + blackfin-*) |
4079 | + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` |
4080 | + os=-linux |
4081 | + ;; |
4082 | + bluegene*) |
4083 | + basic_machine=powerpc-ibm |
4084 | + os=-cnk |
4085 | + ;; |
4086 | + c54x-*) |
4087 | + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` |
4088 | + ;; |
4089 | + c55x-*) |
4090 | + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` |
4091 | + ;; |
4092 | + c6x-*) |
4093 | + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` |
4094 | + ;; |
4095 | c90) |
4096 | basic_machine=c90-cray |
4097 | os=-unicos |
4098 | ;; |
4099 | + cegcc) |
4100 | + basic_machine=arm-unknown |
4101 | + os=-cegcc |
4102 | + ;; |
4103 | convex-c1) |
4104 | basic_machine=c1-convex |
4105 | os=-bsd |
4106 | @@ -463,8 +567,8 @@ |
4107 | basic_machine=craynv-cray |
4108 | os=-unicosmp |
4109 | ;; |
4110 | - cr16c) |
4111 | - basic_machine=cr16c-unknown |
4112 | + cr16 | cr16-*) |
4113 | + basic_machine=cr16-unknown |
4114 | os=-elf |
4115 | ;; |
4116 | crds | unos) |
4117 | @@ -502,6 +606,10 @@ |
4118 | basic_machine=m88k-motorola |
4119 | os=-sysv3 |
4120 | ;; |
4121 | + dicos) |
4122 | + basic_machine=i686-pc |
4123 | + os=-dicos |
4124 | + ;; |
4125 | djgpp) |
4126 | basic_machine=i586-pc |
4127 | os=-msdosdjgpp |
4128 | @@ -617,7 +725,6 @@ |
4129 | i370-ibm* | ibm*) |
4130 | basic_machine=i370-ibm |
4131 | ;; |
4132 | -# I'm not sure what "Sysv32" means. Should this be sysv3.2? |
4133 | i*86v32) |
4134 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
4135 | os=-sysv32 |
4136 | @@ -656,6 +763,14 @@ |
4137 | basic_machine=m68k-isi |
4138 | os=-sysv |
4139 | ;; |
4140 | + m68knommu) |
4141 | + basic_machine=m68k-unknown |
4142 | + os=-linux |
4143 | + ;; |
4144 | + m68knommu-*) |
4145 | + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` |
4146 | + os=-linux |
4147 | + ;; |
4148 | m88k-omron*) |
4149 | basic_machine=m88k-omron |
4150 | ;; |
4151 | @@ -667,10 +782,17 @@ |
4152 | basic_machine=ns32k-utek |
4153 | os=-sysv |
4154 | ;; |
4155 | + microblaze) |
4156 | + basic_machine=microblaze-xilinx |
4157 | + ;; |
4158 | mingw32) |
4159 | basic_machine=i386-pc |
4160 | os=-mingw32 |
4161 | ;; |
4162 | + mingw32ce) |
4163 | + basic_machine=arm-unknown |
4164 | + os=-mingw32ce |
4165 | + ;; |
4166 | miniframe) |
4167 | basic_machine=m68000-convergent |
4168 | ;; |
4169 | @@ -696,10 +818,21 @@ |
4170 | basic_machine=i386-pc |
4171 | os=-msdos |
4172 | ;; |
4173 | + ms1-*) |
4174 | + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
4175 | + ;; |
4176 | + msys) |
4177 | + basic_machine=i386-pc |
4178 | + os=-msys |
4179 | + ;; |
4180 | mvs) |
4181 | basic_machine=i370-ibm |
4182 | os=-mvs |
4183 | ;; |
4184 | + nacl) |
4185 | + basic_machine=le32-unknown |
4186 | + os=-nacl |
4187 | + ;; |
4188 | ncr3000) |
4189 | basic_machine=i486-ncr |
4190 | os=-sysv4 |
4191 | @@ -764,6 +897,12 @@ |
4192 | np1) |
4193 | basic_machine=np1-gould |
4194 | ;; |
4195 | + neo-tandem) |
4196 | + basic_machine=neo-tandem |
4197 | + ;; |
4198 | + nse-tandem) |
4199 | + basic_machine=nse-tandem |
4200 | + ;; |
4201 | nsr-tandem) |
4202 | basic_machine=nsr-tandem |
4203 | ;; |
4204 | @@ -794,6 +933,14 @@ |
4205 | basic_machine=i860-intel |
4206 | os=-osf |
4207 | ;; |
4208 | + parisc) |
4209 | + basic_machine=hppa-unknown |
4210 | + os=-linux |
4211 | + ;; |
4212 | + parisc-*) |
4213 | + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` |
4214 | + os=-linux |
4215 | + ;; |
4216 | pbd) |
4217 | basic_machine=sparc-tti |
4218 | ;; |
4219 | @@ -803,6 +950,12 @@ |
4220 | pc532 | pc532-*) |
4221 | basic_machine=ns32k-pc532 |
4222 | ;; |
4223 | + pc98) |
4224 | + basic_machine=i386-pc |
4225 | + ;; |
4226 | + pc98-*) |
4227 | + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` |
4228 | + ;; |
4229 | pentium | p5 | k5 | k6 | nexgen | viac3) |
4230 | basic_machine=i586-pc |
4231 | ;; |
4232 | @@ -832,9 +985,10 @@ |
4233 | ;; |
4234 | power) basic_machine=power-ibm |
4235 | ;; |
4236 | - ppc) basic_machine=powerpc-unknown |
4237 | + ppc | ppcbe) basic_machine=powerpc-unknown |
4238 | ;; |
4239 | - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
4240 | + ppc-* | ppcbe-*) |
4241 | + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
4242 | ;; |
4243 | ppcle | powerpclittle | ppc-le | powerpc-little) |
4244 | basic_machine=powerpcle-unknown |
4245 | @@ -859,6 +1013,10 @@ |
4246 | basic_machine=i586-unknown |
4247 | os=-pw32 |
4248 | ;; |
4249 | + rdos) |
4250 | + basic_machine=i386-pc |
4251 | + os=-rdos |
4252 | + ;; |
4253 | rom68k) |
4254 | basic_machine=m68k-rom68k |
4255 | os=-coff |
4256 | @@ -885,6 +1043,10 @@ |
4257 | sb1el) |
4258 | basic_machine=mipsisa64sb1el-unknown |
4259 | ;; |
4260 | + sde) |
4261 | + basic_machine=mipsisa32-sde |
4262 | + os=-elf |
4263 | + ;; |
4264 | sei) |
4265 | basic_machine=mips-sei |
4266 | os=-seiux |
4267 | @@ -896,6 +1058,9 @@ |
4268 | basic_machine=sh-hitachi |
4269 | os=-hms |
4270 | ;; |
4271 | + sh5el) |
4272 | + basic_machine=sh5le-unknown |
4273 | + ;; |
4274 | sh64) |
4275 | basic_machine=sh64-unknown |
4276 | ;; |
4277 | @@ -917,6 +1082,9 @@ |
4278 | basic_machine=i860-stratus |
4279 | os=-sysv4 |
4280 | ;; |
4281 | + strongarm-* | thumb-*) |
4282 | + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` |
4283 | + ;; |
4284 | sun2) |
4285 | basic_machine=m68000-sun |
4286 | ;; |
4287 | @@ -973,17 +1141,9 @@ |
4288 | basic_machine=t90-cray |
4289 | os=-unicos |
4290 | ;; |
4291 | - tic54x | c54x*) |
4292 | - basic_machine=tic54x-unknown |
4293 | - os=-coff |
4294 | - ;; |
4295 | - tic55x | c55x*) |
4296 | - basic_machine=tic55x-unknown |
4297 | - os=-coff |
4298 | - ;; |
4299 | - tic6x | c6x*) |
4300 | - basic_machine=tic6x-unknown |
4301 | - os=-coff |
4302 | + tile*) |
4303 | + basic_machine=$basic_machine-unknown |
4304 | + os=-linux-gnu |
4305 | ;; |
4306 | tx39) |
4307 | basic_machine=mipstx39-unknown |
4308 | @@ -1052,6 +1212,9 @@ |
4309 | xps | xps100) |
4310 | basic_machine=xps100-honeywell |
4311 | ;; |
4312 | + xscale-* | xscalee[bl]-*) |
4313 | + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` |
4314 | + ;; |
4315 | ymp) |
4316 | basic_machine=ymp-cray |
4317 | os=-unicos |
4318 | @@ -1060,6 +1223,10 @@ |
4319 | basic_machine=z8k-unknown |
4320 | os=-sim |
4321 | ;; |
4322 | + z80-*-coff) |
4323 | + basic_machine=z80-unknown |
4324 | + os=-sim |
4325 | + ;; |
4326 | none) |
4327 | basic_machine=none-none |
4328 | os=-none |
4329 | @@ -1098,10 +1265,10 @@ |
4330 | we32k) |
4331 | basic_machine=we32k-att |
4332 | ;; |
4333 | - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) |
4334 | + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) |
4335 | basic_machine=sh-unknown |
4336 | ;; |
4337 | - sparc | sparcv8 | sparcv9 | sparcv9b) |
4338 | + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) |
4339 | basic_machine=sparc-sun |
4340 | ;; |
4341 | cydra) |
4342 | @@ -1145,9 +1312,12 @@ |
4343 | if [ x"$os" != x"" ] |
4344 | then |
4345 | case $os in |
4346 | - # First match some system type aliases |
4347 | - # that might get confused with valid system types. |
4348 | + # First match some system type aliases |
4349 | + # that might get confused with valid system types. |
4350 | # -solaris* is a basic system type, with this one exception. |
4351 | + -auroraux) |
4352 | + os=-auroraux |
4353 | + ;; |
4354 | -solaris1 | -solaris1.*) |
4355 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
4356 | ;; |
4357 | @@ -1168,27 +1338,31 @@ |
4358 | # Each alternative MUST END IN A *, to match a version number. |
4359 | # -sysv* is not here because it comes later, after sysvr4. |
4360 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
4361 | - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ |
4362 | - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ |
4363 | + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
4364 | + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
4365 | + | -sym* | -kopensolaris* \ |
4366 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
4367 | - | -aos* \ |
4368 | + | -aos* | -aros* \ |
4369 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
4370 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
4371 | - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ |
4372 | + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ |
4373 | + | -openbsd* | -solidbsd* \ |
4374 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
4375 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
4376 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
4377 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
4378 | - | -chorusos* | -chorusrdb* \ |
4379 | - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
4380 | - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ |
4381 | + | -chorusos* | -chorusrdb* | -cegcc* \ |
4382 | + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
4383 | + | -mingw32* | -linux-gnu* | -linux-android* \ |
4384 | + | -linux-newlib* | -linux-uclibc* \ |
4385 | + | -uxpv* | -beos* | -mpeix* | -udk* \ |
4386 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
4387 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
4388 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
4389 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
4390 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
4391 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
4392 | - | -skyos* | -haiku*) |
4393 | + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
4394 | # Remember, each alternative MUST END IN *, to match a version number. |
4395 | ;; |
4396 | -qnx*) |
4397 | @@ -1227,7 +1401,7 @@ |
4398 | -opened*) |
4399 | os=-openedition |
4400 | ;; |
4401 | - -os400*) |
4402 | + -os400*) |
4403 | os=-os400 |
4404 | ;; |
4405 | -wince*) |
4406 | @@ -1276,7 +1450,7 @@ |
4407 | -sinix*) |
4408 | os=-sysv4 |
4409 | ;; |
4410 | - -tpf*) |
4411 | + -tpf*) |
4412 | os=-tpf |
4413 | ;; |
4414 | -triton*) |
4415 | @@ -1318,6 +1492,11 @@ |
4416 | -zvmoe) |
4417 | os=-zvmoe |
4418 | ;; |
4419 | + -dicos*) |
4420 | + os=-dicos |
4421 | + ;; |
4422 | + -nacl*) |
4423 | + ;; |
4424 | -none) |
4425 | ;; |
4426 | *) |
4427 | @@ -1340,6 +1519,12 @@ |
4428 | # system, and we'll never get to this point. |
4429 | |
4430 | case $basic_machine in |
4431 | + score-*) |
4432 | + os=-elf |
4433 | + ;; |
4434 | + spu-*) |
4435 | + os=-elf |
4436 | + ;; |
4437 | *-acorn) |
4438 | os=-riscix1.2 |
4439 | ;; |
4440 | @@ -1349,9 +1534,18 @@ |
4441 | arm*-semi) |
4442 | os=-aout |
4443 | ;; |
4444 | - c4x-* | tic4x-*) |
4445 | - os=-coff |
4446 | - ;; |
4447 | + c4x-* | tic4x-*) |
4448 | + os=-coff |
4449 | + ;; |
4450 | + tic54x-*) |
4451 | + os=-coff |
4452 | + ;; |
4453 | + tic55x-*) |
4454 | + os=-coff |
4455 | + ;; |
4456 | + tic6x-*) |
4457 | + os=-coff |
4458 | + ;; |
4459 | # This must come before the *-dec entry. |
4460 | pdp10-*) |
4461 | os=-tops20 |
4462 | @@ -1370,13 +1564,13 @@ |
4463 | ;; |
4464 | m68000-sun) |
4465 | os=-sunos3 |
4466 | - # This also exists in the configure program, but was not the |
4467 | - # default. |
4468 | - # os=-sunos4 |
4469 | ;; |
4470 | m68*-cisco) |
4471 | os=-aout |
4472 | ;; |
4473 | + mep-*) |
4474 | + os=-elf |
4475 | + ;; |
4476 | mips*-cisco) |
4477 | os=-elf |
4478 | ;; |
4479 | @@ -1401,7 +1595,7 @@ |
4480 | *-ibm) |
4481 | os=-aix |
4482 | ;; |
4483 | - *-knuth) |
4484 | + *-knuth) |
4485 | os=-mmixware |
4486 | ;; |
4487 | *-wec) |
4488 | @@ -1506,7 +1700,7 @@ |
4489 | -sunos*) |
4490 | vendor=sun |
4491 | ;; |
4492 | - -aix*) |
4493 | + -cnk*|-aix*) |
4494 | vendor=ibm |
4495 | ;; |
4496 | -beos*) |
4497 | |
4498 | === modified file 'configure' |
4499 | --- configure 2012-06-30 15:21:33 +0000 |
4500 | +++ configure 2015-03-03 21:10:41 +0000 |
4501 | @@ -1,6 +1,6 @@ |
4502 | #! /bin/sh |
4503 | # Guess values for system-dependent variables and create Makefiles. |
4504 | -# Generated by GNU Autoconf 2.61 for xfce4-diskperf-plugin 2.5.4. |
4505 | +# Generated by GNU Autoconf 2.63 for xfce4-diskperf-plugin 2.5.5. |
4506 | # |
4507 | # Report bugs to <http://bugzilla.xfce.org/>. |
4508 | # |
4509 | @@ -8,7 +8,7 @@ |
4510 | # The Xfce development team. All rights reserved. |
4511 | # |
4512 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
4513 | -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
4514 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4515 | # This configure script is free software; the Free Software Foundation |
4516 | # gives unlimited permission to copy, distribute and modify it. |
4517 | ## --------------------- ## |
4518 | @@ -20,7 +20,7 @@ |
4519 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
4520 | emulate sh |
4521 | NULLCMD=: |
4522 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which |
4523 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
4524 | # is contrary to our usage. Disable this feature. |
4525 | alias -g '${1+"$@"}'='"$@"' |
4526 | setopt NO_GLOB_SUBST |
4527 | @@ -42,17 +42,45 @@ |
4528 | as_cr_digits='0123456789' |
4529 | as_cr_alnum=$as_cr_Letters$as_cr_digits |
4530 | |
4531 | +as_nl=' |
4532 | +' |
4533 | +export as_nl |
4534 | +# Printing a long string crashes Solaris 7 /usr/bin/printf. |
4535 | +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
4536 | +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo |
4537 | +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo |
4538 | +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then |
4539 | + as_echo='printf %s\n' |
4540 | + as_echo_n='printf %s' |
4541 | +else |
4542 | + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then |
4543 | + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' |
4544 | + as_echo_n='/usr/ucb/echo -n' |
4545 | + else |
4546 | + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' |
4547 | + as_echo_n_body='eval |
4548 | + arg=$1; |
4549 | + case $arg in |
4550 | + *"$as_nl"*) |
4551 | + expr "X$arg" : "X\\(.*\\)$as_nl"; |
4552 | + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; |
4553 | + esac; |
4554 | + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" |
4555 | + ' |
4556 | + export as_echo_n_body |
4557 | + as_echo_n='sh -c $as_echo_n_body as_echo' |
4558 | + fi |
4559 | + export as_echo_body |
4560 | + as_echo='sh -c $as_echo_body as_echo' |
4561 | +fi |
4562 | + |
4563 | # The user is always right. |
4564 | if test "${PATH_SEPARATOR+set}" != set; then |
4565 | - echo "#! /bin/sh" >conf$$.sh |
4566 | - echo "exit 0" >>conf$$.sh |
4567 | - chmod +x conf$$.sh |
4568 | - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
4569 | - PATH_SEPARATOR=';' |
4570 | - else |
4571 | - PATH_SEPARATOR=: |
4572 | - fi |
4573 | - rm -f conf$$.sh |
4574 | + PATH_SEPARATOR=: |
4575 | + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { |
4576 | + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || |
4577 | + PATH_SEPARATOR=';' |
4578 | + } |
4579 | fi |
4580 | |
4581 | # Support unset when possible. |
4582 | @@ -68,8 +96,6 @@ |
4583 | # there to prevent editors from complaining about space-tab. |
4584 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word |
4585 | # splitting by setting IFS to empty value.) |
4586 | -as_nl=' |
4587 | -' |
4588 | IFS=" "" $as_nl" |
4589 | |
4590 | # Find who we are. Look in the path if we contain no directory separator. |
4591 | @@ -92,7 +118,7 @@ |
4592 | as_myself=$0 |
4593 | fi |
4594 | if test ! -f "$as_myself"; then |
4595 | - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 |
4596 | + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 |
4597 | { (exit 1); exit 1; } |
4598 | fi |
4599 | |
4600 | @@ -105,17 +131,10 @@ |
4601 | PS4='+ ' |
4602 | |
4603 | # NLS nuisances. |
4604 | -for as_var in \ |
4605 | - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ |
4606 | - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ |
4607 | - LC_TELEPHONE LC_TIME |
4608 | -do |
4609 | - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then |
4610 | - eval $as_var=C; export $as_var |
4611 | - else |
4612 | - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var |
4613 | - fi |
4614 | -done |
4615 | +LC_ALL=C |
4616 | +export LC_ALL |
4617 | +LANGUAGE=C |
4618 | +export LANGUAGE |
4619 | |
4620 | # Required to use basename. |
4621 | if expr a : '\(a\)' >/dev/null 2>&1 && |
4622 | @@ -137,7 +156,7 @@ |
4623 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ |
4624 | X"$0" : 'X\(//\)$' \| \ |
4625 | X"$0" : 'X\(/\)' \| . 2>/dev/null || |
4626 | -echo X/"$0" | |
4627 | +$as_echo X/"$0" | |
4628 | sed '/^.*\/\([^/][^/]*\)\/*$/{ |
4629 | s//\1/ |
4630 | q |
4631 | @@ -163,7 +182,7 @@ |
4632 | as_have_required=no |
4633 | fi |
4634 | |
4635 | - if test $as_have_required = yes && (eval ": |
4636 | + if test $as_have_required = yes && (eval ": |
4637 | (as_func_return () { |
4638 | (exit \$1) |
4639 | } |
4640 | @@ -254,7 +273,7 @@ |
4641 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
4642 | emulate sh |
4643 | NULLCMD=: |
4644 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which |
4645 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
4646 | # is contrary to our usage. Disable this feature. |
4647 | alias -g '${1+"$@"}'='"$@"' |
4648 | setopt NO_GLOB_SUBST |
4649 | @@ -275,7 +294,7 @@ |
4650 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
4651 | emulate sh |
4652 | NULLCMD=: |
4653 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which |
4654 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
4655 | # is contrary to our usage. Disable this feature. |
4656 | alias -g '${1+"$@"}'='"$@"' |
4657 | setopt NO_GLOB_SUBST |
4658 | @@ -364,10 +383,10 @@ |
4659 | |
4660 | if test "x$CONFIG_SHELL" != x; then |
4661 | for as_var in BASH_ENV ENV |
4662 | - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var |
4663 | - done |
4664 | - export CONFIG_SHELL |
4665 | - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
4666 | + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var |
4667 | + done |
4668 | + export CONFIG_SHELL |
4669 | + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
4670 | fi |
4671 | |
4672 | |
4673 | @@ -436,9 +455,10 @@ |
4674 | |
4675 | test \$exitcode = 0") || { |
4676 | echo No shell found that supports shell functions. |
4677 | - echo Please tell autoconf@gnu.org about your system, |
4678 | - echo including any error possibly output before this |
4679 | - echo message |
4680 | + echo Please tell bug-autoconf@gnu.org about your system, |
4681 | + echo including any error possibly output before this message. |
4682 | + echo This can help us improve future autoconf versions. |
4683 | + echo Configuration will now proceed without shell functions. |
4684 | } |
4685 | |
4686 | |
4687 | @@ -474,7 +494,7 @@ |
4688 | s/-\n.*// |
4689 | ' >$as_me.lineno && |
4690 | chmod +x "$as_me.lineno" || |
4691 | - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 |
4692 | + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 |
4693 | { (exit 1); exit 1; }; } |
4694 | |
4695 | # Don't try to exec as it changes $[0], causing all sort of problems |
4696 | @@ -502,7 +522,6 @@ |
4697 | *) |
4698 | ECHO_N='-n';; |
4699 | esac |
4700 | - |
4701 | if expr a : '\(a\)' >/dev/null 2>&1 && |
4702 | test "X`expr 00001 : '.*\(...\)'`" = X001; then |
4703 | as_expr=expr |
4704 | @@ -515,19 +534,22 @@ |
4705 | rm -f conf$$.dir/conf$$.file |
4706 | else |
4707 | rm -f conf$$.dir |
4708 | - mkdir conf$$.dir |
4709 | + mkdir conf$$.dir 2>/dev/null |
4710 | fi |
4711 | -echo >conf$$.file |
4712 | -if ln -s conf$$.file conf$$ 2>/dev/null; then |
4713 | - as_ln_s='ln -s' |
4714 | - # ... but there are two gotchas: |
4715 | - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
4716 | - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
4717 | - # In both cases, we have to default to `cp -p'. |
4718 | - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
4719 | +if (echo >conf$$.file) 2>/dev/null; then |
4720 | + if ln -s conf$$.file conf$$ 2>/dev/null; then |
4721 | + as_ln_s='ln -s' |
4722 | + # ... but there are two gotchas: |
4723 | + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
4724 | + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
4725 | + # In both cases, we have to default to `cp -p'. |
4726 | + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
4727 | + as_ln_s='cp -p' |
4728 | + elif ln conf$$.file conf$$ 2>/dev/null; then |
4729 | + as_ln_s=ln |
4730 | + else |
4731 | as_ln_s='cp -p' |
4732 | -elif ln conf$$.file conf$$ 2>/dev/null; then |
4733 | - as_ln_s=ln |
4734 | + fi |
4735 | else |
4736 | as_ln_s='cp -p' |
4737 | fi |
4738 | @@ -552,10 +574,10 @@ |
4739 | as_test_x=' |
4740 | eval sh -c '\'' |
4741 | if test -d "$1"; then |
4742 | - test -d "$1/."; |
4743 | + test -d "$1/."; |
4744 | else |
4745 | case $1 in |
4746 | - -*)set "./$1";; |
4747 | + -*)set "./$1";; |
4748 | esac; |
4749 | case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in |
4750 | ???[sx]*):;;*)false;;esac;fi |
4751 | @@ -597,8 +619,8 @@ |
4752 | # Identity of this package. |
4753 | PACKAGE_NAME='xfce4-diskperf-plugin' |
4754 | PACKAGE_TARNAME='xfce4-diskperf-plugin' |
4755 | -PACKAGE_VERSION='2.5.4' |
4756 | -PACKAGE_STRING='xfce4-diskperf-plugin 2.5.4' |
4757 | +PACKAGE_VERSION='2.5.5' |
4758 | +PACKAGE_STRING='xfce4-diskperf-plugin 2.5.5' |
4759 | PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' |
4760 | |
4761 | # Factoring default headers for most tests. |
4762 | @@ -637,180 +659,202 @@ |
4763 | # include <unistd.h> |
4764 | #endif" |
4765 | |
4766 | -ac_subst_vars='SHELL |
4767 | +ac_subst_vars='am__EXEEXT_FALSE |
4768 | +am__EXEEXT_TRUE |
4769 | +LTLIBOBJS |
4770 | +LIBOBJS |
4771 | +LIBXFCE4UI_REQUIRED_VERSION |
4772 | +LIBXFCE4UI_LIBS |
4773 | +LIBXFCE4UI_CFLAGS |
4774 | +LIBXFCE4UI_VERSION |
4775 | +LIBXFCE4PANEL_REQUIRED_VERSION |
4776 | +LIBXFCE4PANEL_LIBS |
4777 | +LIBXFCE4PANEL_CFLAGS |
4778 | +LIBXFCE4PANEL_VERSION |
4779 | +PKG_CONFIG_LIBDIR |
4780 | +PKG_CONFIG_PATH |
4781 | +PKG_CONFIG |
4782 | +XGETTEXT_ARGS |
4783 | +MKINSTALLDIRS |
4784 | +POSUB |
4785 | +POFILES |
4786 | +PO_IN_DATADIR_FALSE |
4787 | +PO_IN_DATADIR_TRUE |
4788 | +INTLLIBS |
4789 | +INSTOBJEXT |
4790 | +GMOFILES |
4791 | +CATOBJEXT |
4792 | +CATALOGS |
4793 | +MSGFMT_OPTS |
4794 | +GETTEXT_PACKAGE |
4795 | +LIBM |
4796 | +CPP |
4797 | +OTOOL64 |
4798 | +OTOOL |
4799 | +LIPO |
4800 | +NMEDIT |
4801 | +DSYMUTIL |
4802 | +MANIFEST_TOOL |
4803 | +RANLIB |
4804 | +ac_ct_AR |
4805 | +AR |
4806 | +DLLTOOL |
4807 | +OBJDUMP |
4808 | +LN_S |
4809 | +NM |
4810 | +ac_ct_DUMPBIN |
4811 | +DUMPBIN |
4812 | +LIBTOOL |
4813 | +DATADIRNAME |
4814 | +ALL_LINGUAS |
4815 | +INTLTOOL_PERL |
4816 | +GMSGFMT |
4817 | +MSGFMT |
4818 | +MSGMERGE |
4819 | +XGETTEXT |
4820 | +INTLTOOL_POLICY_RULE |
4821 | +INTLTOOL_SERVICE_RULE |
4822 | +INTLTOOL_THEME_RULE |
4823 | +INTLTOOL_SCHEMAS_RULE |
4824 | +INTLTOOL_CAVES_RULE |
4825 | +INTLTOOL_XML_NOMERGE_RULE |
4826 | +INTLTOOL_XML_RULE |
4827 | +INTLTOOL_KBD_RULE |
4828 | +INTLTOOL_XAM_RULE |
4829 | +INTLTOOL_UI_RULE |
4830 | +INTLTOOL_SOUNDLIST_RULE |
4831 | +INTLTOOL_SHEET_RULE |
4832 | +INTLTOOL_SERVER_RULE |
4833 | +INTLTOOL_PONG_RULE |
4834 | +INTLTOOL_OAF_RULE |
4835 | +INTLTOOL_PROP_RULE |
4836 | +INTLTOOL_KEYS_RULE |
4837 | +INTLTOOL_DIRECTORY_RULE |
4838 | +INTLTOOL_DESKTOP_RULE |
4839 | +intltool__v_merge_options_0 |
4840 | +intltool__v_merge_options_ |
4841 | +INTLTOOL_V_MERGE_OPTIONS |
4842 | +INTLTOOL__v_MERGE_0 |
4843 | +INTLTOOL__v_MERGE_ |
4844 | +INTLTOOL_V_MERGE |
4845 | +AM_DEFAULT_VERBOSITY |
4846 | +INTLTOOL_EXTRACT |
4847 | +INTLTOOL_MERGE |
4848 | +INTLTOOL_UPDATE |
4849 | +USE_NLS |
4850 | +LD |
4851 | +FGREP |
4852 | +EGREP |
4853 | +GREP |
4854 | +SED |
4855 | +am__fastdepCC_FALSE |
4856 | +am__fastdepCC_TRUE |
4857 | +CCDEPMODE |
4858 | +am__nodep |
4859 | +AMDEPBACKSLASH |
4860 | +AMDEP_FALSE |
4861 | +AMDEP_TRUE |
4862 | +am__quote |
4863 | +am__include |
4864 | +DEPDIR |
4865 | +OBJEXT |
4866 | +EXEEXT |
4867 | +ac_ct_CC |
4868 | +CPPFLAGS |
4869 | +LDFLAGS |
4870 | +CFLAGS |
4871 | +CC |
4872 | +MAINT |
4873 | +MAINTAINER_MODE_FALSE |
4874 | +MAINTAINER_MODE_TRUE |
4875 | +am__untar |
4876 | +am__tar |
4877 | +AMTAR |
4878 | +am__leading_dot |
4879 | +SET_MAKE |
4880 | +AWK |
4881 | +mkdir_p |
4882 | +MKDIR_P |
4883 | +INSTALL_STRIP_PROGRAM |
4884 | +STRIP |
4885 | +install_sh |
4886 | +MAKEINFO |
4887 | +AUTOHEADER |
4888 | +AUTOMAKE |
4889 | +AUTOCONF |
4890 | +ACLOCAL |
4891 | +VERSION |
4892 | +PACKAGE |
4893 | +CYGPATH_W |
4894 | +am__isrc |
4895 | +INSTALL_DATA |
4896 | +INSTALL_SCRIPT |
4897 | +INSTALL_PROGRAM |
4898 | +target_os |
4899 | +target_vendor |
4900 | +target_cpu |
4901 | +target |
4902 | +host_os |
4903 | +host_vendor |
4904 | +host_cpu |
4905 | +host |
4906 | +build_os |
4907 | +build_vendor |
4908 | +build_cpu |
4909 | +build |
4910 | +target_alias |
4911 | +host_alias |
4912 | +build_alias |
4913 | +LIBS |
4914 | +ECHO_T |
4915 | +ECHO_N |
4916 | +ECHO_C |
4917 | +DEFS |
4918 | +mandir |
4919 | +localedir |
4920 | +libdir |
4921 | +psdir |
4922 | +pdfdir |
4923 | +dvidir |
4924 | +htmldir |
4925 | +infodir |
4926 | +docdir |
4927 | +oldincludedir |
4928 | +includedir |
4929 | +localstatedir |
4930 | +sharedstatedir |
4931 | +sysconfdir |
4932 | +datadir |
4933 | +datarootdir |
4934 | +libexecdir |
4935 | +sbindir |
4936 | +bindir |
4937 | +program_transform_name |
4938 | +prefix |
4939 | +exec_prefix |
4940 | +PACKAGE_BUGREPORT |
4941 | +PACKAGE_STRING |
4942 | +PACKAGE_VERSION |
4943 | +PACKAGE_TARNAME |
4944 | +PACKAGE_NAME |
4945 | PATH_SEPARATOR |
4946 | -PACKAGE_NAME |
4947 | -PACKAGE_TARNAME |
4948 | -PACKAGE_VERSION |
4949 | -PACKAGE_STRING |
4950 | -PACKAGE_BUGREPORT |
4951 | -exec_prefix |
4952 | -prefix |
4953 | -program_transform_name |
4954 | -bindir |
4955 | -sbindir |
4956 | -libexecdir |
4957 | -datarootdir |
4958 | -datadir |
4959 | -sysconfdir |
4960 | -sharedstatedir |
4961 | -localstatedir |
4962 | -includedir |
4963 | -oldincludedir |
4964 | -docdir |
4965 | -infodir |
4966 | -htmldir |
4967 | -dvidir |
4968 | -pdfdir |
4969 | -psdir |
4970 | -libdir |
4971 | -localedir |
4972 | -mandir |
4973 | -DEFS |
4974 | -ECHO_C |
4975 | -ECHO_N |
4976 | -ECHO_T |
4977 | -LIBS |
4978 | -build_alias |
4979 | -host_alias |
4980 | -target_alias |
4981 | -build |
4982 | -build_cpu |
4983 | -build_vendor |
4984 | -build_os |
4985 | -host |
4986 | -host_cpu |
4987 | -host_vendor |
4988 | -host_os |
4989 | -target |
4990 | -target_cpu |
4991 | -target_vendor |
4992 | -target_os |
4993 | -INSTALL_PROGRAM |
4994 | -INSTALL_SCRIPT |
4995 | -INSTALL_DATA |
4996 | -CYGPATH_W |
4997 | -PACKAGE |
4998 | -VERSION |
4999 | -ACLOCAL |
5000 | -AUTOCONF |
The diff has been truncated for viewing.
Looking good, sponsoring :)