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