Merge lp:~noskcaj/ubuntu/utopic/xfce4-eyes-plugin/4.4.2 into lp:ubuntu/utopic/xfce4-eyes-plugin
- Utopic (14.10)
- 4.4.2
- Merge into utopic
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merge reported by: | Martin Pitt |
Merged at revision: | not available |
Proposed branch: | lp:~noskcaj/ubuntu/utopic/xfce4-eyes-plugin/4.4.2 |
Merge into: | lp:ubuntu/utopic/xfce4-eyes-plugin |
Diff against target: |
16796 lines (+6462/-3333) 97 files modified
AUTHORS (+1/-0) COPYING (+20/-21) ChangeLog (+545/-0) INSTALL (+10/-5) Makefile.am (+12/-0) Makefile.in (+221/-157) NEWS (+15/-3) README (+120/-3) aclocal.m4 (+880/-568) compile (+347/-0) config.guess (+211/-162) config.h.in (+3/-0) config.sub (+200/-98) configure (+1204/-602) configure.ac (+14/-13) debian/changelog (+7/-0) debian/control (+4/-4) depcomp (+346/-186) icons/48x48/Makefile.in (+88/-32) icons/Makefile.in (+148/-117) install-sh (+21/-14) ltmain.sh (+57/-38) missing (+159/-320) mkinstalldirs (+2/-2) panel-plugin/Makefile.am (+24/-23) panel-plugin/Makefile.in (+257/-199) panel-plugin/eyes.c (+155/-72) panel-plugin/eyes.desktop.in (+8/-0) panel-plugin/eyes.desktop.in.in (+0/-7) panel-plugin/eyes.h (+5/-3) panel-plugin/themes.c (+6/-3) panel-plugin/themes.h (+4/-3) po/Makefile.in.in (+9/-4) po/POTFILES.in (+1/-1) po/ar.po (+16/-9) po/ast.po (+9/-4) po/az.po (+9/-4) po/be.po (+10/-7) po/bg.po (+11/-6) po/bn_IN.po (+9/-4) po/ca.po (+9/-4) po/cs.po (+9/-6) po/da.po (+10/-5) po/de.po (+9/-4) po/el.po (+9/-5) po/en_GB.po (+12/-8) po/eo.po (+16/-3) po/es.po (+9/-6) po/es_MX.po (+9/-4) po/et.po (+9/-4) po/eu.po (+9/-4) po/fa.po (+9/-4) po/fi.po (+9/-4) po/fr.po (+10/-7) po/gl.po (+9/-6) po/gu.po (+9/-4) po/he.po (+15/-9) po/hi.po (+15/-8) po/hu.po (+11/-7) po/id.po (+9/-4) po/it.po (+10/-5) po/ja.po (+18/-14) po/kk.po (+8/-6) po/ko.po (+12/-8) po/lt.po (+11/-6) po/lv.po (+9/-6) po/mr.po (+9/-4) po/ms.po (+9/-4) po/nb.po (+9/-4) po/nl.po (+21/-14) po/pa.po (+9/-4) po/pl.po (+13/-8) po/pt.po (+13/-10) po/pt_BR.po (+10/-7) po/ro.po (+19/-14) po/ru.po (+16/-11) po/sk.po (+9/-4) po/sq.po (+9/-6) po/sr.po (+34/-0) po/sv.po (+9/-6) po/ta.po (+9/-4) po/tr.po (+9/-6) po/ug.po (+33/-29) po/uk.po (+11/-6) po/ur.po (+9/-6) po/ur_PK.po (+9/-6) po/vi.po (+9/-4) po/zh_CN.po (+22/-18) po/zh_HK.po (+32/-0) po/zh_TW.po (+15/-10) themes/Bizarre/Makefile.in (+89/-32) themes/Bloodshot/Makefile.in (+89/-32) themes/Default-tiny/Makefile.in (+82/-26) themes/Default/Makefile.in (+89/-32) themes/Horrid/Makefile.in (+89/-32) themes/Makefile.in (+146/-117) themes/Tango/Makefile.in (+89/-32) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/utopic/xfce4-eyes-plugin/4.4.2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt | Approve | ||
Review via email: mp+221146@code.launchpad.net |
Commit message
Description of the change
New upstream 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 'AUTHORS' |
2 | --- AUTHORS 2007-09-03 13:16:34 +0000 |
3 | +++ AUTHORS 2014-05-27 22:31:05 +0000 |
4 | @@ -1,3 +1,4 @@ |
5 | Benedikt Meurer <benedikt.meurer@unix-ag.uni-siegen.de> |
6 | Danny Milosavljevic <danny_milo@yahoo.com> |
7 | Nick Schermer <nick@xfce.org> |
8 | +Harald Judt <h.judt@gmx.at> |
9 | |
10 | === modified file 'COPYING' |
11 | --- COPYING 2007-09-03 13:16:34 +0000 |
12 | +++ COPYING 2014-05-27 22:31:05 +0000 |
13 | @@ -1,12 +1,12 @@ |
14 | - GNU GENERAL PUBLIC LICENSE |
15 | - Version 2, June 1991 |
16 | + GNU GENERAL PUBLIC LICENSE |
17 | + Version 2, June 1991 |
18 | |
19 | - Copyright (C) 1989, 1991 Free Software Foundation, Inc. |
20 | - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 | + Copyright (C) 1989, 1991 Free Software Foundation, Inc., |
22 | + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
23 | Everyone is permitted to copy and distribute verbatim copies |
24 | of this license document, but changing it is not allowed. |
25 | |
26 | - Preamble |
27 | + Preamble |
28 | |
29 | The licenses for most software are designed to take away your |
30 | freedom to share and change it. By contrast, the GNU General Public |
31 | @@ -15,7 +15,7 @@ |
32 | General Public License applies to most of the Free Software |
33 | Foundation's software and to any other program whose authors commit to |
34 | using it. (Some other Free Software Foundation software is covered by |
35 | -the GNU Library General Public License instead.) You can apply it to |
36 | +the GNU Lesser General Public License instead.) You can apply it to |
37 | your programs, too. |
38 | |
39 | When we speak of free software, we are referring to freedom, not |
40 | @@ -55,8 +55,8 @@ |
41 | |
42 | The precise terms and conditions for copying, distribution and |
43 | modification follow. |
44 | - |
45 | |
46 | - GNU GENERAL PUBLIC LICENSE |
47 | + |
48 | + GNU GENERAL PUBLIC LICENSE |
49 | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION |
50 | |
51 | 0. This License applies to any program or other work which contains |
52 | @@ -110,7 +110,7 @@ |
53 | License. (Exception: if the Program itself is interactive but |
54 | does not normally print such an announcement, your work based on |
55 | the Program is not required to print an announcement.) |
56 | - |
57 | |
58 | + |
59 | These requirements apply to the modified work as a whole. If |
60 | identifiable sections of that work are not derived from the Program, |
61 | and can be reasonably considered independent and separate works in |
62 | @@ -168,7 +168,7 @@ |
63 | access to copy the source code from the same place counts as |
64 | distribution of the source code, even though third parties are not |
65 | compelled to copy the source along with the object code. |
66 | - |
67 | |
68 | + |
69 | 4. You may not copy, modify, sublicense, or distribute the Program |
70 | except as expressly provided under this License. Any attempt |
71 | otherwise to copy, modify, sublicense or distribute the Program is |
72 | @@ -225,7 +225,7 @@ |
73 | |
74 | This section is intended to make thoroughly clear what is believed to |
75 | be a consequence of the rest of this License. |
76 | - |
77 | |
78 | + |
79 | 8. If the distribution and/or use of the Program is restricted in |
80 | certain countries either by patents or by copyrighted interfaces, the |
81 | original copyright holder who places the Program under this License |
82 | @@ -255,7 +255,7 @@ |
83 | of preserving the free status of all derivatives of our free software and |
84 | of promoting the sharing and reuse of software generally. |
85 | |
86 | - NO WARRANTY |
87 | + NO WARRANTY |
88 | |
89 | 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY |
90 | FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN |
91 | @@ -277,9 +277,9 @@ |
92 | PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE |
93 | POSSIBILITY OF SUCH DAMAGES. |
94 | |
95 | - END OF TERMS AND CONDITIONS |
96 | - |
97 | |
98 | - How to Apply These Terms to Your New Programs |
99 | + END OF TERMS AND CONDITIONS |
100 | + |
101 | + How to Apply These Terms to Your New Programs |
102 | |
103 | If you develop a new program, and you want it to be of the greatest |
104 | possible use to the public, the best way to achieve this is to make it |
105 | @@ -303,17 +303,16 @@ |
106 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
107 | GNU General Public License for more details. |
108 | |
109 | - You should have received a copy of the GNU General Public License |
110 | - along with this program; if not, write to the Free Software |
111 | - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
112 | - |
113 | + You should have received a copy of the GNU General Public License along |
114 | + with this program; if not, write to the Free Software Foundation, Inc., |
115 | + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
116 | |
117 | Also add information on how to contact you by electronic and paper mail. |
118 | |
119 | If the program is interactive, make it output a short notice like this |
120 | when it starts in an interactive mode: |
121 | |
122 | - Gnomovision version 69, Copyright (C) year name of author |
123 | + Gnomovision version 69, Copyright (C) year name of author |
124 | Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. |
125 | This is free software, and you are welcome to redistribute it |
126 | under certain conditions; type `show c' for details. |
127 | @@ -336,5 +335,5 @@ |
128 | This General Public License does not permit incorporating your program into |
129 | proprietary programs. If your program is a subroutine library, you may |
130 | consider it more useful to permit linking proprietary applications with the |
131 | -library. If this is what you want to do, use the GNU Library General |
132 | +library. If this is what you want to do, use the GNU Lesser General |
133 | Public License instead of this License. |
134 | |
135 | === modified file 'ChangeLog' |
136 | --- ChangeLog 2011-01-19 20:17:31 +0000 |
137 | +++ ChangeLog 2014-05-27 22:31:05 +0000 |
138 | @@ -1,3 +1,548 @@ |
139 | +commit 04b0484b679348fad1af7b2f125a4bfb615503fa |
140 | +Author: Harald Judt <h.judt@gmx.at> |
141 | +Date: Mon Mar 4 11:47:44 2013 +0100 |
142 | + |
143 | + Updates for release. |
144 | + |
145 | +commit c7441b44cdacd6287cfde86b046bc19b054f4b56 |
146 | +Author: Harald Judt <h.judt@gmx.at> |
147 | +Date: Mon Mar 4 11:46:15 2013 +0100 |
148 | + |
149 | + Update NEWS and README. |
150 | + |
151 | +commit d8ebf3090bc98bda7a3e91792bc29cae639f566b |
152 | +Author: Sergio Marques <smarquespt@gmail.com> |
153 | +Date: Sun Mar 3 20:47:31 2013 +0100 |
154 | + |
155 | + l10n: Updated Portuguese (pt) translation to 100% |
156 | + |
157 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
158 | + |
159 | + Transmitted-via: Transifex (translations.xfce.org). |
160 | + |
161 | +commit 0a89042c7b5dbac29f1d01471d759610ebb3ade6 |
162 | +Author: Harald Judt <h.judt@gmx.at> |
163 | +Date: Sun Mar 3 09:57:34 2013 +0100 |
164 | + |
165 | + Decrease update timeout. |
166 | + |
167 | + I found that with the 100ms interval, animation is not quite as smooth |
168 | + as I want it to be, so decrease it to 50ms. CPU load is mostly affected |
169 | + by the drawing operations, not by the polling, and those happen only |
170 | + on pointer movement. |
171 | + |
172 | +commit 9463e7a9416d3f293f7f0e72669a4ce27884ebd2 |
173 | +Author: Harald Judt <h.judt@gmx.at> |
174 | +Date: Sun Mar 3 09:55:26 2013 +0100 |
175 | + |
176 | + Optimize check in timer callback a bit. |
177 | + |
178 | + It won't help much because there are not that many eyes, but then |
179 | + it also won't hurt, so stop checking when we know the pointer has |
180 | + not been moved. |
181 | + |
182 | +commit 88c2ec822210f0efa7ee2b6c99bc4747bf3fd71d |
183 | +Author: Andrzej <ndrwrdck@gmail.com> |
184 | +Date: Sun Mar 3 09:45:03 2013 +0100 |
185 | + |
186 | + Implement eye position calculations in 3D coords (bug #9036). |
187 | + |
188 | + Current behavior is better but it still feels unnatural. This is mostly |
189 | + because the eye balls are in the same x-y plane as the mouse pointer. |
190 | + |
191 | + The attached patch calculates 3D angles of the eye sight as if the eye ball |
192 | + was slightly behind the screen (at the moment the distance is hardcoded to |
193 | + 3x eyeball radius). Smaller z distance makes the eyeballs more independent, |
194 | + larger - increases the (x-y) tracking distance (the eyes remain in their |
195 | + center position longer). |
196 | + |
197 | +commit 6e7c093a7838a19afab73608c375290867122c39 |
198 | +Author: Hunt Xu <mhuntxu@gmail.com> |
199 | +Date: Sun Mar 3 09:06:31 2013 +0100 |
200 | + |
201 | + l10n: Updated Chinese (China) (zh_CN) translation to 100% |
202 | + |
203 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
204 | + |
205 | + Transmitted-via: Transifex (translations.xfce.org). |
206 | + |
207 | +commit caaed80c77cffda27596754d27368fafe606dcfd |
208 | +Author: Cheng-Chia Tseng <pswo10680@gmail.com> |
209 | +Date: Sun Mar 3 03:10:48 2013 +0100 |
210 | + |
211 | + l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% |
212 | + |
213 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
214 | + |
215 | + Transmitted-via: Transifex (translations.xfce.org). |
216 | + |
217 | +commit 72ab78f4c5177db27551c3d326a091f7057a94ba |
218 | +Author: Gabor Kelemen <kelemeng@gnome.hu> |
219 | +Date: Sat Mar 2 21:38:17 2013 +0100 |
220 | + |
221 | + l10n: Updated Hungarian (hu) translation to 100% |
222 | + |
223 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
224 | + |
225 | + Transmitted-via: Transifex (translations.xfce.org). |
226 | + |
227 | +commit ffd17c4b8ede1f40aa0720eaa4efeb3e6a54f7be |
228 | +Author: Seong-ho Cho <darkcircle.0426@gmail.com> |
229 | +Date: Sat Mar 2 19:21:32 2013 +0100 |
230 | + |
231 | + l10n: Updated Korean (ko) translation to 100% |
232 | + |
233 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
234 | + |
235 | + Transmitted-via: Transifex (translations.xfce.org). |
236 | + |
237 | +commit 3401cf9abcafb3cb12c7ec4636066957daaa160f |
238 | +Author: Mike Gelfand <mikedld@mikedld.com> |
239 | +Date: Sat Mar 2 18:17:04 2013 +0100 |
240 | + |
241 | + l10n: Updated Belarusian (be) translation to 100% |
242 | + |
243 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
244 | + |
245 | + Transmitted-via: Transifex (translations.xfce.org). |
246 | + |
247 | +commit f08f333ef6803e0f0cd7e37eee27cf0250b3e2e8 |
248 | +Author: Mike Gelfand <mikedld@mikedld.com> |
249 | +Date: Sat Mar 2 18:15:22 2013 +0100 |
250 | + |
251 | + l10n: Updated Belarusian (be) translation to 100% |
252 | + |
253 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
254 | + |
255 | + Transmitted-via: Transifex (translations.xfce.org). |
256 | + |
257 | +commit 8c4b8b7dad1df05da89776ba4e756f40828c91c1 |
258 | +Author: Pjotr vertaalt <pjotrvertaalt@gmail.com> |
259 | +Date: Sat Mar 2 17:44:54 2013 +0100 |
260 | + |
261 | + l10n: Updated Dutch (Flemish) (nl) translation to 100% |
262 | + |
263 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
264 | + |
265 | + Transmitted-via: Transifex (translations.xfce.org). |
266 | + |
267 | +commit 4fcebd0f31293ba68957484c86714779ef2bf8ed |
268 | +Author: Howard Chan <smartboyhw@gmail.com> |
269 | +Date: Sat Mar 2 14:33:51 2013 +0100 |
270 | + |
271 | + l10n: New Chinese (Hong Kong) translation |
272 | + |
273 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
274 | + |
275 | + Transmitted-via: Transifex (translations.xfce.org). |
276 | + |
277 | +commit e76bcb7510ab10514719934878f268e88e97b397 |
278 | +Author: nick vurgaft <slipperygate@gmail.com> |
279 | +Date: Sat Mar 2 12:09:13 2013 +0100 |
280 | + |
281 | + l10n: Updated Hebrew (he) translation to 100% |
282 | + |
283 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
284 | + |
285 | + Transmitted-via: Transifex (translations.xfce.org). |
286 | + |
287 | +commit d59b762efc82e22da8ace7425829705731cb4402 |
288 | +Author: Rafael Ferreira <rafael.f.f1@gmail.com> |
289 | +Date: Sat Mar 2 11:45:41 2013 +0100 |
290 | + |
291 | + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% |
292 | + |
293 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
294 | + |
295 | + Transmitted-via: Transifex (translations.xfce.org). |
296 | + |
297 | +commit b507ff564fbd9535710d1219eab36e80558b3c80 |
298 | +Author: Masato Hashimoto <hashimo@xfce.org> |
299 | +Date: Sat Mar 2 11:40:41 2013 +0100 |
300 | + |
301 | + l10n: Updated Japanese (ja) translation to 100% |
302 | + |
303 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
304 | + |
305 | + Transmitted-via: Transifex (translations.xfce.org). |
306 | + |
307 | +commit 2b0e331c39340c595ae5fca1a933397b568d188a |
308 | +Author: Piotr Sokół <psokol@jabster.pl> |
309 | +Date: Sat Mar 2 10:51:37 2013 +0100 |
310 | + |
311 | + l10n: Updated Polish (pl) translation to 100% |
312 | + |
313 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
314 | + |
315 | + Transmitted-via: Transifex (translations.xfce.org). |
316 | + |
317 | +commit b39deabac67bbf725a08c047a3aa7d8b10090302 |
318 | +Author: jc jc1 <jc1.quebecos@gmail.com> |
319 | +Date: Sat Mar 2 10:32:28 2013 +0100 |
320 | + |
321 | + l10n: Updated French (fr) translation to 100% |
322 | + |
323 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
324 | + |
325 | + Transmitted-via: Transifex (translations.xfce.org). |
326 | + |
327 | +commit 5f549bd8e6dfdc3bbad373c82877724e82cd7076 |
328 | +Author: Sergey Alyoshin <alyoshin.s@gmail.com> |
329 | +Date: Sat Mar 2 10:12:00 2013 +0100 |
330 | + |
331 | + l10n: Updated Russian (ru) translation to 100% |
332 | + |
333 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
334 | + |
335 | + Transmitted-via: Transifex (translations.xfce.org). |
336 | + |
337 | +commit 064933deb88e5717781883e88073a34148a1972f |
338 | +Author: Harald Judt <h.judt@gmx.at> |
339 | +Date: Sat Mar 2 09:28:18 2013 +0100 |
340 | + |
341 | + Update README. |
342 | + |
343 | +commit 7cfd829fe7cd5a9df8dc855d3779db6f1f90ab4e |
344 | +Author: Harald Judt <h.judt@gmx.at> |
345 | +Date: Sat Mar 2 09:26:48 2013 +0100 |
346 | + |
347 | + Update COPYING and related stuff. |
348 | + |
349 | + Replace the current out-of-date version of the document with a |
350 | + recent one that has updated addresses. |
351 | + |
352 | +commit e00f90704d8f909d9fd7c10a0bce65d0e95095c4 |
353 | +Author: Cristian Marchi <cri.penta@gmail.com> |
354 | +Date: Fri Mar 1 20:39:35 2013 +0100 |
355 | + |
356 | + l10n: Updated Italian (it) translation to 100% |
357 | + |
358 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
359 | + |
360 | + Transmitted-via: Transifex (translations.xfce.org). |
361 | + |
362 | +commit 75fd111384041f7e32d8a31ede76ea0fcf190d9e |
363 | +Author: Саша Петровић <salepetronije@gmail.com> |
364 | +Date: Fri Mar 1 19:28:33 2013 +0100 |
365 | + |
366 | + l10n: Updated Serbian (sr) translation to 100% |
367 | + |
368 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
369 | + |
370 | + Transmitted-via: Transifex (translations.xfce.org). |
371 | + |
372 | +commit 8a984b740b5d57026c27fc7b6bb25e7e4919173b |
373 | +Author: Mișu Moldovan <dumol@xfce.org> |
374 | +Date: Fri Mar 1 18:58:59 2013 +0100 |
375 | + |
376 | + l10n: Updated Romanian (ro) translation to 100% |
377 | + |
378 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
379 | + |
380 | + Transmitted-via: Transifex (translations.xfce.org). |
381 | + |
382 | +commit 3b7f170ce91b8a191500ff4895a5b0ba6577fc60 |
383 | +Author: Harald Judt <h.judt@gmx.at> |
384 | +Date: Fri Mar 1 17:41:38 2013 +0100 |
385 | + |
386 | + l10n: Updated German (de) translation to 100% |
387 | + |
388 | + New status: 4 messages complete with 0 fuzzies and 0 untranslated. |
389 | + |
390 | + Transmitted-via: Transifex (translations.xfce.org). |
391 | + |
392 | +commit f81f129aea55e66d33e3892893e4475f92a5d945 |
393 | +Author: Harald Judt <h.judt@gmx.at> |
394 | +Date: Fri Mar 1 17:35:17 2013 +0100 |
395 | + |
396 | + Update AUTHORS and NEWS. |
397 | + |
398 | +commit 0bba711e54ee5b39de97ea82d20ba84a0d18e110 |
399 | +Author: Harald Judt <h.judt@gmx.at> |
400 | +Date: Fri Mar 1 17:33:42 2013 +0100 |
401 | + |
402 | + Regenerate po files. |
403 | + |
404 | +commit 3983984bdfafd2617f63643909bdd07b2ebad4d7 |
405 | +Author: Harald Judt <h.judt@gmx.at> |
406 | +Date: Fri Mar 1 17:31:23 2013 +0100 |
407 | + |
408 | + Handle "small" property better. |
409 | + |
410 | + This improves the previous commit by allowing the user to set the |
411 | + single-row property manually, as the automatic way doesn't really |
412 | + work that good. |
413 | + |
414 | +commit abc76d5cb9dabfea59016613d20dd6de550ea286 |
415 | +Author: Harald Judt <h.judt@gmx.at> |
416 | +Date: Thu Feb 28 23:13:43 2013 +0100 |
417 | + |
418 | + Add support for deskbar mode. |
419 | + |
420 | + If the plugin's size needs allow it, set plugin into "small" mode. |
421 | + |
422 | + That alignment stuff in the panel multi-row mode seems to be buggy. |
423 | + I tried to get it working as good as possible, but there are some weird, |
424 | + unexpected things happening with some configurations. |
425 | + |
426 | +commit 8164b087d1d2d5650c6835f89b4a46bc3d0426ca |
427 | +Author: Harald Judt <h.judt@gmx.at> |
428 | +Date: Thu Feb 28 17:05:09 2013 +0100 |
429 | + |
430 | + Fix previous commit (independent eye movement). |
431 | + |
432 | + Last time I got the brackets wrong, so the eyes did not look exactly |
433 | + in the right direction. |
434 | + |
435 | +commit c5f5e0484d8fbcb68ed28732dc240935be336782 |
436 | +Author: Harald Judt <h.judt@gmx.at> |
437 | +Date: Wed Feb 27 13:53:16 2013 +0100 |
438 | + |
439 | + Make eye movement independent, like in xeyes (bug #9036). |
440 | + |
441 | + Clean up formatting of this function and make the eye movement independent. |
442 | + The actual change is subtracting GTK_WIDGET(widget)->allocation.x from nx |
443 | + and GTK_WIDGET(widget)->allocation.y from ny. |
444 | + |
445 | +commit 64c5b6460a7efddf2a1829be72430b9dddca1456 |
446 | +Author: Harald Judt <h.judt@gmx.at> |
447 | +Date: Tue Feb 26 21:06:46 2013 +0100 |
448 | + |
449 | + Build the plugin as a module. |
450 | + |
451 | +commit eba51dfe7955f9d344d966269ab01ea16f82c38a |
452 | +Author: Harald Judt <h.judt@gmx.at> |
453 | +Date: Tue Feb 26 20:51:37 2013 +0100 |
454 | + |
455 | + Autotools update. |
456 | + |
457 | + Fix building with automake-1.13. |
458 | + Fix configure.ac.in as suggested in bug #6920. |
459 | + |
460 | +commit 5ea3c5f63cf2428e77b8a3dbb1004ddd502b0328 |
461 | +Author: Harald Judt <h.judt@gmx.at> |
462 | +Date: Tue Feb 26 20:33:14 2013 +0100 |
463 | + |
464 | + Write config file when closing config dialog (bug #9035). |
465 | + |
466 | +commit 2026158e64e961b042076a527cd923d1a606d282 |
467 | +Author: Andrzej <ndrwrdck@gmail.com> |
468 | +Date: Tue Feb 26 15:56:42 2013 +0100 |
469 | + |
470 | + Update size after panel orientation change (bug #8404). |
471 | + |
472 | +commit 00fe6b4e4f12e6e8ac07528fc0f76e31bf802751 |
473 | +Author: Andreas Müller <schnitzeltony@gmx.de> |
474 | +Date: Tue Feb 26 15:54:21 2013 +0100 |
475 | + |
476 | + Port to libxfce4ui (bug #8074). |
477 | + |
478 | +commit e031b813881a7820d6af3e15568f4cdb8906bc30 |
479 | +Author: Саша Петровић <salepetronije@gmail.com> |
480 | +Date: Fri Jan 25 23:36:53 2013 +0100 |
481 | + |
482 | + l10n: Serbian translation |
483 | + |
484 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
485 | + |
486 | + Transmitted-via: Transifex (translations.xfce.org). |
487 | + |
488 | +commit 42a74fb0ad17c5ff3ad7b639c35396912b651e08 |
489 | +Author: Piotr Sokół <psokol@jabster.pl> |
490 | +Date: Sat Nov 24 13:36:43 2012 +0100 |
491 | + |
492 | + l10n: Updated Polish (pl) translation to 100% |
493 | + |
494 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
495 | + |
496 | + Transmitted-via: Transifex (translations.xfce.org). |
497 | + |
498 | +commit a29ea3efc9224b380d85099699d42895fae60dbc |
499 | +Author: Gheyret Kenji <gheyret@yahoo.com> |
500 | +Date: Thu Oct 25 10:55:20 2012 +0200 |
501 | + |
502 | + l10n: Updated Uyghur (ug) translation to 100% |
503 | + |
504 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
505 | + |
506 | + Transmitted-via: Transifex (translations.xfce.org). |
507 | + |
508 | +commit 7bd2522d0a426bd0f68c0ff40b8cda7c1cf70792 |
509 | +Author: Chipong Luo <chipong.luo@yahoo.com> |
510 | +Date: Fri Apr 20 13:41:21 2012 +0200 |
511 | + |
512 | + l10n: Updated Chinese (China) (zh_CN) translation to 100% |
513 | + |
514 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
515 | + |
516 | + Transmitted-via: Transifex (translations.xfce.org). |
517 | + |
518 | +commit 4b74ce04ed4ad4617eb1813711ab19baffa5d0c0 |
519 | +Author: Chipong Luo <chipong.luo@yahoo.com> |
520 | +Date: Wed Mar 14 15:59:43 2012 +0100 |
521 | + |
522 | + l10n: Updated Chinese (China) (zh_CN) translation to 100% |
523 | + |
524 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
525 | + |
526 | + Transmitted-via: Transifex (translations.xfce.org). |
527 | + |
528 | +commit 029c74649eaf30b1c1e17b4eff214900d8866a63 |
529 | +Author: Chipong Luo <chipong.luo@yahoo.com> |
530 | +Date: Wed Feb 8 11:24:30 2012 +0100 |
531 | + |
532 | + l10n: Updated Chinese (China) (zh_CN) translation to 100% |
533 | + |
534 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
535 | + |
536 | + Transmitted-via: Transifex (translations.xfce.org). |
537 | + |
538 | +commit 8567723a893839d50e676af00c4278b1c94d3586 |
539 | +Author: Algimantas Margevičius <gymka@mail.ru> |
540 | +Date: Sat Jan 21 14:58:56 2012 +0100 |
541 | + |
542 | + l10n: Updated Lithuanian (lt) translation to 100% |
543 | + |
544 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
545 | + |
546 | + Transmitted-via: Transifex (translations.xfce.org). |
547 | + |
548 | +commit b356288006403c6d0ef518cc312ff71b8027f34a |
549 | +Author: Cheng-Chia Tseng <pswo10680@gmail.com> |
550 | +Date: Sun Jan 15 04:53:17 2012 +0100 |
551 | + |
552 | + l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% |
553 | + |
554 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
555 | + |
556 | + Transmitted-via: Transifex (translations.xfce.org). |
557 | + |
558 | +commit 509fd0e48be92f01d02957345ae757406af0932d |
559 | +Author: Sergio Marques <smarquespt@gmail.com> |
560 | +Date: Mon Jan 9 12:33:57 2012 +0100 |
561 | + |
562 | + l10n: Updated Portuguese (pt) translation to 100% |
563 | + |
564 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
565 | + |
566 | + Transmitted-via: Transifex (translations.xfce.org). |
567 | + |
568 | +commit 375c36e67c4f0605d383ce321a896e02412cb6ce |
569 | +Author: Chipong Luo <chipong_l@yahoo.com> |
570 | +Date: Fri Dec 9 14:47:45 2011 +0100 |
571 | + |
572 | + l10n: Updated Chinese (China) (zh_CN) translation to 100% |
573 | + |
574 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
575 | + |
576 | + Transmitted-via: Transifex (translations.xfce.org). |
577 | + |
578 | +commit 224fc727d56d75a2a7d317f4d65b7b5e3424c0a2 |
579 | +Author: Chipong Luo <chipong_l@yahoo.com> |
580 | +Date: Tue Nov 8 02:59:26 2011 +0100 |
581 | + |
582 | + l10n: Updated Chinese (China) (zh_CN) translation to 100% |
583 | + |
584 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
585 | + |
586 | + Transmitted-via: Transifex (translations.xfce.org). |
587 | + |
588 | +commit d8259ee4140f63840dc563bb1b311907e859a6c0 |
589 | +Author: Chipong Luo <chipong_l@yahoo.com> |
590 | +Date: Sat Nov 5 12:07:30 2011 +0100 |
591 | + |
592 | + l10n: Updated Chinese (China) (zh_CN) translation to 100% |
593 | + |
594 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
595 | + |
596 | + Transmitted-via: Transifex (translations.xfce.org). |
597 | + |
598 | +commit 7e64dee3ae05e64a90032cae36344e10e445f0c7 |
599 | +Author: Chipong Luo <chipong_l@yahoo.com> |
600 | +Date: Sat Nov 5 12:03:19 2011 +0100 |
601 | + |
602 | + l10n: Updated Chinese (China) (zh_CN) translation to 100% |
603 | + |
604 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
605 | + |
606 | + Transmitted-via: Transifex (translations.xfce.org). |
607 | + |
608 | +commit afc325c601d0630862a4d04e1a48616ffa77cb7a |
609 | +Author: كريم أولاد الشلحة <herr.linux88@gmail.com> |
610 | +Date: Fri Aug 12 06:51:38 2011 +0200 |
611 | + |
612 | + l10n: Updated Arabic (ar) translation to 100% |
613 | + |
614 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
615 | + |
616 | + Transmitted-via: Transifex (translations.xfce.org). |
617 | + |
618 | +commit 0d80ed5f32af4c2af9423d95b452a121ee94fbec |
619 | +Author: Anurag Garg <ang.astronomy@gmail.com> |
620 | +Date: Sat Jun 18 15:14:44 2011 +0200 |
621 | + |
622 | + l10n: Updated Hindi (hi) translation to 100% |
623 | + |
624 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
625 | + |
626 | + Transmitted-via: Transifex (translations.xfce.org). |
627 | + |
628 | +commit 96e883a63f1e5bda8e7b0a23d102185e03c85a2f |
629 | +Author: Pjotr Anon <pliniusminor@gmail.com> |
630 | +Date: Thu Jun 16 16:24:58 2011 +0200 |
631 | + |
632 | + l10n: Updated Dutch (Flemish) (nl) translation to 100% |
633 | + |
634 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
635 | + |
636 | + Transmitted-via: Transifex (translations.xfce.org). |
637 | + |
638 | +commit 57589a29c8a2093e72c12bab3f6723d2b5c83073 |
639 | +Author: Pjotr Anon <pliniusminor@gmail.com> |
640 | +Date: Tue May 31 23:49:00 2011 +0200 |
641 | + |
642 | + l10n: Updated Dutch (Flemish) (nl) translation to 100% |
643 | + |
644 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
645 | + |
646 | + Transmitted-via: Transifex (translations.xfce.org). |
647 | + |
648 | +commit 0400eda1bc4553ba49d0da7f10f0454849707371 |
649 | +Author: Mișu Moldovan <dumol@xfce.org> |
650 | +Date: Thu Feb 17 18:57:40 2011 +0100 |
651 | + |
652 | + l10n: Updated Romanian (ro) translation to 100% |
653 | + |
654 | + New status: 3 messages complete with 0 fuzzies and 0 untranslated. |
655 | + |
656 | + Transmitted-via: Transifex (translations.xfce.org). |
657 | + |
658 | +commit 41ecb9026ba777e41c7c0a8f6e07cad9cfda4c37 |
659 | +Author: Nick Schermer <nick@xfce.org> |
660 | +Date: Sat Jan 29 21:01:27 2011 +0100 |
661 | + |
662 | + Fix compiler warning and hide event window. |
663 | + |
664 | + This makes the plugin look nice on transparent panels. |
665 | + |
666 | +commit ab34029ca2717b33954436c5de44f8e6760d6306 |
667 | +Author: Florian Rivoal <frivoal@xfce.org> |
668 | +Date: Mon Jan 24 09:27:58 2011 +0900 |
669 | + |
670 | + Automate Changelog updates |
671 | + |
672 | +commit e3f3cf28bf1d5f2a8f0c7530a776f2dc25321c81 |
673 | +Author: Florian Rivoal <frivoal@xfce.org> |
674 | +Date: Fri Dec 17 12:43:40 2010 +0900 |
675 | + |
676 | + Post release version bump |
677 | + |
678 | +commit 0cdd38b2dd59acd94e4e864357bee017846b7706 |
679 | +Author: Florian Rivoal <frivoal@xfce.org> |
680 | +Date: Fri Dec 17 12:42:41 2010 +0900 |
681 | + |
682 | + Release 4.4.1 |
683 | + |
684 | commit 3084a9baad65904a50621ae5fb7daf74794198b4 |
685 | Author: Florian Rivoal <frivoal@xfce.org> |
686 | Date: Thu Dec 16 14:18:52 2010 +0900 |
687 | |
688 | === modified file 'INSTALL' |
689 | --- INSTALL 2011-01-19 20:17:31 +0000 |
690 | +++ INSTALL 2014-05-27 22:31:05 +0000 |
691 | @@ -1,8 +1,8 @@ |
692 | Installation Instructions |
693 | ************************* |
694 | |
695 | -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, |
696 | -2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
697 | +Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, |
698 | +Inc. |
699 | |
700 | Copying and distribution of this file, with or without modification, |
701 | are permitted in any medium without royalty provided the copyright |
702 | @@ -226,6 +226,11 @@ |
703 | |
704 | and if that doesn't work, install pre-built binaries of GCC for HP-UX. |
705 | |
706 | + HP-UX `make' updates targets which have the same time stamps as |
707 | +their prerequisites, which makes it generally unusable when shipped |
708 | +generated files such as `configure' are involved. Use GNU `make' |
709 | +instead. |
710 | + |
711 | On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot |
712 | parse its `<wchar.h>' header file. The option `-nodtk' can be used as |
713 | a workaround. If GNU CC is not installed, it is therefore recommended |
714 | @@ -304,9 +309,10 @@ |
715 | overridden in the site shell script). |
716 | |
717 | Unfortunately, this technique does not work for `CONFIG_SHELL' due to |
718 | -an Autoconf bug. Until the bug is fixed you can use this workaround: |
719 | +an Autoconf limitation. Until the limitation is lifted, you can use |
720 | +this workaround: |
721 | |
722 | - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash |
723 | + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash |
724 | |
725 | `configure' Invocation |
726 | ====================== |
727 | @@ -362,4 +368,3 @@ |
728 | |
729 | `configure' also accepts some other, not widely useful, options. Run |
730 | `configure --help' for more details. |
731 | - |
732 | |
733 | === modified file 'Makefile.am' |
734 | --- Makefile.am 2011-01-19 20:17:31 +0000 |
735 | +++ Makefile.am 2014-05-27 22:31:05 +0000 |
736 | @@ -7,10 +7,22 @@ |
737 | distclean-local: |
738 | rm -rf *.spec *.cache *~ |
739 | |
740 | +distuninstallcheck_listfiles = \ |
741 | + find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache |
742 | + |
743 | rpm: dist |
744 | rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz |
745 | @rm -f $(PACKAGE)-$(VERSION).tar.gz |
746 | |
747 | +.PHONY: ChangeLog |
748 | + |
749 | +ChangeLog: Makefile |
750 | + (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \ |
751 | + && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \ |
752 | + || (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2) |
753 | + |
754 | +dist-hook: ChangeLog |
755 | + |
756 | EXTRA_DIST = \ |
757 | intltool-extract.in \ |
758 | intltool-merge.in \ |
759 | |
760 | === modified file 'Makefile.in' |
761 | --- Makefile.in 2011-01-19 20:17:31 +0000 |
762 | +++ Makefile.in 2014-05-27 22:31:05 +0000 |
763 | @@ -1,9 +1,8 @@ |
764 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
765 | +# Makefile.in generated by automake 1.13.1 from Makefile.am. |
766 | # @configure_input@ |
767 | |
768 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
769 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
770 | -# Inc. |
771 | +# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
772 | + |
773 | # This Makefile.in is free software; the Free Software Foundation |
774 | # gives unlimited permission to copy and/or distribute it, |
775 | # with or without modifications, as long as this notice is preserved. |
776 | @@ -15,6 +14,23 @@ |
777 | |
778 | @SET_MAKE@ |
779 | VPATH = @srcdir@ |
780 | +am__make_dryrun = \ |
781 | + { \ |
782 | + am__dry=no; \ |
783 | + case $$MAKEFLAGS in \ |
784 | + *\\[\ \ ]*) \ |
785 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
786 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
787 | + *) \ |
788 | + for am__flg in $$MAKEFLAGS; do \ |
789 | + case $$am__flg in \ |
790 | + *=*|--*) ;; \ |
791 | + *n*) am__dry=yes; break;; \ |
792 | + esac; \ |
793 | + done;; \ |
794 | + esac; \ |
795 | + test $$am__dry = yes; \ |
796 | + } |
797 | pkgdatadir = $(datadir)/@PACKAGE@ |
798 | pkgincludedir = $(includedir)/@PACKAGE@ |
799 | pkglibdir = $(libdir)/@PACKAGE@ |
800 | @@ -35,11 +51,11 @@ |
801 | host_triplet = @host@ |
802 | target_triplet = @target@ |
803 | subdir = . |
804 | -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
805 | - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
806 | - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ |
807 | - config.guess config.sub depcomp install-sh ltmain.sh missing \ |
808 | - mkinstalldirs |
809 | +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ |
810 | + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
811 | + $(top_srcdir)/configure $(am__configure_deps) \ |
812 | + $(srcdir)/config.h.in mkinstalldirs COPYING compile \ |
813 | + config.guess config.sub depcomp install-sh missing ltmain.sh |
814 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
815 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
816 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
817 | @@ -50,30 +66,73 @@ |
818 | CONFIG_HEADER = config.h |
819 | CONFIG_CLEAN_FILES = |
820 | CONFIG_CLEAN_VPATH_FILES = |
821 | +AM_V_P = $(am__v_P_@AM_V@) |
822 | +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
823 | +am__v_P_0 = false |
824 | +am__v_P_1 = : |
825 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
826 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
827 | +am__v_GEN_0 = @echo " GEN " $@; |
828 | +am__v_GEN_1 = |
829 | +AM_V_at = $(am__v_at_@AM_V@) |
830 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
831 | +am__v_at_0 = @ |
832 | +am__v_at_1 = |
833 | SOURCES = |
834 | DIST_SOURCES = |
835 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
836 | - html-recursive info-recursive install-data-recursive \ |
837 | - install-dvi-recursive install-exec-recursive \ |
838 | - install-html-recursive install-info-recursive \ |
839 | - install-pdf-recursive install-ps-recursive install-recursive \ |
840 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
841 | - ps-recursive uninstall-recursive |
842 | +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ |
843 | + ctags-recursive dvi-recursive html-recursive info-recursive \ |
844 | + install-data-recursive install-dvi-recursive \ |
845 | + install-exec-recursive install-html-recursive \ |
846 | + install-info-recursive install-pdf-recursive \ |
847 | + install-ps-recursive install-recursive installcheck-recursive \ |
848 | + installdirs-recursive pdf-recursive ps-recursive \ |
849 | + tags-recursive uninstall-recursive |
850 | +am__can_run_installinfo = \ |
851 | + case $$AM_UPDATE_INFO_DIR in \ |
852 | + n|no|NO) false;; \ |
853 | + *) (install-info --version) >/dev/null 2>&1;; \ |
854 | + esac |
855 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
856 | distclean-recursive maintainer-clean-recursive |
857 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
858 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
859 | - distdir dist dist-all distcheck |
860 | +am__recursive_targets = \ |
861 | + $(RECURSIVE_TARGETS) \ |
862 | + $(RECURSIVE_CLEAN_TARGETS) \ |
863 | + $(am__extra_recursive_targets) |
864 | +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
865 | + cscope distdir dist dist-all distcheck |
866 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ |
867 | + $(LISP)config.h.in |
868 | +# Read a list of newline-separated strings from the standard input, |
869 | +# and print each of them once, without duplicates. Input order is |
870 | +# *not* preserved. |
871 | +am__uniquify_input = $(AWK) '\ |
872 | + BEGIN { nonempty = 0; } \ |
873 | + { items[$$0] = 1; nonempty = 1; } \ |
874 | + END { if (nonempty) { for (i in items) print i; }; } \ |
875 | +' |
876 | +# Make sure the list of sources is unique. This is necessary because, |
877 | +# e.g., the same source file might be shared among _SOURCES variables |
878 | +# for different programs/libraries. |
879 | +am__define_uniq_tagged_files = \ |
880 | + list='$(am__tagged_files)'; \ |
881 | + unique=`for i in $$list; do \ |
882 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
883 | + done | $(am__uniquify_input)` |
884 | ETAGS = etags |
885 | CTAGS = ctags |
886 | +CSCOPE = cscope |
887 | DIST_SUBDIRS = $(SUBDIRS) |
888 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
889 | distdir = $(PACKAGE)-$(VERSION) |
890 | top_distdir = $(distdir) |
891 | am__remove_distdir = \ |
892 | - { test ! -d "$(distdir)" \ |
893 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
894 | - && rm -fr "$(distdir)"; }; } |
895 | + if test -d "$(distdir)"; then \ |
896 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
897 | + && rm -rf "$(distdir)" \ |
898 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
899 | + else :; fi |
900 | +am__post_remove_distdir = $(am__remove_distdir) |
901 | am__relativize = \ |
902 | dir0=`pwd`; \ |
903 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
904 | @@ -101,11 +160,14 @@ |
905 | reldir="$$dir2" |
906 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 |
907 | GZIP_ENV = --best |
908 | -distuninstallcheck_listfiles = find . -type f -print |
909 | +DIST_TARGETS = dist-bzip2 dist-gzip |
910 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
911 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
912 | distcleancheck_listfiles = find . -type f -print |
913 | ACLOCAL = @ACLOCAL@ |
914 | ALL_LINGUAS = @ALL_LINGUAS@ |
915 | AMTAR = @AMTAR@ |
916 | +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
917 | AR = @AR@ |
918 | AUTOCONF = @AUTOCONF@ |
919 | AUTOHEADER = @AUTOHEADER@ |
920 | @@ -154,6 +216,10 @@ |
921 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
922 | INTLTOOL_PERL = @INTLTOOL_PERL@ |
923 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
924 | +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ |
925 | +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
926 | +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
927 | +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
928 | LD = @LD@ |
929 | LDFLAGS = @LDFLAGS@ |
930 | LIBOBJS = @LIBOBJS@ |
931 | @@ -163,14 +229,14 @@ |
932 | LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@ |
933 | LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@ |
934 | LIBXFCE4PANEL_VERSION = @LIBXFCE4PANEL_VERSION@ |
935 | +LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@ |
936 | +LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@ |
937 | +LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@ |
938 | +LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@ |
939 | LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ |
940 | LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ |
941 | LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ |
942 | LIBXFCE4UTIL_VERSION = @LIBXFCE4UTIL_VERSION@ |
943 | -LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@ |
944 | -LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@ |
945 | -LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@ |
946 | -LIBXFCEGUI4_VERSION = @LIBXFCEGUI4_VERSION@ |
947 | LIPO = @LIPO@ |
948 | LN_S = @LN_S@ |
949 | LTLIBOBJS = @LTLIBOBJS@ |
950 | @@ -197,6 +263,8 @@ |
951 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
952 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
953 | PKG_CONFIG = @PKG_CONFIG@ |
954 | +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
955 | +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
956 | POFILES = @POFILES@ |
957 | POSUB = @POSUB@ |
958 | PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ |
959 | @@ -243,6 +311,8 @@ |
960 | includedir = @includedir@ |
961 | infodir = @infodir@ |
962 | install_sh = @install_sh@ |
963 | +intltool__v_merge_options_ = @intltool__v_merge_options_@ |
964 | +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ |
965 | libdir = @libdir@ |
966 | libexecdir = @libexecdir@ |
967 | localedir = @localedir@ |
968 | @@ -272,6 +342,9 @@ |
969 | icons \ |
970 | po |
971 | |
972 | +distuninstallcheck_listfiles = \ |
973 | + find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache |
974 | + |
975 | EXTRA_DIST = \ |
976 | intltool-extract.in \ |
977 | intltool-merge.in \ |
978 | @@ -286,7 +359,7 @@ |
979 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
980 | |
981 | .SUFFIXES: |
982 | -am--refresh: |
983 | +am--refresh: Makefile |
984 | @: |
985 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
986 | @for dep in $?; do \ |
987 | @@ -322,10 +395,8 @@ |
988 | $(am__aclocal_m4_deps): |
989 | |
990 | config.h: stamp-h1 |
991 | - @if test ! -f $@; then \ |
992 | - rm -f stamp-h1; \ |
993 | - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
994 | - else :; fi |
995 | + @if test ! -f $@; then rm -f stamp-h1; else :; fi |
996 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
997 | |
998 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
999 | @rm -f stamp-h1 |
1000 | @@ -348,12 +419,12 @@ |
1001 | -rm -f libtool config.lt |
1002 | |
1003 | # This directory's subdirectories are mostly independent; you can cd |
1004 | -# into them and run `make' without going through this Makefile. |
1005 | -# To change the values of `make' variables: instead of editing Makefiles, |
1006 | -# (1) if the variable is set in `config.status', edit `config.status' |
1007 | -# (which will cause the Makefiles to be regenerated when you run `make'); |
1008 | -# (2) otherwise, pass the desired values on the `make' command line. |
1009 | -$(RECURSIVE_TARGETS): |
1010 | +# into them and run 'make' without going through this Makefile. |
1011 | +# To change the values of 'make' variables: instead of editing Makefiles, |
1012 | +# (1) if the variable is set in 'config.status', edit 'config.status' |
1013 | +# (which will cause the Makefiles to be regenerated when you run 'make'); |
1014 | +# (2) otherwise, pass the desired values on the 'make' command line. |
1015 | +$(am__recursive_targets): |
1016 | @fail= failcom='exit 1'; \ |
1017 | for f in x $$MAKEFLAGS; do \ |
1018 | case $$f in \ |
1019 | @@ -363,7 +434,11 @@ |
1020 | done; \ |
1021 | dot_seen=no; \ |
1022 | target=`echo $@ | sed s/-recursive//`; \ |
1023 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
1024 | + case "$@" in \ |
1025 | + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
1026 | + *) list='$(SUBDIRS)' ;; \ |
1027 | + esac; \ |
1028 | + for subdir in $$list; do \ |
1029 | echo "Making $$target in $$subdir"; \ |
1030 | if test "$$subdir" = "."; then \ |
1031 | dot_seen=yes; \ |
1032 | @@ -378,57 +453,12 @@ |
1033 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
1034 | fi; test -z "$$fail" |
1035 | |
1036 | -$(RECURSIVE_CLEAN_TARGETS): |
1037 | - @fail= failcom='exit 1'; \ |
1038 | - for f in x $$MAKEFLAGS; do \ |
1039 | - case $$f in \ |
1040 | - *=* | --[!k]*);; \ |
1041 | - *k*) failcom='fail=yes';; \ |
1042 | - esac; \ |
1043 | - done; \ |
1044 | - dot_seen=no; \ |
1045 | - case "$@" in \ |
1046 | - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
1047 | - *) list='$(SUBDIRS)' ;; \ |
1048 | - esac; \ |
1049 | - rev=''; for subdir in $$list; do \ |
1050 | - if test "$$subdir" = "."; then :; else \ |
1051 | - rev="$$subdir $$rev"; \ |
1052 | - fi; \ |
1053 | - done; \ |
1054 | - rev="$$rev ."; \ |
1055 | - target=`echo $@ | sed s/-recursive//`; \ |
1056 | - for subdir in $$rev; do \ |
1057 | - echo "Making $$target in $$subdir"; \ |
1058 | - if test "$$subdir" = "."; then \ |
1059 | - local_target="$$target-am"; \ |
1060 | - else \ |
1061 | - local_target="$$target"; \ |
1062 | - fi; \ |
1063 | - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
1064 | - || eval $$failcom; \ |
1065 | - done && test -z "$$fail" |
1066 | -tags-recursive: |
1067 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
1068 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
1069 | - done |
1070 | -ctags-recursive: |
1071 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
1072 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
1073 | - done |
1074 | - |
1075 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
1076 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
1077 | - unique=`for i in $$list; do \ |
1078 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1079 | - done | \ |
1080 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1081 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1082 | - mkid -fID $$unique |
1083 | -tags: TAGS |
1084 | - |
1085 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
1086 | - $(TAGS_FILES) $(LISP) |
1087 | +ID: $(am__tagged_files) |
1088 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
1089 | +tags: tags-recursive |
1090 | +TAGS: tags |
1091 | + |
1092 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
1093 | set x; \ |
1094 | here=`pwd`; \ |
1095 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
1096 | @@ -444,12 +474,7 @@ |
1097 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
1098 | fi; \ |
1099 | done; \ |
1100 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
1101 | - unique=`for i in $$list; do \ |
1102 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1103 | - done | \ |
1104 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1105 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1106 | + $(am__define_uniq_tagged_files); \ |
1107 | shift; \ |
1108 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
1109 | test -n "$$unique" || unique=$$empty_fix; \ |
1110 | @@ -461,15 +486,11 @@ |
1111 | $$unique; \ |
1112 | fi; \ |
1113 | fi |
1114 | -ctags: CTAGS |
1115 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
1116 | - $(TAGS_FILES) $(LISP) |
1117 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
1118 | - unique=`for i in $$list; do \ |
1119 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1120 | - done | \ |
1121 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1122 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1123 | +ctags: ctags-recursive |
1124 | + |
1125 | +CTAGS: ctags |
1126 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
1127 | + $(am__define_uniq_tagged_files); \ |
1128 | test -z "$(CTAGS_ARGS)$$unique" \ |
1129 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
1130 | $$unique |
1131 | @@ -478,9 +499,31 @@ |
1132 | here=`$(am__cd) $(top_builddir) && pwd` \ |
1133 | && $(am__cd) $(top_srcdir) \ |
1134 | && gtags -i $(GTAGS_ARGS) "$$here" |
1135 | +cscope: cscope.files |
1136 | + test ! -s cscope.files \ |
1137 | + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) |
1138 | +clean-cscope: |
1139 | + -rm -f cscope.files |
1140 | +cscope.files: clean-cscope cscopelist |
1141 | +cscopelist: cscopelist-recursive |
1142 | + |
1143 | +cscopelist-am: $(am__tagged_files) |
1144 | + list='$(am__tagged_files)'; \ |
1145 | + case "$(srcdir)" in \ |
1146 | + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
1147 | + *) sdir=$(subdir)/$(srcdir) ;; \ |
1148 | + esac; \ |
1149 | + for i in $$list; do \ |
1150 | + if test -f "$$i"; then \ |
1151 | + echo "$(subdir)/$$i"; \ |
1152 | + else \ |
1153 | + echo "$$sdir/$$i"; \ |
1154 | + fi; \ |
1155 | + done >> $(top_builddir)/cscope.files |
1156 | |
1157 | distclean-tags: |
1158 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
1159 | + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files |
1160 | |
1161 | distdir: $(DISTFILES) |
1162 | $(am__remove_distdir) |
1163 | @@ -516,13 +559,10 @@ |
1164 | done |
1165 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
1166 | if test "$$subdir" = .; then :; else \ |
1167 | - test -d "$(distdir)/$$subdir" \ |
1168 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
1169 | - || exit 1; \ |
1170 | - fi; \ |
1171 | - done |
1172 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
1173 | - if test "$$subdir" = .; then :; else \ |
1174 | + $(am__make_dryrun) \ |
1175 | + || test -d "$(distdir)/$$subdir" \ |
1176 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
1177 | + || exit 1; \ |
1178 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
1179 | $(am__relativize); \ |
1180 | new_distdir=$$reldir; \ |
1181 | @@ -542,6 +582,9 @@ |
1182 | || exit 1; \ |
1183 | fi; \ |
1184 | done |
1185 | + $(MAKE) $(AM_MAKEFLAGS) \ |
1186 | + top_distdir="$(top_distdir)" distdir="$(distdir)" \ |
1187 | + dist-hook |
1188 | -test -n "$(am__skip_mode_fix)" \ |
1189 | || find "$(distdir)" -type d ! -perm -755 \ |
1190 | -exec chmod u+rwx,go+rx {} \; -o \ |
1191 | @@ -551,36 +594,35 @@ |
1192 | || chmod -R a+r "$(distdir)" |
1193 | dist-gzip: distdir |
1194 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
1195 | - $(am__remove_distdir) |
1196 | + $(am__post_remove_distdir) |
1197 | dist-bzip2: distdir |
1198 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
1199 | - $(am__remove_distdir) |
1200 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
1201 | + $(am__post_remove_distdir) |
1202 | |
1203 | -dist-lzma: distdir |
1204 | - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
1205 | - $(am__remove_distdir) |
1206 | +dist-lzip: distdir |
1207 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
1208 | + $(am__post_remove_distdir) |
1209 | |
1210 | dist-xz: distdir |
1211 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
1212 | - $(am__remove_distdir) |
1213 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
1214 | + $(am__post_remove_distdir) |
1215 | |
1216 | dist-tarZ: distdir |
1217 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
1218 | - $(am__remove_distdir) |
1219 | + $(am__post_remove_distdir) |
1220 | |
1221 | dist-shar: distdir |
1222 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
1223 | - $(am__remove_distdir) |
1224 | + $(am__post_remove_distdir) |
1225 | |
1226 | dist-zip: distdir |
1227 | -rm -f $(distdir).zip |
1228 | zip -rq $(distdir).zip $(distdir) |
1229 | - $(am__remove_distdir) |
1230 | + $(am__post_remove_distdir) |
1231 | |
1232 | -dist dist-all: distdir |
1233 | - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
1234 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
1235 | - $(am__remove_distdir) |
1236 | +dist dist-all: |
1237 | + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' |
1238 | + $(am__post_remove_distdir) |
1239 | |
1240 | # This target untars the dist file and tries a VPATH configuration. Then |
1241 | # it guarantees that the distribution is self-contained by making another |
1242 | @@ -591,8 +633,8 @@ |
1243 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
1244 | *.tar.bz2*) \ |
1245 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
1246 | - *.tar.lzma*) \ |
1247 | - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
1248 | + *.tar.lz*) \ |
1249 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
1250 | *.tar.xz*) \ |
1251 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
1252 | *.tar.Z*) \ |
1253 | @@ -602,9 +644,9 @@ |
1254 | *.zip*) \ |
1255 | unzip $(distdir).zip ;;\ |
1256 | esac |
1257 | - chmod -R a-w $(distdir); chmod a+w $(distdir) |
1258 | - mkdir $(distdir)/_build |
1259 | - mkdir $(distdir)/_inst |
1260 | + chmod -R a-w $(distdir) |
1261 | + chmod u+w $(distdir) |
1262 | + mkdir $(distdir)/_build $(distdir)/_inst |
1263 | chmod a-w $(distdir) |
1264 | test -d $(distdir)/_build || exit 0; \ |
1265 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
1266 | @@ -612,6 +654,7 @@ |
1267 | && am__cwd=`pwd` \ |
1268 | && $(am__cd) $(distdir)/_build \ |
1269 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
1270 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
1271 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
1272 | && $(MAKE) $(AM_MAKEFLAGS) \ |
1273 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
1274 | @@ -635,13 +678,21 @@ |
1275 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
1276 | && cd "$$am__cwd" \ |
1277 | || exit 1 |
1278 | - $(am__remove_distdir) |
1279 | + $(am__post_remove_distdir) |
1280 | @(echo "$(distdir) archives ready for distribution: "; \ |
1281 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
1282 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
1283 | distuninstallcheck: |
1284 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
1285 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
1286 | + @test -n '$(distuninstallcheck_dir)' || { \ |
1287 | + echo 'ERROR: trying to run $@ with an empty' \ |
1288 | + '$$(distuninstallcheck_dir)' >&2; \ |
1289 | + exit 1; \ |
1290 | + }; \ |
1291 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
1292 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
1293 | + exit 1; \ |
1294 | + }; \ |
1295 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
1296 | || { echo "ERROR: files left after uninstall:" ; \ |
1297 | if test -n "$(DESTDIR)"; then \ |
1298 | echo " (check DESTDIR support)"; \ |
1299 | @@ -672,10 +723,15 @@ |
1300 | |
1301 | installcheck: installcheck-recursive |
1302 | install-strip: |
1303 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1304 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1305 | - `test -z '$(STRIP)' || \ |
1306 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1307 | + if test -z '$(STRIP)'; then \ |
1308 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1309 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1310 | + install; \ |
1311 | + else \ |
1312 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1313 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1314 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1315 | + fi |
1316 | mostlyclean-generic: |
1317 | |
1318 | clean-generic: |
1319 | @@ -758,25 +814,24 @@ |
1320 | |
1321 | uninstall-am: |
1322 | |
1323 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
1324 | - ctags-recursive install-am install-strip tags-recursive |
1325 | +.MAKE: $(am__recursive_targets) all install-am install-strip |
1326 | |
1327 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
1328 | - all all-am am--refresh check check-am clean clean-generic \ |
1329 | - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
1330 | - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ |
1331 | - distcheck distclean distclean-generic distclean-hdr \ |
1332 | - distclean-libtool distclean-local distclean-tags \ |
1333 | - distcleancheck distdir distuninstallcheck dvi dvi-am html \ |
1334 | - html-am info info-am install install-am install-data \ |
1335 | - install-data-am install-dvi install-dvi-am install-exec \ |
1336 | - install-exec-am install-html install-html-am install-info \ |
1337 | - install-info-am install-man install-pdf install-pdf-am \ |
1338 | - install-ps install-ps-am install-strip installcheck \ |
1339 | - installcheck-am installdirs installdirs-am maintainer-clean \ |
1340 | - maintainer-clean-generic mostlyclean mostlyclean-generic \ |
1341 | - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
1342 | - uninstall uninstall-am |
1343 | +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ |
1344 | + am--refresh check check-am clean clean-cscope clean-generic \ |
1345 | + clean-libtool cscope cscopelist-am ctags ctags-am dist \ |
1346 | + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ |
1347 | + dist-tarZ dist-xz dist-zip distcheck distclean \ |
1348 | + distclean-generic distclean-hdr distclean-libtool \ |
1349 | + distclean-local distclean-tags distcleancheck distdir \ |
1350 | + distuninstallcheck dvi dvi-am html html-am info info-am \ |
1351 | + install install-am install-data install-data-am install-dvi \ |
1352 | + install-dvi-am install-exec install-exec-am install-html \ |
1353 | + install-html-am install-info install-info-am install-man \ |
1354 | + install-pdf install-pdf-am install-ps install-ps-am \ |
1355 | + install-strip installcheck installcheck-am installdirs \ |
1356 | + installdirs-am maintainer-clean maintainer-clean-generic \ |
1357 | + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
1358 | + ps ps-am tags tags-am uninstall uninstall-am |
1359 | |
1360 | |
1361 | distclean-local: |
1362 | @@ -786,6 +841,15 @@ |
1363 | rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz |
1364 | @rm -f $(PACKAGE)-$(VERSION).tar.gz |
1365 | |
1366 | +.PHONY: ChangeLog |
1367 | + |
1368 | +ChangeLog: Makefile |
1369 | + (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \ |
1370 | + && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \ |
1371 | + || (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2) |
1372 | + |
1373 | +dist-hook: ChangeLog |
1374 | + |
1375 | # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: |
1376 | |
1377 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
1378 | |
1379 | === modified file 'NEWS' |
1380 | --- NEWS 2011-01-19 20:17:31 +0000 |
1381 | +++ NEWS 2014-05-27 22:31:05 +0000 |
1382 | @@ -1,5 +1,17 @@ |
1383 | -4.4.1 (2010/12/18): |
1384 | +4.4.2 (2013-03-04): |
1385 | ------------------- |
1386 | +- Small optimizations to update function, making animation more smooth. |
1387 | +- Support for deskbar mode and panel multi-row config (>=xfce4-panel-4.9.0). |
1388 | +- Make eye movement independent, like in xeyes (bug #9036). |
1389 | +- Implement eye position calculations in 3D coordinatines (bug #9036). |
1390 | +- Build the plugin as a module. |
1391 | +- Autotools update (automake-1.13 compatibility and other issues). |
1392 | +- Fix remembering theme (bug #9035). |
1393 | +- Update size after panel orientation change (bug #8404). |
1394 | +- More translation updates. |
1395 | +- Port to libxfce4ui (bug #8074). |
1396 | |
1397 | - * Translated into 11 more languages, for a total of 54, 36 of which are fully translated. |
1398 | - * Fix compile issues, resolving bug # 5740 and 6024 |
1399 | +4.4.1 (2010-12-18): |
1400 | +------------------- |
1401 | +- Translated into 11 more languages, for a total of 54, 36 of which are fully translated. |
1402 | +- Fix compile issues, resolving bugs #5740 and #6024. |
1403 | |
1404 | === modified file 'README' |
1405 | --- README 2011-01-19 20:17:31 +0000 |
1406 | +++ README 2014-05-27 22:31:05 +0000 |
1407 | @@ -1,7 +1,124 @@ |
1408 | - |
1409 | -eyes is a xfce4 panel plugin that adds eyes which watch your every step. |
1410 | -Scary! |
1411 | +XFCE4-EYES-PLUGIN |
1412 | +========================================================================== |
1413 | +You can always find up-to-date information at the plugin homepage: |
1414 | +http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin |
1415 | + |
1416 | + |
1417 | +CONTENTS |
1418 | +========================================================================== |
1419 | +* ABOUT |
1420 | +* USAGE |
1421 | +* DEBUGGING AND REPORTING BUGS |
1422 | +* REQUIREMENTS AND DEPENDENCIES |
1423 | +* EASY BUILD INSTRUCTIONS |
1424 | +* TRANSLATING THE PLUGIN FOR YOUR LANGUAGE |
1425 | + |
1426 | + |
1427 | +ABOUT |
1428 | +========================================================================== |
1429 | +xfce4-eyes-plugin is a xfce4 panel plugin that adds eyes which watch |
1430 | +your every step. Scary! |
1431 | |
1432 | Portions of the xfce4-eyes code were taken from geyes. These, and the rest of |
1433 | the code are licensed under the terms of the GNU General public license; see |
1434 | the COPYING file. |
1435 | + |
1436 | + |
1437 | +USAGE |
1438 | +========================================================================== |
1439 | +Simply add the plugin to the panel and select a theme in the |
1440 | +configuration dialog. Depending on how big the eyes are and where on |
1441 | +the panel you want the eyes to appear, you might find changing the |
1442 | +single-row option useful. It becomes effective only in multi-row mode. |
1443 | + |
1444 | + |
1445 | +DEBUGGING AND REPORTING BUGS |
1446 | +========================================================================== |
1447 | +Before reporting bugs or asking for new features, please consolidate |
1448 | +the Xfce bug tracker at https://bugzilla.xfce.org, because your issue |
1449 | +or request might have been reported already or be in planning. |
1450 | + |
1451 | + |
1452 | +BUILD REQUIREMENTS AND DEPENDENCIES |
1453 | +========================================================================== |
1454 | +If you have installed Xfce, you already have all required dependencies |
1455 | +installed. |
1456 | + |
1457 | + |
1458 | +EASY BUILD INSTRUCTIONS |
1459 | +========================================================================== |
1460 | +If you're interesting in building the plugin yourself, these |
1461 | +instructions provided here will work for most users. If not, please |
1462 | +look at the INSTALL file or ask at a forum for your linux distribution |
1463 | +or try the methods explained on http://www.xfce.org/community. Make |
1464 | +sure you have installed the needed dependencies (see previous section |
1465 | +BUILD REQUIREMENTS AND DEPENDENCIES). |
1466 | + |
1467 | +For the panel being able to find the plugin, it is important to set |
1468 | +the proper prefix. The prefix is the place in the filesystem where the |
1469 | +plugin files gets installed. It has to match the prefix used for |
1470 | +building the panel. There's nothing the plugin can do about that |
1471 | +requirement. When you're using the panel provided by the package |
1472 | +management system of your distribution, then the prefix is in most |
1473 | +cases /usr, otherwise the default prefix is /usr/local. |
1474 | + |
1475 | +If you want to install the current version from git, execute the |
1476 | +following command in the plugin project directory (make sure you have |
1477 | +GNU automake installed!): |
1478 | + |
1479 | +1a) ./autogen.sh --prefix=/usr |
1480 | + |
1481 | +If an error about a missing ltmain.sh occurs, try "autoreconf -i". |
1482 | + |
1483 | +Otherwise, if you've downloaded the tarball from e.g. |
1484 | +http://archive.xfce.org/, issue the following command: |
1485 | + |
1486 | +1b) ./configure --prefix=/usr |
1487 | + |
1488 | +If 1a) or 1b) fail, you should receive an error message telling you |
1489 | +the cause for the failure (e.g. missings libraries). If you're missing |
1490 | +a dependency you need to install it using the package management |
1491 | +system of your distribution. Distributions commonly have two versions |
1492 | +of a software package: One containing the supplementary files needed |
1493 | +for compiling other packages, and the other one providing the runtime |
1494 | +libraries etc. While the latter is usually installed, the former often |
1495 | +is not, so better check this. |
1496 | + |
1497 | +Note: To solve distribution-specific problems the most efficient way |
1498 | +is to ask at a forum for your distribution, not on a general forum. |
1499 | + |
1500 | +Then for both cases: |
1501 | +2) make |
1502 | + |
1503 | +If this fails, file a bug on https://bugzilla.xfce.org, or send a mail |
1504 | +to the xfce mailing list and provide make output. |
1505 | + |
1506 | +Finally, and usually as root: |
1507 | +3) make install |
1508 | + |
1509 | +Note: Depending on your prefix, this might overwrite an existing |
1510 | +version of the plugin. |
1511 | + |
1512 | +You can later uninstall the plugin (as root) with |
1513 | +4) make uninstall |
1514 | + |
1515 | +The panel should then recognize the new plugin, if it doesn't try to |
1516 | +restart it using xfce4-panel -r. If it still doesn't work after that |
1517 | +try to ask for help somewhere (forums, mailing lists, #xfce on |
1518 | +IRC). Please do not report such problems on the bug tracker. |
1519 | + |
1520 | + |
1521 | +TRANSLATING THE PLUGIN FOR YOUR LANGUAGE |
1522 | +========================================================================== |
1523 | +If you need help getting started with translating the plugin into your |
1524 | +language, please visit https://translations.xfce.org/ and absorb the |
1525 | +information that is there, especially on the *Help* page! There is |
1526 | +other useful documentation available on this topic, try this wiki page |
1527 | +for a start: |
1528 | +https://wiki.xfce.org/translations/translation_guidance_in_xfce |
1529 | + |
1530 | +TRANSLATORS, PLEASE MAKE SURE YOU CHECK YOUR FILE FOR ERRORS BEFORE |
1531 | +UPLOADING IT! Otherwise, it will break compilation of the plugin. It |
1532 | +is easy to do this with the following command (where file.po is the po |
1533 | +file of your language): |
1534 | +msgfmt -c --check-accelerators=_ -v -o /dev/null <file.po> |
1535 | |
1536 | === modified file 'aclocal.m4' |
1537 | --- aclocal.m4 2011-01-19 20:17:31 +0000 |
1538 | +++ aclocal.m4 2014-05-27 22:31:05 +0000 |
1539 | @@ -1,7 +1,7 @@ |
1540 | -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
1541 | - |
1542 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
1543 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
1544 | +# generated automatically by aclocal 1.13.1 -*- Autoconf -*- |
1545 | + |
1546 | +# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
1547 | + |
1548 | # This file is free software; the Free Software Foundation |
1549 | # gives unlimited permission to copy and/or distribute it, |
1550 | # with or without modifications, as long as this notice is preserved. |
1551 | @@ -11,13 +11,14 @@ |
1552 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1553 | # PARTICULAR PURPOSE. |
1554 | |
1555 | +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) |
1556 | m4_ifndef([AC_AUTOCONF_VERSION], |
1557 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1558 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, |
1559 | -[m4_warning([this file was generated for autoconf 2.68. |
1560 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
1561 | +[m4_warning([this file was generated for autoconf 2.69. |
1562 | You have another version of autoconf. It may work, but is not guaranteed to. |
1563 | If you have problems, you may need to regenerate the build system entirely. |
1564 | -To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
1565 | +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
1566 | |
1567 | # Copyright (C) 1995-2002 Free Software Foundation, Inc. |
1568 | # Copyright (C) 2001-2003,2004 Red Hat, Inc. |
1569 | @@ -260,6 +261,10 @@ |
1570 | [CATOBJEXT=.mo |
1571 | DATADIRNAME=lib]) |
1572 | ;; |
1573 | + *-*-openbsd*) |
1574 | + CATOBJEXT=.mo |
1575 | + DATADIRNAME=share |
1576 | + ;; |
1577 | *) |
1578 | CATOBJEXT=.mo |
1579 | DATADIRNAME=lib |
1580 | @@ -454,7 +459,7 @@ |
1581 | |
1582 | |
1583 | dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) |
1584 | -# serial 40 IT_PROG_INTLTOOL |
1585 | +# serial 42 IT_PROG_INTLTOOL |
1586 | AC_DEFUN([IT_PROG_INTLTOOL], [ |
1587 | AC_PREREQ([2.50])dnl |
1588 | AC_REQUIRE([AM_NLS])dnl |
1589 | @@ -467,13 +472,11 @@ |
1590 | ;; |
1591 | esac |
1592 | |
1593 | +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
1594 | +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` |
1595 | +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
1596 | if test -n "$1"; then |
1597 | AC_MSG_CHECKING([for intltool >= $1]) |
1598 | - |
1599 | - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
1600 | - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` |
1601 | - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
1602 | - ] |
1603 | AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) |
1604 | test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || |
1605 | AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) |
1606 | @@ -486,25 +489,48 @@ |
1607 | AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) |
1608 | fi |
1609 | |
1610 | - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1611 | -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1612 | - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1613 | - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1614 | - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' |
1615 | - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1616 | - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1617 | - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1618 | -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1619 | - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1620 | - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1621 | - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' |
1622 | - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1623 | - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1624 | - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1625 | - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1626 | - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1627 | - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1628 | - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1629 | +if test -z "$AM_DEFAULT_VERBOSITY"; then |
1630 | + AM_DEFAULT_VERBOSITY=1 |
1631 | +fi |
1632 | +AC_SUBST([AM_DEFAULT_VERBOSITY]) |
1633 | + |
1634 | +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' |
1635 | +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' |
1636 | +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' |
1637 | +AC_SUBST(INTLTOOL_V_MERGE) |
1638 | +AC_SUBST(INTLTOOL__v_MERGE_) |
1639 | +AC_SUBST(INTLTOOL__v_MERGE_0) |
1640 | + |
1641 | +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' |
1642 | +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' |
1643 | +intltool__v_merge_options_0='-q' |
1644 | +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) |
1645 | +AC_SUBST(intltool__v_merge_options_) |
1646 | +AC_SUBST(intltool__v_merge_options_0) |
1647 | + |
1648 | + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1649 | +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1650 | + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1651 | + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1652 | + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' |
1653 | + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1654 | + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1655 | + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1656 | +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1657 | + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1658 | + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1659 | +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then |
1660 | + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' |
1661 | +else |
1662 | + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' |
1663 | +fi |
1664 | + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1665 | + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1666 | + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1667 | + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1668 | + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1669 | + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1670 | + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1671 | |
1672 | _IT_SUBST(INTLTOOL_DESKTOP_RULE) |
1673 | _IT_SUBST(INTLTOOL_DIRECTORY_RULE) |
1674 | @@ -550,7 +576,7 @@ |
1675 | if test $? -ne 0; then |
1676 | AC_MSG_ERROR([perl 5.8.1 is required for intltool]) |
1677 | else |
1678 | - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" |
1679 | + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` |
1680 | AC_MSG_RESULT([$IT_PERL_VERSION]) |
1681 | fi |
1682 | if test "x$2" != "xno-xml"; then |
1683 | @@ -649,8 +675,8 @@ |
1684 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
1685 | # |
1686 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1687 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
1688 | -# Inc. |
1689 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1690 | +# Foundation, Inc. |
1691 | # Written by Gordon Matzigkeit, 1996 |
1692 | # |
1693 | # This file is free software; the Free Software Foundation gives |
1694 | @@ -659,8 +685,8 @@ |
1695 | |
1696 | m4_define([_LT_COPYING], [dnl |
1697 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1698 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
1699 | -# Inc. |
1700 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1701 | +# Foundation, Inc. |
1702 | # Written by Gordon Matzigkeit, 1996 |
1703 | # |
1704 | # This file is part of GNU Libtool. |
1705 | @@ -794,6 +820,8 @@ |
1706 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
1707 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
1708 | |
1709 | +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl |
1710 | +dnl |
1711 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
1712 | _LT_DECL([], [host], [0])dnl |
1713 | _LT_DECL([], [host_os], [0])dnl |
1714 | @@ -1279,7 +1307,7 @@ |
1715 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
1716 | configured by $[0], generated by m4_PACKAGE_STRING. |
1717 | |
1718 | -Copyright (C) 2010 Free Software Foundation, Inc. |
1719 | +Copyright (C) 2011 Free Software Foundation, Inc. |
1720 | This config.lt script is free software; the Free Software Foundation |
1721 | gives unlimited permision to copy, distribute and modify it." |
1722 | |
1723 | @@ -1443,6 +1471,7 @@ |
1724 | m4_case([$1], |
1725 | [C], [_LT_LANG(C)], |
1726 | [C++], [_LT_LANG(CXX)], |
1727 | + [Go], [_LT_LANG(GO)], |
1728 | [Java], [_LT_LANG(GCJ)], |
1729 | [Fortran 77], [_LT_LANG(F77)], |
1730 | [Fortran], [_LT_LANG(FC)], |
1731 | @@ -1464,6 +1493,29 @@ |
1732 | ])# _LT_LANG |
1733 | |
1734 | |
1735 | +m4_ifndef([AC_PROG_GO], [ |
1736 | +# NOTE: This macro has been submitted for inclusion into # |
1737 | +# GNU Autoconf as AC_PROG_GO. When it is available in # |
1738 | +# a released version of Autoconf we should remove this # |
1739 | +# macro and use it instead. # |
1740 | +m4_defun([AC_PROG_GO], |
1741 | +[AC_LANG_PUSH(Go)dnl |
1742 | +AC_ARG_VAR([GOC], [Go compiler command])dnl |
1743 | +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl |
1744 | +_AC_ARG_VAR_LDFLAGS()dnl |
1745 | +AC_CHECK_TOOL(GOC, gccgo) |
1746 | +if test -z "$GOC"; then |
1747 | + if test -n "$ac_tool_prefix"; then |
1748 | + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) |
1749 | + fi |
1750 | +fi |
1751 | +if test -z "$GOC"; then |
1752 | + AC_CHECK_PROG(GOC, gccgo, gccgo, false) |
1753 | +fi |
1754 | +])#m4_defun |
1755 | +])#m4_ifndef |
1756 | + |
1757 | + |
1758 | # _LT_LANG_DEFAULT_CONFIG |
1759 | # ----------------------- |
1760 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
1761 | @@ -1494,6 +1546,10 @@ |
1762 | m4_ifdef([LT_PROG_GCJ], |
1763 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
1764 | |
1765 | +AC_PROVIDE_IFELSE([AC_PROG_GO], |
1766 | + [LT_LANG(GO)], |
1767 | + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) |
1768 | + |
1769 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
1770 | [LT_LANG(RC)], |
1771 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
1772 | @@ -1596,7 +1652,13 @@ |
1773 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
1774 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
1775 | _lt_result=$? |
1776 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
1777 | + # If there is a non-empty error log, and "single_module" |
1778 | + # appears in it, assume the flag caused a linker warning |
1779 | + if test -s conftest.err && $GREP single_module conftest.err; then |
1780 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
1781 | + # Otherwise, if the output was created with a 0 exit code from |
1782 | + # the compiler, it worked. |
1783 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
1784 | lt_cv_apple_cc_single_mod=yes |
1785 | else |
1786 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1787 | @@ -1604,6 +1666,7 @@ |
1788 | rm -rf libconftest.dylib* |
1789 | rm -f conftest.* |
1790 | fi]) |
1791 | + |
1792 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
1793 | [lt_cv_ld_exported_symbols_list], |
1794 | [lt_cv_ld_exported_symbols_list=no |
1795 | @@ -1615,6 +1678,7 @@ |
1796 | [lt_cv_ld_exported_symbols_list=no]) |
1797 | LDFLAGS="$save_LDFLAGS" |
1798 | ]) |
1799 | + |
1800 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], |
1801 | [lt_cv_ld_force_load=no |
1802 | cat > conftest.c << _LT_EOF |
1803 | @@ -1632,7 +1696,9 @@ |
1804 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD |
1805 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
1806 | _lt_result=$? |
1807 | - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
1808 | + if test -s conftest.err && $GREP force_load conftest.err; then |
1809 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
1810 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
1811 | lt_cv_ld_force_load=yes |
1812 | else |
1813 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1814 | @@ -1677,8 +1743,8 @@ |
1815 | ]) |
1816 | |
1817 | |
1818 | -# _LT_DARWIN_LINKER_FEATURES |
1819 | -# -------------------------- |
1820 | +# _LT_DARWIN_LINKER_FEATURES([TAG]) |
1821 | +# --------------------------------- |
1822 | # Checks for linker and compiler features on darwin |
1823 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
1824 | [ |
1825 | @@ -1689,6 +1755,8 @@ |
1826 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
1827 | if test "$lt_cv_ld_force_load" = "yes"; then |
1828 | _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
1829 | + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], |
1830 | + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) |
1831 | else |
1832 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
1833 | fi |
1834 | @@ -1972,14 +2040,27 @@ |
1835 | CFLAGS="$SAVE_CFLAGS" |
1836 | fi |
1837 | ;; |
1838 | -sparc*-*solaris*) |
1839 | +*-*solaris*) |
1840 | # Find out which ABI we are using. |
1841 | echo 'int i;' > conftest.$ac_ext |
1842 | if AC_TRY_EVAL(ac_compile); then |
1843 | case `/usr/bin/file conftest.o` in |
1844 | *64-bit*) |
1845 | case $lt_cv_prog_gnu_ld in |
1846 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
1847 | + yes*) |
1848 | + case $host in |
1849 | + i?86-*-solaris*) |
1850 | + LD="${LD-ld} -m elf_x86_64" |
1851 | + ;; |
1852 | + sparc*-*-solaris*) |
1853 | + LD="${LD-ld} -m elf64_sparc" |
1854 | + ;; |
1855 | + esac |
1856 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
1857 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
1858 | + LD="${LD-ld}_sol2" |
1859 | + fi |
1860 | + ;; |
1861 | *) |
1862 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
1863 | LD="${LD-ld} -64" |
1864 | @@ -2056,13 +2137,13 @@ |
1865 | if test -n "$RANLIB"; then |
1866 | case $host_os in |
1867 | openbsd*) |
1868 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
1869 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
1870 | ;; |
1871 | *) |
1872 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
1873 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
1874 | ;; |
1875 | esac |
1876 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
1877 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
1878 | fi |
1879 | |
1880 | case $host_os in |
1881 | @@ -2242,6 +2323,11 @@ |
1882 | lt_cv_sys_max_cmd_len=196608 |
1883 | ;; |
1884 | |
1885 | + os2*) |
1886 | + # The test takes a long time on OS/2. |
1887 | + lt_cv_sys_max_cmd_len=8192 |
1888 | + ;; |
1889 | + |
1890 | osf*) |
1891 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
1892 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
1893 | @@ -2281,7 +2367,7 @@ |
1894 | # If test is not a shell built-in, we'll probably end up computing a |
1895 | # maximum length that is only half of the actual maximum length, but |
1896 | # we can't tell. |
1897 | - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
1898 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
1899 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
1900 | test $i != 17 # 1/2 MB should be enough |
1901 | do |
1902 | @@ -2827,7 +2913,7 @@ |
1903 | |
1904 | case $host_os in |
1905 | aix3*) |
1906 | - version_type=linux |
1907 | + version_type=linux # correct to gnu/linux during the next big refactor |
1908 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
1909 | shlibpath_var=LIBPATH |
1910 | |
1911 | @@ -2836,7 +2922,7 @@ |
1912 | ;; |
1913 | |
1914 | aix[[4-9]]*) |
1915 | - version_type=linux |
1916 | + version_type=linux # correct to gnu/linux during the next big refactor |
1917 | need_lib_prefix=no |
1918 | need_version=no |
1919 | hardcode_into_libs=yes |
1920 | @@ -2901,7 +2987,7 @@ |
1921 | ;; |
1922 | |
1923 | bsdi[[45]]*) |
1924 | - version_type=linux |
1925 | + version_type=linux # correct to gnu/linux during the next big refactor |
1926 | need_version=no |
1927 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1928 | soname_spec='${libname}${release}${shared_ext}$major' |
1929 | @@ -3040,7 +3126,7 @@ |
1930 | ;; |
1931 | |
1932 | dgux*) |
1933 | - version_type=linux |
1934 | + version_type=linux # correct to gnu/linux during the next big refactor |
1935 | need_lib_prefix=no |
1936 | need_version=no |
1937 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
1938 | @@ -3048,10 +3134,6 @@ |
1939 | shlibpath_var=LD_LIBRARY_PATH |
1940 | ;; |
1941 | |
1942 | -freebsd1*) |
1943 | - dynamic_linker=no |
1944 | - ;; |
1945 | - |
1946 | freebsd* | dragonfly*) |
1947 | # DragonFly does not have aout. When/if they implement a new |
1948 | # versioning mechanism, adjust this. |
1949 | @@ -3059,11 +3141,18 @@ |
1950 | objformat=`/usr/bin/objformat` |
1951 | else |
1952 | case $host_os in |
1953 | - freebsd[[123]]*) objformat=aout ;; |
1954 | + freebsd[[23]].*) objformat=aout ;; |
1955 | *) objformat=elf ;; |
1956 | esac |
1957 | fi |
1958 | - version_type=freebsd-$objformat |
1959 | + # Handle Gentoo/FreeBSD as it was Linux |
1960 | + case $host_vendor in |
1961 | + gentoo) |
1962 | + version_type=linux ;; |
1963 | + *) |
1964 | + version_type=freebsd-$objformat ;; |
1965 | + esac |
1966 | + |
1967 | case $version_type in |
1968 | freebsd-elf*) |
1969 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1970 | @@ -3074,10 +3163,16 @@ |
1971 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1972 | need_version=yes |
1973 | ;; |
1974 | + linux) |
1975 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1976 | + soname_spec='${libname}${release}${shared_ext}$major' |
1977 | + need_lib_prefix=no |
1978 | + need_version=no |
1979 | + ;; |
1980 | esac |
1981 | shlibpath_var=LD_LIBRARY_PATH |
1982 | case $host_os in |
1983 | - freebsd2*) |
1984 | + freebsd2.*) |
1985 | shlibpath_overrides_runpath=yes |
1986 | ;; |
1987 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
1988 | @@ -3097,17 +3192,18 @@ |
1989 | ;; |
1990 | |
1991 | gnu*) |
1992 | - version_type=linux |
1993 | + version_type=linux # correct to gnu/linux during the next big refactor |
1994 | need_lib_prefix=no |
1995 | need_version=no |
1996 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
1997 | soname_spec='${libname}${release}${shared_ext}$major' |
1998 | shlibpath_var=LD_LIBRARY_PATH |
1999 | + shlibpath_overrides_runpath=no |
2000 | hardcode_into_libs=yes |
2001 | ;; |
2002 | |
2003 | haiku*) |
2004 | - version_type=linux |
2005 | + version_type=linux # correct to gnu/linux during the next big refactor |
2006 | need_lib_prefix=no |
2007 | need_version=no |
2008 | dynamic_linker="$host_os runtime_loader" |
2009 | @@ -3168,7 +3264,7 @@ |
2010 | ;; |
2011 | |
2012 | interix[[3-9]]*) |
2013 | - version_type=linux |
2014 | + version_type=linux # correct to gnu/linux during the next big refactor |
2015 | need_lib_prefix=no |
2016 | need_version=no |
2017 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2018 | @@ -3184,7 +3280,7 @@ |
2019 | nonstopux*) version_type=nonstopux ;; |
2020 | *) |
2021 | if test "$lt_cv_prog_gnu_ld" = yes; then |
2022 | - version_type=linux |
2023 | + version_type=linux # correct to gnu/linux during the next big refactor |
2024 | else |
2025 | version_type=irix |
2026 | fi ;; |
2027 | @@ -3221,9 +3317,9 @@ |
2028 | dynamic_linker=no |
2029 | ;; |
2030 | |
2031 | -# This must be Linux ELF. |
2032 | +# This must be glibc/ELF. |
2033 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2034 | - version_type=linux |
2035 | + version_type=linux # correct to gnu/linux during the next big refactor |
2036 | need_lib_prefix=no |
2037 | need_version=no |
2038 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2039 | @@ -3286,7 +3382,7 @@ |
2040 | ;; |
2041 | |
2042 | newsos6) |
2043 | - version_type=linux |
2044 | + version_type=linux # correct to gnu/linux during the next big refactor |
2045 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2046 | shlibpath_var=LD_LIBRARY_PATH |
2047 | shlibpath_overrides_runpath=yes |
2048 | @@ -3355,7 +3451,7 @@ |
2049 | ;; |
2050 | |
2051 | solaris*) |
2052 | - version_type=linux |
2053 | + version_type=linux # correct to gnu/linux during the next big refactor |
2054 | need_lib_prefix=no |
2055 | need_version=no |
2056 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2057 | @@ -3380,7 +3476,7 @@ |
2058 | ;; |
2059 | |
2060 | sysv4 | sysv4.3*) |
2061 | - version_type=linux |
2062 | + version_type=linux # correct to gnu/linux during the next big refactor |
2063 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2064 | soname_spec='${libname}${release}${shared_ext}$major' |
2065 | shlibpath_var=LD_LIBRARY_PATH |
2066 | @@ -3404,7 +3500,7 @@ |
2067 | |
2068 | sysv4*MP*) |
2069 | if test -d /usr/nec ;then |
2070 | - version_type=linux |
2071 | + version_type=linux # correct to gnu/linux during the next big refactor |
2072 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
2073 | soname_spec='$libname${shared_ext}.$major' |
2074 | shlibpath_var=LD_LIBRARY_PATH |
2075 | @@ -3435,7 +3531,7 @@ |
2076 | |
2077 | tpf*) |
2078 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
2079 | - version_type=linux |
2080 | + version_type=linux # correct to gnu/linux during the next big refactor |
2081 | need_lib_prefix=no |
2082 | need_version=no |
2083 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2084 | @@ -3445,7 +3541,7 @@ |
2085 | ;; |
2086 | |
2087 | uts4*) |
2088 | - version_type=linux |
2089 | + version_type=linux # correct to gnu/linux during the next big refactor |
2090 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2091 | soname_spec='${libname}${release}${shared_ext}$major' |
2092 | shlibpath_var=LD_LIBRARY_PATH |
2093 | @@ -3867,7 +3963,7 @@ |
2094 | lt_cv_deplibs_check_method=pass_all |
2095 | ;; |
2096 | |
2097 | -# This must be Linux ELF. |
2098 | +# This must be glibc/ELF. |
2099 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2100 | lt_cv_deplibs_check_method=pass_all |
2101 | ;; |
2102 | @@ -4287,6 +4383,7 @@ |
2103 | # which start with @ or ?. |
2104 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
2105 | " {last_section=section; section=\$ 3};"\ |
2106 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
2107 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
2108 | " \$ 0!~/External *\|/{next};"\ |
2109 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
2110 | @@ -4871,7 +4968,9 @@ |
2111 | case $cc_basename in |
2112 | nvcc*) # Cuda Compiler Driver 2.2 |
2113 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' |
2114 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' |
2115 | + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then |
2116 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" |
2117 | + fi |
2118 | ;; |
2119 | esac |
2120 | else |
2121 | @@ -4963,18 +5062,33 @@ |
2122 | ;; |
2123 | *) |
2124 | case `$CC -V 2>&1 | sed 5q` in |
2125 | - *Sun\ F* | *Sun*Fortran*) |
2126 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) |
2127 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
2128 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2129 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2130 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
2131 | ;; |
2132 | + *Sun\ F* | *Sun*Fortran*) |
2133 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2134 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2135 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' |
2136 | + ;; |
2137 | *Sun\ C*) |
2138 | # Sun C 5.9 |
2139 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2140 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2141 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2142 | ;; |
2143 | + *Intel*\ [[CF]]*Compiler*) |
2144 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2145 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
2146 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
2147 | + ;; |
2148 | + *Portland\ Group*) |
2149 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2150 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
2151 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2152 | + ;; |
2153 | esac |
2154 | ;; |
2155 | esac |
2156 | @@ -5134,7 +5248,9 @@ |
2157 | ;; |
2158 | cygwin* | mingw* | cegcc*) |
2159 | case $cc_basename in |
2160 | - cl*) ;; |
2161 | + cl*) |
2162 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
2163 | + ;; |
2164 | *) |
2165 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
2166 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
2167 | @@ -5159,7 +5275,6 @@ |
2168 | _LT_TAGVAR(hardcode_direct, $1)=no |
2169 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
2170 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
2171 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
2172 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
2173 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
2174 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
2175 | @@ -5410,8 +5525,7 @@ |
2176 | xlf* | bgf* | bgxlf* | mpixlf*) |
2177 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
2178 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
2179 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
2180 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
2181 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2182 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
2183 | if test "x$supports_anon_versioning" = xyes; then |
2184 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
2185 | @@ -5706,6 +5820,7 @@ |
2186 | # The linker will not automatically build a static lib if we build a DLL. |
2187 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
2188 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2189 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
2190 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
2191 | # Don't use ranlib |
2192 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
2193 | @@ -5752,10 +5867,6 @@ |
2194 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
2195 | ;; |
2196 | |
2197 | - freebsd1*) |
2198 | - _LT_TAGVAR(ld_shlibs, $1)=no |
2199 | - ;; |
2200 | - |
2201 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
2202 | # support. Future versions do this automatically, but an explicit c++rt0.o |
2203 | # does not break anything, and helps significantly (at the cost of a little |
2204 | @@ -5768,7 +5879,7 @@ |
2205 | ;; |
2206 | |
2207 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
2208 | - freebsd2*) |
2209 | + freebsd2.*) |
2210 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
2211 | _LT_TAGVAR(hardcode_direct, $1)=yes |
2212 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
2213 | @@ -5807,7 +5918,6 @@ |
2214 | fi |
2215 | if test "$with_gnu_ld" = no; then |
2216 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
2217 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' |
2218 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
2219 | _LT_TAGVAR(hardcode_direct, $1)=yes |
2220 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes |
2221 | @@ -6249,9 +6359,6 @@ |
2222 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], |
2223 | [Flag to hardcode $libdir into a binary during linking. |
2224 | This must work even if $libdir does not exist]) |
2225 | -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], |
2226 | - [[If ld is used when linking, flag to hardcode $libdir into a binary |
2227 | - during linking. This must work even if $libdir does not exist]]) |
2228 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], |
2229 | [Whether we need a single "-rpath" flag with a separated argument]) |
2230 | _LT_TAGDECL([], [hardcode_direct], [0], |
2231 | @@ -6405,7 +6512,6 @@ |
2232 | _LT_TAGVAR(hardcode_direct, $1)=no |
2233 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
2234 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
2235 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
2236 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
2237 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
2238 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
2239 | @@ -6775,7 +6881,7 @@ |
2240 | esac |
2241 | ;; |
2242 | |
2243 | - freebsd[[12]]*) |
2244 | + freebsd2.*) |
2245 | # C++ shared libraries reported to be fairly broken before |
2246 | # switch to ELF |
2247 | _LT_TAGVAR(ld_shlibs, $1)=no |
2248 | @@ -7536,12 +7642,18 @@ |
2249 | } |
2250 | }; |
2251 | _LT_EOF |
2252 | +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF |
2253 | +package foo |
2254 | +func foo() { |
2255 | +} |
2256 | +_LT_EOF |
2257 | ]) |
2258 | |
2259 | _lt_libdeps_save_CFLAGS=$CFLAGS |
2260 | case "$CC $CFLAGS " in #( |
2261 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
2262 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
2263 | +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; |
2264 | esac |
2265 | |
2266 | dnl Parse the compiler output and extract the necessary |
2267 | @@ -7738,7 +7850,6 @@ |
2268 | _LT_TAGVAR(hardcode_direct, $1)=no |
2269 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
2270 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
2271 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
2272 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
2273 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
2274 | _LT_TAGVAR(hardcode_automatic, $1)=no |
2275 | @@ -7871,7 +7982,6 @@ |
2276 | _LT_TAGVAR(hardcode_direct, $1)=no |
2277 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
2278 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
2279 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
2280 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
2281 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
2282 | _LT_TAGVAR(hardcode_automatic, $1)=no |
2283 | @@ -8054,6 +8164,73 @@ |
2284 | ])# _LT_LANG_GCJ_CONFIG |
2285 | |
2286 | |
2287 | +# _LT_LANG_GO_CONFIG([TAG]) |
2288 | +# -------------------------- |
2289 | +# Ensure that the configuration variables for the GNU Go compiler |
2290 | +# are suitably defined. These variables are subsequently used by _LT_CONFIG |
2291 | +# to write the compiler configuration to `libtool'. |
2292 | +m4_defun([_LT_LANG_GO_CONFIG], |
2293 | +[AC_REQUIRE([LT_PROG_GO])dnl |
2294 | +AC_LANG_SAVE |
2295 | + |
2296 | +# Source file extension for Go test sources. |
2297 | +ac_ext=go |
2298 | + |
2299 | +# Object file extension for compiled Go test sources. |
2300 | +objext=o |
2301 | +_LT_TAGVAR(objext, $1)=$objext |
2302 | + |
2303 | +# Code to be used in simple compile tests |
2304 | +lt_simple_compile_test_code="package main; func main() { }" |
2305 | + |
2306 | +# Code to be used in simple link tests |
2307 | +lt_simple_link_test_code='package main; func main() { }' |
2308 | + |
2309 | +# ltmain only uses $CC for tagged configurations so make sure $CC is set. |
2310 | +_LT_TAG_COMPILER |
2311 | + |
2312 | +# save warnings/boilerplate of simple test code |
2313 | +_LT_COMPILER_BOILERPLATE |
2314 | +_LT_LINKER_BOILERPLATE |
2315 | + |
2316 | +# Allow CC to be a program name with arguments. |
2317 | +lt_save_CC=$CC |
2318 | +lt_save_CFLAGS=$CFLAGS |
2319 | +lt_save_GCC=$GCC |
2320 | +GCC=yes |
2321 | +CC=${GOC-"gccgo"} |
2322 | +CFLAGS=$GOFLAGS |
2323 | +compiler=$CC |
2324 | +_LT_TAGVAR(compiler, $1)=$CC |
2325 | +_LT_TAGVAR(LD, $1)="$LD" |
2326 | +_LT_CC_BASENAME([$compiler]) |
2327 | + |
2328 | +# Go did not exist at the time GCC didn't implicitly link libc in. |
2329 | +_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
2330 | + |
2331 | +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
2332 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
2333 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
2334 | + |
2335 | +if test -n "$compiler"; then |
2336 | + _LT_COMPILER_NO_RTTI($1) |
2337 | + _LT_COMPILER_PIC($1) |
2338 | + _LT_COMPILER_C_O($1) |
2339 | + _LT_COMPILER_FILE_LOCKS($1) |
2340 | + _LT_LINKER_SHLIBS($1) |
2341 | + _LT_LINKER_HARDCODE_LIBPATH($1) |
2342 | + |
2343 | + _LT_CONFIG($1) |
2344 | +fi |
2345 | + |
2346 | +AC_LANG_RESTORE |
2347 | + |
2348 | +GCC=$lt_save_GCC |
2349 | +CC=$lt_save_CC |
2350 | +CFLAGS=$lt_save_CFLAGS |
2351 | +])# _LT_LANG_GO_CONFIG |
2352 | + |
2353 | + |
2354 | # _LT_LANG_RC_CONFIG([TAG]) |
2355 | # ------------------------- |
2356 | # Ensure that the configuration variables for the Windows resource compiler |
2357 | @@ -8123,6 +8300,13 @@ |
2358 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) |
2359 | |
2360 | |
2361 | +# LT_PROG_GO |
2362 | +# ---------- |
2363 | +AC_DEFUN([LT_PROG_GO], |
2364 | +[AC_CHECK_TOOL(GOC, gccgo,) |
2365 | +]) |
2366 | + |
2367 | + |
2368 | # LT_PROG_RC |
2369 | # ---------- |
2370 | AC_DEFUN([LT_PROG_RC], |
2371 | @@ -8787,9 +8971,24 @@ |
2372 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. |
2373 | m4_define([_LT_WITH_PIC], |
2374 | [AC_ARG_WITH([pic], |
2375 | - [AS_HELP_STRING([--with-pic], |
2376 | + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], |
2377 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], |
2378 | - [pic_mode="$withval"], |
2379 | + [lt_p=${PACKAGE-default} |
2380 | + case $withval in |
2381 | + yes|no) pic_mode=$withval ;; |
2382 | + *) |
2383 | + pic_mode=default |
2384 | + # Look at the argument we got. We use all the common list separators. |
2385 | + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
2386 | + for lt_pkg in $withval; do |
2387 | + IFS="$lt_save_ifs" |
2388 | + if test "X$lt_pkg" = "X$lt_p"; then |
2389 | + pic_mode=yes |
2390 | + fi |
2391 | + done |
2392 | + IFS="$lt_save_ifs" |
2393 | + ;; |
2394 | + esac], |
2395 | [pic_mode=default]) |
2396 | |
2397 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) |
2398 | @@ -8961,15 +9160,15 @@ |
2399 | |
2400 | # @configure_input@ |
2401 | |
2402 | -# serial 3293 ltversion.m4 |
2403 | +# serial 3337 ltversion.m4 |
2404 | # This file is part of GNU Libtool |
2405 | |
2406 | -m4_define([LT_PACKAGE_VERSION], [2.4]) |
2407 | -m4_define([LT_PACKAGE_REVISION], [1.3293]) |
2408 | +m4_define([LT_PACKAGE_VERSION], [2.4.2]) |
2409 | +m4_define([LT_PACKAGE_REVISION], [1.3337]) |
2410 | |
2411 | AC_DEFUN([LTVERSION_VERSION], |
2412 | -[macro_version='2.4' |
2413 | -macro_revision='1.3293' |
2414 | +[macro_version='2.4.2' |
2415 | +macro_revision='1.3337' |
2416 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
2417 | _LT_DECL(, macro_revision, 0) |
2418 | ]) |
2419 | @@ -9074,7 +9273,7 @@ |
2420 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) |
2421 | |
2422 | # nls.m4 serial 5 (gettext-0.18) |
2423 | -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, |
2424 | +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2012 Free Software Foundation, |
2425 | dnl Inc. |
2426 | dnl This file is free software; the Free Software Foundation |
2427 | dnl gives unlimited permission to copy and/or distribute it, |
2428 | @@ -9106,7 +9305,222 @@ |
2429 | AC_SUBST([USE_NLS]) |
2430 | ]) |
2431 | |
2432 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
2433 | +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
2434 | +# serial 1 (pkg-config-0.24) |
2435 | +# |
2436 | +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
2437 | +# |
2438 | +# This program is free software; you can redistribute it and/or modify |
2439 | +# it under the terms of the GNU General Public License as published by |
2440 | +# the Free Software Foundation; either version 2 of the License, or |
2441 | +# (at your option) any later version. |
2442 | +# |
2443 | +# This program is distributed in the hope that it will be useful, but |
2444 | +# WITHOUT ANY WARRANTY; without even the implied warranty of |
2445 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
2446 | +# General Public License for more details. |
2447 | +# |
2448 | +# You should have received a copy of the GNU General Public License |
2449 | +# along with this program; if not, write to the Free Software |
2450 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
2451 | +# |
2452 | +# As a special exception to the GNU General Public License, if you |
2453 | +# distribute this file as part of a program that contains a |
2454 | +# configuration script generated by Autoconf, you may include it under |
2455 | +# the same distribution terms that you use for the rest of that program. |
2456 | + |
2457 | +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) |
2458 | +# ---------------------------------- |
2459 | +AC_DEFUN([PKG_PROG_PKG_CONFIG], |
2460 | +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
2461 | +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) |
2462 | +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) |
2463 | +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
2464 | +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
2465 | +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
2466 | + |
2467 | +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
2468 | + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
2469 | +fi |
2470 | +if test -n "$PKG_CONFIG"; then |
2471 | + _pkg_min_version=m4_default([$1], [0.9.0]) |
2472 | + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) |
2473 | + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
2474 | + AC_MSG_RESULT([yes]) |
2475 | + else |
2476 | + AC_MSG_RESULT([no]) |
2477 | + PKG_CONFIG="" |
2478 | + fi |
2479 | +fi[]dnl |
2480 | +])# PKG_PROG_PKG_CONFIG |
2481 | + |
2482 | +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
2483 | +# |
2484 | +# Check to see whether a particular set of modules exists. Similar |
2485 | +# to PKG_CHECK_MODULES(), but does not set variables or print errors. |
2486 | +# |
2487 | +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
2488 | +# only at the first occurence in configure.ac, so if the first place |
2489 | +# it's called might be skipped (such as if it is within an "if", you |
2490 | +# have to call PKG_CHECK_EXISTS manually |
2491 | +# -------------------------------------------------------------- |
2492 | +AC_DEFUN([PKG_CHECK_EXISTS], |
2493 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
2494 | +if test -n "$PKG_CONFIG" && \ |
2495 | + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
2496 | + m4_default([$2], [:]) |
2497 | +m4_ifvaln([$3], [else |
2498 | + $3])dnl |
2499 | +fi]) |
2500 | + |
2501 | +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
2502 | +# --------------------------------------------- |
2503 | +m4_define([_PKG_CONFIG], |
2504 | +[if test -n "$$1"; then |
2505 | + pkg_cv_[]$1="$$1" |
2506 | + elif test -n "$PKG_CONFIG"; then |
2507 | + PKG_CHECK_EXISTS([$3], |
2508 | + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` |
2509 | + test "x$?" != "x0" && pkg_failed=yes ], |
2510 | + [pkg_failed=yes]) |
2511 | + else |
2512 | + pkg_failed=untried |
2513 | +fi[]dnl |
2514 | +])# _PKG_CONFIG |
2515 | + |
2516 | +# _PKG_SHORT_ERRORS_SUPPORTED |
2517 | +# ----------------------------- |
2518 | +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], |
2519 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
2520 | +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
2521 | + _pkg_short_errors_supported=yes |
2522 | +else |
2523 | + _pkg_short_errors_supported=no |
2524 | +fi[]dnl |
2525 | +])# _PKG_SHORT_ERRORS_SUPPORTED |
2526 | + |
2527 | + |
2528 | +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], |
2529 | +# [ACTION-IF-NOT-FOUND]) |
2530 | +# |
2531 | +# |
2532 | +# Note that if there is a possibility the first call to |
2533 | +# PKG_CHECK_MODULES might not happen, you should be sure to include an |
2534 | +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac |
2535 | +# |
2536 | +# |
2537 | +# -------------------------------------------------------------- |
2538 | +AC_DEFUN([PKG_CHECK_MODULES], |
2539 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
2540 | +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl |
2541 | +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl |
2542 | + |
2543 | +pkg_failed=no |
2544 | +AC_MSG_CHECKING([for $1]) |
2545 | + |
2546 | +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) |
2547 | +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) |
2548 | + |
2549 | +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS |
2550 | +and $1[]_LIBS to avoid the need to call pkg-config. |
2551 | +See the pkg-config man page for more details.]) |
2552 | + |
2553 | +if test $pkg_failed = yes; then |
2554 | + AC_MSG_RESULT([no]) |
2555 | + _PKG_SHORT_ERRORS_SUPPORTED |
2556 | + if test $_pkg_short_errors_supported = yes; then |
2557 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` |
2558 | + else |
2559 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` |
2560 | + fi |
2561 | + # Put the nasty error message in config.log where it belongs |
2562 | + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
2563 | + |
2564 | + m4_default([$4], [AC_MSG_ERROR( |
2565 | +[Package requirements ($2) were not met: |
2566 | + |
2567 | +$$1_PKG_ERRORS |
2568 | + |
2569 | +Consider adjusting the PKG_CONFIG_PATH environment variable if you |
2570 | +installed software in a non-standard prefix. |
2571 | + |
2572 | +_PKG_TEXT])[]dnl |
2573 | + ]) |
2574 | +elif test $pkg_failed = untried; then |
2575 | + AC_MSG_RESULT([no]) |
2576 | + m4_default([$4], [AC_MSG_FAILURE( |
2577 | +[The pkg-config script could not be found or is too old. Make sure it |
2578 | +is in your PATH or set the PKG_CONFIG environment variable to the full |
2579 | +path to pkg-config. |
2580 | + |
2581 | +_PKG_TEXT |
2582 | + |
2583 | +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl |
2584 | + ]) |
2585 | +else |
2586 | + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
2587 | + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
2588 | + AC_MSG_RESULT([yes]) |
2589 | + $3 |
2590 | +fi[]dnl |
2591 | +])# PKG_CHECK_MODULES |
2592 | + |
2593 | + |
2594 | +# PKG_INSTALLDIR(DIRECTORY) |
2595 | +# ------------------------- |
2596 | +# Substitutes the variable pkgconfigdir as the location where a module |
2597 | +# should install pkg-config .pc files. By default the directory is |
2598 | +# $libdir/pkgconfig, but the default can be changed by passing |
2599 | +# DIRECTORY. The user can override through the --with-pkgconfigdir |
2600 | +# parameter. |
2601 | +AC_DEFUN([PKG_INSTALLDIR], |
2602 | +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) |
2603 | +m4_pushdef([pkg_description], |
2604 | + [pkg-config installation directory @<:@]pkg_default[@:>@]) |
2605 | +AC_ARG_WITH([pkgconfigdir], |
2606 | + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, |
2607 | + [with_pkgconfigdir=]pkg_default) |
2608 | +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) |
2609 | +m4_popdef([pkg_default]) |
2610 | +m4_popdef([pkg_description]) |
2611 | +]) dnl PKG_INSTALLDIR |
2612 | + |
2613 | + |
2614 | +# PKG_NOARCH_INSTALLDIR(DIRECTORY) |
2615 | +# ------------------------- |
2616 | +# Substitutes the variable noarch_pkgconfigdir as the location where a |
2617 | +# module should install arch-independent pkg-config .pc files. By |
2618 | +# default the directory is $datadir/pkgconfig, but the default can be |
2619 | +# changed by passing DIRECTORY. The user can override through the |
2620 | +# --with-noarch-pkgconfigdir parameter. |
2621 | +AC_DEFUN([PKG_NOARCH_INSTALLDIR], |
2622 | +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) |
2623 | +m4_pushdef([pkg_description], |
2624 | + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) |
2625 | +AC_ARG_WITH([noarch-pkgconfigdir], |
2626 | + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, |
2627 | + [with_noarch_pkgconfigdir=]pkg_default) |
2628 | +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) |
2629 | +m4_popdef([pkg_default]) |
2630 | +m4_popdef([pkg_description]) |
2631 | +]) dnl PKG_NOARCH_INSTALLDIR |
2632 | + |
2633 | + |
2634 | +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, |
2635 | +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
2636 | +# ------------------------------------------- |
2637 | +# Retrieves the value of the pkg-config variable for the given module. |
2638 | +AC_DEFUN([PKG_CHECK_VAR], |
2639 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
2640 | +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl |
2641 | + |
2642 | +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) |
2643 | +AS_VAR_COPY([$1], [pkg_cv_][$1]) |
2644 | + |
2645 | +AS_VAR_IF([$1], [""], [$5], [$4])dnl |
2646 | +])# PKG_CHECK_VAR |
2647 | + |
2648 | +# Copyright (C) 2002-2013 Free Software Foundation, Inc. |
2649 | # |
2650 | # This file is free software; the Free Software Foundation |
2651 | # gives unlimited permission to copy and/or distribute it, |
2652 | @@ -9118,10 +9532,10 @@ |
2653 | # generated from the m4 files accompanying Automake X.Y. |
2654 | # (This private macro should not be called outside this file.) |
2655 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
2656 | -[am__api_version='1.11' |
2657 | +[am__api_version='1.13' |
2658 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
2659 | dnl require some minimum version. Point them to the right macro. |
2660 | -m4_if([$1], [1.11.1], [], |
2661 | +m4_if([$1], [1.13.1], [], |
2662 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
2663 | ]) |
2664 | |
2665 | @@ -9137,22 +9551,22 @@ |
2666 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
2667 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
2668 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
2669 | -[AM_AUTOMAKE_VERSION([1.11.1])dnl |
2670 | +[AM_AUTOMAKE_VERSION([1.13.1])dnl |
2671 | m4_ifndef([AC_AUTOCONF_VERSION], |
2672 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
2673 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
2674 | |
2675 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
2676 | |
2677 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
2678 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
2679 | # |
2680 | # This file is free software; the Free Software Foundation |
2681 | # gives unlimited permission to copy and/or distribute it, |
2682 | # with or without modifications, as long as this notice is preserved. |
2683 | |
2684 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
2685 | -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
2686 | -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
2687 | +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
2688 | +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
2689 | # |
2690 | # Of course, Automake must honor this variable whenever it calls a |
2691 | # tool from the auxiliary directory. The problem is that $srcdir (and |
2692 | @@ -9171,7 +9585,7 @@ |
2693 | # |
2694 | # The reason of the latter failure is that $top_srcdir and $ac_aux_dir |
2695 | # are both prefixed by $srcdir. In an in-source build this is usually |
2696 | -# harmless because $srcdir is `.', but things will broke when you |
2697 | +# harmless because $srcdir is '.', but things will broke when you |
2698 | # start a VPATH build or use an absolute $srcdir. |
2699 | # |
2700 | # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, |
2701 | @@ -9197,22 +9611,19 @@ |
2702 | |
2703 | # AM_CONDITIONAL -*- Autoconf -*- |
2704 | |
2705 | -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 |
2706 | -# Free Software Foundation, Inc. |
2707 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
2708 | # |
2709 | # This file is free software; the Free Software Foundation |
2710 | # gives unlimited permission to copy and/or distribute it, |
2711 | # with or without modifications, as long as this notice is preserved. |
2712 | |
2713 | -# serial 9 |
2714 | - |
2715 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
2716 | # ------------------------------------- |
2717 | # Define a conditional. |
2718 | AC_DEFUN([AM_CONDITIONAL], |
2719 | -[AC_PREREQ(2.52)dnl |
2720 | - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
2721 | - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
2722 | +[AC_PREREQ([2.52])dnl |
2723 | + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
2724 | + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
2725 | AC_SUBST([$1_TRUE])dnl |
2726 | AC_SUBST([$1_FALSE])dnl |
2727 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl |
2728 | @@ -9231,16 +9642,14 @@ |
2729 | Usually this means the macro was only invoked conditionally.]]) |
2730 | fi])]) |
2731 | |
2732 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 |
2733 | -# Free Software Foundation, Inc. |
2734 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
2735 | # |
2736 | # This file is free software; the Free Software Foundation |
2737 | # gives unlimited permission to copy and/or distribute it, |
2738 | # with or without modifications, as long as this notice is preserved. |
2739 | |
2740 | -# serial 10 |
2741 | |
2742 | -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
2743 | +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be |
2744 | # written in clear, in which case automake, when reading aclocal.m4, |
2745 | # will think it sees a *use*, and therefore will trigger all it's |
2746 | # C support machinery. Also note that it means that autoscan, seeing |
2747 | @@ -9250,7 +9659,7 @@ |
2748 | # _AM_DEPENDENCIES(NAME) |
2749 | # ---------------------- |
2750 | # See how the compiler implements dependency checking. |
2751 | -# NAME is "CC", "CXX", "GCJ", or "OBJC". |
2752 | +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". |
2753 | # We try a few techniques and use that to set a single cache variable. |
2754 | # |
2755 | # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was |
2756 | @@ -9263,12 +9672,13 @@ |
2757 | AC_REQUIRE([AM_MAKE_INCLUDE])dnl |
2758 | AC_REQUIRE([AM_DEP_TRACK])dnl |
2759 | |
2760 | -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], |
2761 | - [$1], CXX, [depcc="$CXX" am_compiler_list=], |
2762 | - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
2763 | - [$1], UPC, [depcc="$UPC" am_compiler_list=], |
2764 | - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
2765 | - [depcc="$$1" am_compiler_list=]) |
2766 | +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], |
2767 | + [$1], [CXX], [depcc="$CXX" am_compiler_list=], |
2768 | + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
2769 | + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], |
2770 | + [$1], [UPC], [depcc="$UPC" am_compiler_list=], |
2771 | + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
2772 | + [depcc="$$1" am_compiler_list=]) |
2773 | |
2774 | AC_CACHE_CHECK([dependency style of $depcc], |
2775 | [am_cv_$1_dependencies_compiler_type], |
2776 | @@ -9276,8 +9686,9 @@ |
2777 | # We make a subdir and do the tests there. Otherwise we can end up |
2778 | # making bogus files that we don't know about and never remove. For |
2779 | # instance it was reported that on HP-UX the gcc test will end up |
2780 | - # making a dummy file named `D' -- because `-MD' means `put the output |
2781 | - # in D'. |
2782 | + # making a dummy file named 'D' -- because '-MD' means "put the output |
2783 | + # in D". |
2784 | + rm -rf conftest.dir |
2785 | mkdir conftest.dir |
2786 | # Copy depcomp to subdir because otherwise we won't find it if we're |
2787 | # using a relative directory. |
2788 | @@ -9316,16 +9727,16 @@ |
2789 | : > sub/conftest.c |
2790 | for i in 1 2 3 4 5 6; do |
2791 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
2792 | - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
2793 | - # Solaris 8's {/usr,}/bin/sh. |
2794 | - touch sub/conftst$i.h |
2795 | + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
2796 | + # Solaris 10 /bin/sh. |
2797 | + echo '/* dummy */' > sub/conftst$i.h |
2798 | done |
2799 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
2800 | |
2801 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
2802 | + # We check with '-c' and '-o' for the sake of the "dashmstdout" |
2803 | # mode. It turns out that the SunPro C++ compiler does not properly |
2804 | - # handle `-M -o', and we need to detect this. Also, some Intel |
2805 | - # versions had trouble with output in subdirs |
2806 | + # handle '-M -o', and we need to detect this. Also, some Intel |
2807 | + # versions had trouble with output in subdirs. |
2808 | am__obj=sub/conftest.${OBJEXT-o} |
2809 | am__minus_obj="-o $am__obj" |
2810 | case $depmode in |
2811 | @@ -9334,16 +9745,16 @@ |
2812 | test "$am__universal" = false || continue |
2813 | ;; |
2814 | nosideeffect) |
2815 | - # after this tag, mechanisms are not by side-effect, so they'll |
2816 | - # only be used when explicitly requested |
2817 | + # After this tag, mechanisms are not by side-effect, so they'll |
2818 | + # only be used when explicitly requested. |
2819 | if test "x$enable_dependency_tracking" = xyes; then |
2820 | continue |
2821 | else |
2822 | break |
2823 | fi |
2824 | ;; |
2825 | - msvisualcpp | msvcmsys) |
2826 | - # This compiler won't grok `-c -o', but also, the minuso test has |
2827 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2828 | + # This compiler won't grok '-c -o', but also, the minuso test has |
2829 | # not run yet. These depmodes are late enough in the game, and |
2830 | # so weak that their functioning should not be impacted. |
2831 | am__obj=conftest.${OBJEXT-o} |
2832 | @@ -9391,7 +9802,7 @@ |
2833 | # AM_SET_DEPDIR |
2834 | # ------------- |
2835 | # Choose a directory name for dependency files. |
2836 | -# This macro is AC_REQUIREd in _AM_DEPENDENCIES |
2837 | +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. |
2838 | AC_DEFUN([AM_SET_DEPDIR], |
2839 | [AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
2840 | AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl |
2841 | @@ -9401,34 +9812,39 @@ |
2842 | # AM_DEP_TRACK |
2843 | # ------------ |
2844 | AC_DEFUN([AM_DEP_TRACK], |
2845 | -[AC_ARG_ENABLE(dependency-tracking, |
2846 | -[ --disable-dependency-tracking speeds up one-time build |
2847 | - --enable-dependency-tracking do not reject slow dependency extractors]) |
2848 | +[AC_ARG_ENABLE([dependency-tracking], [dnl |
2849 | +AS_HELP_STRING( |
2850 | + [--enable-dependency-tracking], |
2851 | + [do not reject slow dependency extractors]) |
2852 | +AS_HELP_STRING( |
2853 | + [--disable-dependency-tracking], |
2854 | + [speeds up one-time build])]) |
2855 | if test "x$enable_dependency_tracking" != xno; then |
2856 | am_depcomp="$ac_aux_dir/depcomp" |
2857 | AMDEPBACKSLASH='\' |
2858 | + am__nodep='_no' |
2859 | fi |
2860 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
2861 | AC_SUBST([AMDEPBACKSLASH])dnl |
2862 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
2863 | +AC_SUBST([am__nodep])dnl |
2864 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
2865 | ]) |
2866 | |
2867 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
2868 | |
2869 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
2870 | -# Free Software Foundation, Inc. |
2871 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
2872 | # |
2873 | # This file is free software; the Free Software Foundation |
2874 | # gives unlimited permission to copy and/or distribute it, |
2875 | # with or without modifications, as long as this notice is preserved. |
2876 | |
2877 | -#serial 5 |
2878 | |
2879 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
2880 | # ------------------------------ |
2881 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
2882 | [{ |
2883 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files |
2884 | + # Older Autoconf quotes --file arguments for eval, but not when files |
2885 | # are listed without --file. Let's play safe and only enable the eval |
2886 | # if we detect the quoting. |
2887 | case $CONFIG_FILES in |
2888 | @@ -9441,7 +9857,7 @@ |
2889 | # Strip MF so we end up with the name of the file. |
2890 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
2891 | # Check whether this is an Automake generated Makefile or not. |
2892 | - # We used to match only the files named `Makefile.in', but |
2893 | + # We used to match only the files named 'Makefile.in', but |
2894 | # some people rename them; so instead we look at the file content. |
2895 | # Grep'ing the first line is not enough: some people post-process |
2896 | # each Makefile.in and add a new line on top of each file to say so. |
2897 | @@ -9453,21 +9869,19 @@ |
2898 | continue |
2899 | fi |
2900 | # Extract the definition of DEPDIR, am__include, and am__quote |
2901 | - # from the Makefile without running `make'. |
2902 | + # from the Makefile without running 'make'. |
2903 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
2904 | test -z "$DEPDIR" && continue |
2905 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
2906 | test -z "am__include" && continue |
2907 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
2908 | - # When using ansi2knr, U may be empty or an underscore; expand it |
2909 | - U=`sed -n 's/^U = //p' < "$mf"` |
2910 | # Find all dependency output files, they are included files with |
2911 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
2912 | # simplest approach to changing $(DEPDIR) to its actual value in the |
2913 | # expansion. |
2914 | for file in `sed -n " |
2915 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
2916 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
2917 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
2918 | # Make sure the directory exists. |
2919 | test -f "$dirpart/$file" && continue |
2920 | fdir=`AS_DIRNAME(["$file"])` |
2921 | @@ -9485,7 +9899,7 @@ |
2922 | # This macro should only be invoked once -- use via AC_REQUIRE. |
2923 | # |
2924 | # This code is only required when automatic dependency tracking |
2925 | -# is enabled. FIXME. This creates each `.P' file that we will |
2926 | +# is enabled. FIXME. This creates each '.P' file that we will |
2927 | # need in order to bootstrap the dependency handling code. |
2928 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
2929 | [AC_CONFIG_COMMANDS([depfiles], |
2930 | @@ -9493,29 +9907,14 @@ |
2931 | [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
2932 | ]) |
2933 | |
2934 | -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 |
2935 | -# Free Software Foundation, Inc. |
2936 | -# |
2937 | -# This file is free software; the Free Software Foundation |
2938 | -# gives unlimited permission to copy and/or distribute it, |
2939 | -# with or without modifications, as long as this notice is preserved. |
2940 | - |
2941 | -# serial 8 |
2942 | - |
2943 | -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. |
2944 | -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) |
2945 | - |
2946 | # Do all the work for Automake. -*- Autoconf -*- |
2947 | |
2948 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
2949 | -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. |
2950 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
2951 | # |
2952 | # This file is free software; the Free Software Foundation |
2953 | # gives unlimited permission to copy and/or distribute it, |
2954 | # with or without modifications, as long as this notice is preserved. |
2955 | |
2956 | -# serial 16 |
2957 | - |
2958 | # This macro actually does too much. Some checks are only needed if |
2959 | # your package does certain things. But this isn't really a big deal. |
2960 | |
2961 | @@ -9531,7 +9930,7 @@ |
2962 | # arguments mandatory, and then we can depend on a new Autoconf |
2963 | # release and drop the old call support. |
2964 | AC_DEFUN([AM_INIT_AUTOMAKE], |
2965 | -[AC_PREREQ([2.62])dnl |
2966 | +[AC_PREREQ([2.65])dnl |
2967 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
2968 | dnl the ones we care about. |
2969 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
2970 | @@ -9560,31 +9959,40 @@ |
2971 | # Define the identity of the package. |
2972 | dnl Distinguish between old-style and new-style calls. |
2973 | m4_ifval([$2], |
2974 | -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
2975 | +[AC_DIAGNOSE([obsolete], |
2976 | + [$0: two- and three-arguments forms are deprecated.]) |
2977 | +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
2978 | AC_SUBST([PACKAGE], [$1])dnl |
2979 | AC_SUBST([VERSION], [$2])], |
2980 | [_AM_SET_OPTIONS([$1])dnl |
2981 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
2982 | -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, |
2983 | +m4_if( |
2984 | + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), |
2985 | + [ok:ok],, |
2986 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
2987 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
2988 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
2989 | |
2990 | _AM_IF_OPTION([no-define],, |
2991 | -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) |
2992 | - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl |
2993 | +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) |
2994 | + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl |
2995 | |
2996 | # Some tools Automake needs. |
2997 | AC_REQUIRE([AM_SANITY_CHECK])dnl |
2998 | AC_REQUIRE([AC_ARG_PROGRAM])dnl |
2999 | -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) |
3000 | -AM_MISSING_PROG(AUTOCONF, autoconf) |
3001 | -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) |
3002 | -AM_MISSING_PROG(AUTOHEADER, autoheader) |
3003 | -AM_MISSING_PROG(MAKEINFO, makeinfo) |
3004 | +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) |
3005 | +AM_MISSING_PROG([AUTOCONF], [autoconf]) |
3006 | +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) |
3007 | +AM_MISSING_PROG([AUTOHEADER], [autoheader]) |
3008 | +AM_MISSING_PROG([MAKEINFO], [makeinfo]) |
3009 | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
3010 | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
3011 | -AC_REQUIRE([AM_PROG_MKDIR_P])dnl |
3012 | +AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
3013 | +# For better backward compatibility. To be removed once Automake 1.9.x |
3014 | +# dies out for good. For more background, see: |
3015 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
3016 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
3017 | +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
3018 | # We need awk for the "check" target. The system "awk" is bad on |
3019 | # some platforms. |
3020 | AC_REQUIRE([AC_PROG_AWK])dnl |
3021 | @@ -9595,28 +10003,32 @@ |
3022 | [_AM_PROG_TAR([v7])])]) |
3023 | _AM_IF_OPTION([no-dependencies],, |
3024 | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
3025 | - [_AM_DEPENDENCIES(CC)], |
3026 | - [define([AC_PROG_CC], |
3027 | - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl |
3028 | + [_AM_DEPENDENCIES([CC])], |
3029 | + [m4_define([AC_PROG_CC], |
3030 | + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl |
3031 | AC_PROVIDE_IFELSE([AC_PROG_CXX], |
3032 | - [_AM_DEPENDENCIES(CXX)], |
3033 | - [define([AC_PROG_CXX], |
3034 | - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
3035 | + [_AM_DEPENDENCIES([CXX])], |
3036 | + [m4_define([AC_PROG_CXX], |
3037 | + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl |
3038 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
3039 | - [_AM_DEPENDENCIES(OBJC)], |
3040 | - [define([AC_PROG_OBJC], |
3041 | - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl |
3042 | + [_AM_DEPENDENCIES([OBJC])], |
3043 | + [m4_define([AC_PROG_OBJC], |
3044 | + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
3045 | +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
3046 | + [_AM_DEPENDENCIES([OBJCXX])], |
3047 | + [m4_define([AC_PROG_OBJCXX], |
3048 | + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl |
3049 | ]) |
3050 | -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
3051 | -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the |
3052 | -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
3053 | -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
3054 | +AC_REQUIRE([AM_SILENT_RULES])dnl |
3055 | +dnl The testsuite driver may need to know about EXEEXT, so add the |
3056 | +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This |
3057 | +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. |
3058 | AC_CONFIG_COMMANDS_PRE(dnl |
3059 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
3060 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
3061 | ]) |
3062 | |
3063 | -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
3064 | +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
3065 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
3066 | dnl mangled by Autoconf and run in a shell conditional statement. |
3067 | m4_define([_AC_COMPILER_EXEEXT], |
3068 | @@ -9644,7 +10056,7 @@ |
3069 | done |
3070 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
3071 | |
3072 | -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. |
3073 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
3074 | # |
3075 | # This file is free software; the Free Software Foundation |
3076 | # gives unlimited permission to copy and/or distribute it, |
3077 | @@ -9663,16 +10075,14 @@ |
3078 | install_sh="\${SHELL} $am_aux_dir/install-sh" |
3079 | esac |
3080 | fi |
3081 | -AC_SUBST(install_sh)]) |
3082 | +AC_SUBST([install_sh])]) |
3083 | |
3084 | -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
3085 | +# Copyright (C) 2003-2013 Free Software Foundation, Inc. |
3086 | # |
3087 | # This file is free software; the Free Software Foundation |
3088 | # gives unlimited permission to copy and/or distribute it, |
3089 | # with or without modifications, as long as this notice is preserved. |
3090 | |
3091 | -# serial 2 |
3092 | - |
3093 | # Check whether the underlying file-system supports filenames |
3094 | # with a leading dot. For instance MS-DOS doesn't. |
3095 | AC_DEFUN([AM_SET_LEADING_DOT], |
3096 | @@ -9689,20 +10099,17 @@ |
3097 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
3098 | # From Jim Meyering |
3099 | |
3100 | -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
3101 | -# Free Software Foundation, Inc. |
3102 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
3103 | # |
3104 | # This file is free software; the Free Software Foundation |
3105 | # gives unlimited permission to copy and/or distribute it, |
3106 | # with or without modifications, as long as this notice is preserved. |
3107 | |
3108 | -# serial 5 |
3109 | - |
3110 | # AM_MAINTAINER_MODE([DEFAULT-MODE]) |
3111 | # ---------------------------------- |
3112 | # Control maintainer-specific portions of Makefiles. |
3113 | -# Default is to disable them, unless `enable' is passed literally. |
3114 | -# For symmetry, `disable' may be passed as well. Anyway, the user |
3115 | +# Default is to disable them, unless 'enable' is passed literally. |
3116 | +# For symmetry, 'disable' may be passed as well. Anyway, the user |
3117 | # can override the default with the --enable/--disable switch. |
3118 | AC_DEFUN([AM_MAINTAINER_MODE], |
3119 | [m4_case(m4_default([$1], [disable]), |
3120 | @@ -9710,13 +10117,14 @@ |
3121 | [disable], [m4_define([am_maintainer_other], [enable])], |
3122 | [m4_define([am_maintainer_other], [enable]) |
3123 | m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) |
3124 | -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) |
3125 | +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
3126 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
3127 | AC_ARG_ENABLE([maintainer-mode], |
3128 | -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful |
3129 | - (and sometimes confusing) to the casual installer], |
3130 | - [USE_MAINTAINER_MODE=$enableval], |
3131 | - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
3132 | + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], |
3133 | + am_maintainer_other[ make rules and dependencies not useful |
3134 | + (and sometimes confusing) to the casual installer])], |
3135 | + [USE_MAINTAINER_MODE=$enableval], |
3136 | + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
3137 | AC_MSG_RESULT([$USE_MAINTAINER_MODE]) |
3138 | AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) |
3139 | MAINT=$MAINTAINER_MODE_TRUE |
3140 | @@ -9724,18 +10132,14 @@ |
3141 | ] |
3142 | ) |
3143 | |
3144 | -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) |
3145 | - |
3146 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
3147 | |
3148 | -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. |
3149 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
3150 | # |
3151 | # This file is free software; the Free Software Foundation |
3152 | # gives unlimited permission to copy and/or distribute it, |
3153 | # with or without modifications, as long as this notice is preserved. |
3154 | |
3155 | -# serial 4 |
3156 | - |
3157 | # AM_MAKE_INCLUDE() |
3158 | # ----------------- |
3159 | # Check to see how make treats includes. |
3160 | @@ -9753,7 +10157,7 @@ |
3161 | _am_result=none |
3162 | # First try GNU make style include. |
3163 | echo "include confinc" > confmf |
3164 | -# Ignore all kinds of additional output from `make'. |
3165 | +# Ignore all kinds of additional output from 'make'. |
3166 | case `$am_make -s -f confmf 2> /dev/null` in #( |
3167 | *the\ am__doit\ target*) |
3168 | am__include=include |
3169 | @@ -9778,17 +10182,46 @@ |
3170 | rm -f confinc confmf |
3171 | ]) |
3172 | |
3173 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
3174 | +# |
3175 | +# This file is free software; the Free Software Foundation |
3176 | +# gives unlimited permission to copy and/or distribute it, |
3177 | +# with or without modifications, as long as this notice is preserved. |
3178 | + |
3179 | +# AM_PROG_CC_C_O |
3180 | +# -------------- |
3181 | +# Like AC_PROG_CC_C_O, but changed for automake. |
3182 | +AC_DEFUN([AM_PROG_CC_C_O], |
3183 | +[AC_REQUIRE([AC_PROG_CC_C_O])dnl |
3184 | +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
3185 | +AC_REQUIRE_AUX_FILE([compile])dnl |
3186 | +# FIXME: we rely on the cache variable name because |
3187 | +# there is no other way. |
3188 | +set dummy $CC |
3189 | +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` |
3190 | +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o |
3191 | +if test "$am_t" != yes; then |
3192 | + # Losing compiler, so override with the script. |
3193 | + # FIXME: It is wrong to rewrite CC. |
3194 | + # But if we don't then we get into trouble of one sort or another. |
3195 | + # A longer-term fix would be to have automake use am__CC in this case, |
3196 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
3197 | + CC="$am_aux_dir/compile $CC" |
3198 | +fi |
3199 | +dnl Make sure AC_PROG_CC is never called again, or it will override our |
3200 | +dnl setting of CC. |
3201 | +m4_define([AC_PROG_CC], |
3202 | + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) |
3203 | +]) |
3204 | + |
3205 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
3206 | |
3207 | -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 |
3208 | -# Free Software Foundation, Inc. |
3209 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
3210 | # |
3211 | # This file is free software; the Free Software Foundation |
3212 | # gives unlimited permission to copy and/or distribute it, |
3213 | # with or without modifications, as long as this notice is preserved. |
3214 | |
3215 | -# serial 6 |
3216 | - |
3217 | # AM_MISSING_PROG(NAME, PROGRAM) |
3218 | # ------------------------------ |
3219 | AC_DEFUN([AM_MISSING_PROG], |
3220 | @@ -9796,11 +10229,10 @@ |
3221 | $1=${$1-"${am_missing_run}$2"} |
3222 | AC_SUBST($1)]) |
3223 | |
3224 | - |
3225 | # AM_MISSING_HAS_RUN |
3226 | # ------------------ |
3227 | -# Define MISSING if not defined so far and test if it supports --run. |
3228 | -# If it does, set am_missing_run to use it, otherwise, to nothing. |
3229 | +# Define MISSING if not defined so far and test if it is modern enough. |
3230 | +# If it is, set am_missing_run to use it, otherwise, to nothing. |
3231 | AC_DEFUN([AM_MISSING_HAS_RUN], |
3232 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
3233 | AC_REQUIRE_AUX_FILE([missing])dnl |
3234 | @@ -9813,63 +10245,35 @@ |
3235 | esac |
3236 | fi |
3237 | # Use eval to expand $SHELL |
3238 | -if eval "$MISSING --run true"; then |
3239 | - am_missing_run="$MISSING --run " |
3240 | +if eval "$MISSING --is-lightweight"; then |
3241 | + am_missing_run="$MISSING " |
3242 | else |
3243 | am_missing_run= |
3244 | - AC_MSG_WARN([`missing' script is too old or missing]) |
3245 | + AC_MSG_WARN(['missing' script is too old or missing]) |
3246 | fi |
3247 | ]) |
3248 | |
3249 | -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
3250 | -# |
3251 | -# This file is free software; the Free Software Foundation |
3252 | -# gives unlimited permission to copy and/or distribute it, |
3253 | -# with or without modifications, as long as this notice is preserved. |
3254 | - |
3255 | -# AM_PROG_MKDIR_P |
3256 | -# --------------- |
3257 | -# Check for `mkdir -p'. |
3258 | -AC_DEFUN([AM_PROG_MKDIR_P], |
3259 | -[AC_PREREQ([2.60])dnl |
3260 | -AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
3261 | -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, |
3262 | -dnl while keeping a definition of mkdir_p for backward compatibility. |
3263 | -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. |
3264 | -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of |
3265 | -dnl Makefile.ins that do not define MKDIR_P, so we do our own |
3266 | -dnl adjustment using top_builddir (which is defined more often than |
3267 | -dnl MKDIR_P). |
3268 | -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl |
3269 | -case $mkdir_p in |
3270 | - [[\\/$]]* | ?:[[\\/]]*) ;; |
3271 | - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
3272 | -esac |
3273 | -]) |
3274 | - |
3275 | # Helper functions for option handling. -*- Autoconf -*- |
3276 | |
3277 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. |
3278 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
3279 | # |
3280 | # This file is free software; the Free Software Foundation |
3281 | # gives unlimited permission to copy and/or distribute it, |
3282 | # with or without modifications, as long as this notice is preserved. |
3283 | |
3284 | -# serial 4 |
3285 | - |
3286 | # _AM_MANGLE_OPTION(NAME) |
3287 | # ----------------------- |
3288 | AC_DEFUN([_AM_MANGLE_OPTION], |
3289 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
3290 | |
3291 | # _AM_SET_OPTION(NAME) |
3292 | -# ------------------------------ |
3293 | +# -------------------- |
3294 | # Set option NAME. Presently that only means defining a flag for this option. |
3295 | AC_DEFUN([_AM_SET_OPTION], |
3296 | -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
3297 | +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) |
3298 | |
3299 | # _AM_SET_OPTIONS(OPTIONS) |
3300 | -# ---------------------------------- |
3301 | +# ------------------------ |
3302 | # OPTIONS is a space-separated list of Automake options. |
3303 | AC_DEFUN([_AM_SET_OPTIONS], |
3304 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
3305 | @@ -9880,7 +10284,7 @@ |
3306 | AC_DEFUN([_AM_IF_OPTION], |
3307 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
3308 | |
3309 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
3310 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
3311 | # |
3312 | # This file is free software; the Free Software Foundation |
3313 | # gives unlimited permission to copy and/or distribute it, |
3314 | @@ -9899,22 +10303,16 @@ |
3315 | |
3316 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
3317 | |
3318 | -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 |
3319 | -# Free Software Foundation, Inc. |
3320 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
3321 | # |
3322 | # This file is free software; the Free Software Foundation |
3323 | # gives unlimited permission to copy and/or distribute it, |
3324 | # with or without modifications, as long as this notice is preserved. |
3325 | |
3326 | -# serial 5 |
3327 | - |
3328 | # AM_SANITY_CHECK |
3329 | # --------------- |
3330 | AC_DEFUN([AM_SANITY_CHECK], |
3331 | [AC_MSG_CHECKING([whether build environment is sane]) |
3332 | -# Just in case |
3333 | -sleep 1 |
3334 | -echo timestamp > conftest.file |
3335 | # Reject unsafe characters in $srcdir or the absolute working directory |
3336 | # name. Accept space and tab only in the latter. |
3337 | am_lf=' |
3338 | @@ -9925,32 +10323,40 @@ |
3339 | esac |
3340 | case $srcdir in |
3341 | *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) |
3342 | - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; |
3343 | + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; |
3344 | esac |
3345 | |
3346 | -# Do `set' in a subshell so we don't clobber the current shell's |
3347 | +# Do 'set' in a subshell so we don't clobber the current shell's |
3348 | # arguments. Must try -L first in case configure is actually a |
3349 | # symlink; some systems play weird games with the mod time of symlinks |
3350 | # (eg FreeBSD returns the mod time of the symlink's containing |
3351 | # directory). |
3352 | if ( |
3353 | - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
3354 | - if test "$[*]" = "X"; then |
3355 | - # -L didn't work. |
3356 | - set X `ls -t "$srcdir/configure" conftest.file` |
3357 | - fi |
3358 | - rm -f conftest.file |
3359 | - if test "$[*]" != "X $srcdir/configure conftest.file" \ |
3360 | - && test "$[*]" != "X conftest.file $srcdir/configure"; then |
3361 | - |
3362 | - # If neither matched, then we have a broken ls. This can happen |
3363 | - # if, for instance, CONFIG_SHELL is bash and it inherits a |
3364 | - # broken ls alias from the environment. This has actually |
3365 | - # happened. Such a system could not be considered "sane". |
3366 | - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
3367 | -alias in your environment]) |
3368 | - fi |
3369 | - |
3370 | + am_has_slept=no |
3371 | + for am_try in 1 2; do |
3372 | + echo "timestamp, slept: $am_has_slept" > conftest.file |
3373 | + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
3374 | + if test "$[*]" = "X"; then |
3375 | + # -L didn't work. |
3376 | + set X `ls -t "$srcdir/configure" conftest.file` |
3377 | + fi |
3378 | + if test "$[*]" != "X $srcdir/configure conftest.file" \ |
3379 | + && test "$[*]" != "X conftest.file $srcdir/configure"; then |
3380 | + |
3381 | + # If neither matched, then we have a broken ls. This can happen |
3382 | + # if, for instance, CONFIG_SHELL is bash and it inherits a |
3383 | + # broken ls alias from the environment. This has actually |
3384 | + # happened. Such a system could not be considered "sane". |
3385 | + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
3386 | + alias in your environment]) |
3387 | + fi |
3388 | + if test "$[2]" = conftest.file || test $am_try -eq 2; then |
3389 | + break |
3390 | + fi |
3391 | + # Just in case. |
3392 | + sleep 1 |
3393 | + am_has_slept=yes |
3394 | + done |
3395 | test "$[2]" = conftest.file |
3396 | ) |
3397 | then |
3398 | @@ -9960,9 +10366,85 @@ |
3399 | AC_MSG_ERROR([newly created file is older than distributed files! |
3400 | Check your system clock]) |
3401 | fi |
3402 | -AC_MSG_RESULT(yes)]) |
3403 | - |
3404 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
3405 | +AC_MSG_RESULT([yes]) |
3406 | +# If we didn't sleep, we still need to ensure time stamps of config.status and |
3407 | +# generated files are strictly newer. |
3408 | +am_sleep_pid= |
3409 | +if grep 'slept: no' conftest.file >/dev/null 2>&1; then |
3410 | + ( sleep 1 ) & |
3411 | + am_sleep_pid=$! |
3412 | +fi |
3413 | +AC_CONFIG_COMMANDS_PRE( |
3414 | + [AC_MSG_CHECKING([that generated files are newer than configure]) |
3415 | + if test -n "$am_sleep_pid"; then |
3416 | + # Hide warnings about reused PIDs. |
3417 | + wait $am_sleep_pid 2>/dev/null |
3418 | + fi |
3419 | + AC_MSG_RESULT([done])]) |
3420 | +rm -f conftest.file |
3421 | +]) |
3422 | + |
3423 | +# Copyright (C) 2009-2013 Free Software Foundation, Inc. |
3424 | +# |
3425 | +# This file is free software; the Free Software Foundation |
3426 | +# gives unlimited permission to copy and/or distribute it, |
3427 | +# with or without modifications, as long as this notice is preserved. |
3428 | + |
3429 | +# AM_SILENT_RULES([DEFAULT]) |
3430 | +# -------------------------- |
3431 | +# Enable less verbose build rules; with the default set to DEFAULT |
3432 | +# ("yes" being less verbose, "no" or empty being verbose). |
3433 | +AC_DEFUN([AM_SILENT_RULES], |
3434 | +[AC_ARG_ENABLE([silent-rules], [dnl |
3435 | +AS_HELP_STRING( |
3436 | + [--enable-silent-rules], |
3437 | + [less verbose build output (undo: "make V=1")]) |
3438 | +AS_HELP_STRING( |
3439 | + [--disable-silent-rules], |
3440 | + [verbose build output (undo: "make V=0")])dnl |
3441 | +]) |
3442 | +case $enable_silent_rules in @%:@ ((( |
3443 | + yes) AM_DEFAULT_VERBOSITY=0;; |
3444 | + no) AM_DEFAULT_VERBOSITY=1;; |
3445 | + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
3446 | +esac |
3447 | +dnl |
3448 | +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) |
3449 | +dnl do not support nested variable expansions. |
3450 | +dnl See automake bug#9928 and bug#10237. |
3451 | +am_make=${MAKE-make} |
3452 | +AC_CACHE_CHECK([whether $am_make supports nested variables], |
3453 | + [am_cv_make_support_nested_variables], |
3454 | + [if AS_ECHO([['TRUE=$(BAR$(V)) |
3455 | +BAR0=false |
3456 | +BAR1=true |
3457 | +V=1 |
3458 | +am__doit: |
3459 | + @$(TRUE) |
3460 | +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then |
3461 | + am_cv_make_support_nested_variables=yes |
3462 | +else |
3463 | + am_cv_make_support_nested_variables=no |
3464 | +fi]) |
3465 | +if test $am_cv_make_support_nested_variables = yes; then |
3466 | + dnl Using '$V' instead of '$(V)' breaks IRIX make. |
3467 | + AM_V='$(V)' |
3468 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
3469 | +else |
3470 | + AM_V=$AM_DEFAULT_VERBOSITY |
3471 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
3472 | +fi |
3473 | +AC_SUBST([AM_V])dnl |
3474 | +AM_SUBST_NOTMAKE([AM_V])dnl |
3475 | +AC_SUBST([AM_DEFAULT_V])dnl |
3476 | +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl |
3477 | +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl |
3478 | +AM_BACKSLASH='\' |
3479 | +AC_SUBST([AM_BACKSLASH])dnl |
3480 | +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
3481 | +]) |
3482 | + |
3483 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
3484 | # |
3485 | # This file is free software; the Free Software Foundation |
3486 | # gives unlimited permission to copy and/or distribute it, |
3487 | @@ -9970,34 +10452,32 @@ |
3488 | |
3489 | # AM_PROG_INSTALL_STRIP |
3490 | # --------------------- |
3491 | -# One issue with vendor `install' (even GNU) is that you can't |
3492 | +# One issue with vendor 'install' (even GNU) is that you can't |
3493 | # specify the program used to strip binaries. This is especially |
3494 | # annoying in cross-compiling environments, where the build's strip |
3495 | # is unlikely to handle the host's binaries. |
3496 | # Fortunately install-sh will honor a STRIPPROG variable, so we |
3497 | -# always use install-sh in `make install-strip', and initialize |
3498 | +# always use install-sh in "make install-strip", and initialize |
3499 | # STRIPPROG with the value of the STRIP variable (set by the user). |
3500 | AC_DEFUN([AM_PROG_INSTALL_STRIP], |
3501 | [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
3502 | -# Installed binaries are usually stripped using `strip' when the user |
3503 | -# run `make install-strip'. However `strip' might not be the right |
3504 | +# Installed binaries are usually stripped using 'strip' when the user |
3505 | +# run "make install-strip". However 'strip' might not be the right |
3506 | # tool to use in cross-compilation environments, therefore Automake |
3507 | -# will honor the `STRIP' environment variable to overrule this program. |
3508 | -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. |
3509 | +# will honor the 'STRIP' environment variable to overrule this program. |
3510 | +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. |
3511 | if test "$cross_compiling" != no; then |
3512 | AC_CHECK_TOOL([STRIP], [strip], :) |
3513 | fi |
3514 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
3515 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
3516 | |
3517 | -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
3518 | +# Copyright (C) 2006-2013 Free Software Foundation, Inc. |
3519 | # |
3520 | # This file is free software; the Free Software Foundation |
3521 | # gives unlimited permission to copy and/or distribute it, |
3522 | # with or without modifications, as long as this notice is preserved. |
3523 | |
3524 | -# serial 2 |
3525 | - |
3526 | # _AM_SUBST_NOTMAKE(VARIABLE) |
3527 | # --------------------------- |
3528 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
3529 | @@ -10005,24 +10485,22 @@ |
3530 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
3531 | |
3532 | # AM_SUBST_NOTMAKE(VARIABLE) |
3533 | -# --------------------------- |
3534 | +# -------------------------- |
3535 | # Public sister of _AM_SUBST_NOTMAKE. |
3536 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
3537 | |
3538 | # Check how to create a tarball. -*- Autoconf -*- |
3539 | |
3540 | -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
3541 | +# Copyright (C) 2004-2013 Free Software Foundation, Inc. |
3542 | # |
3543 | # This file is free software; the Free Software Foundation |
3544 | # gives unlimited permission to copy and/or distribute it, |
3545 | # with or without modifications, as long as this notice is preserved. |
3546 | |
3547 | -# serial 2 |
3548 | - |
3549 | # _AM_PROG_TAR(FORMAT) |
3550 | # -------------------- |
3551 | # Check how to create a tarball in format FORMAT. |
3552 | -# FORMAT should be one of `v7', `ustar', or `pax'. |
3553 | +# FORMAT should be one of 'v7', 'ustar', or 'pax'. |
3554 | # |
3555 | # Substitute a variable $(am__tar) that is a command |
3556 | # writing to stdout a FORMAT-tarball containing the directory |
3557 | @@ -10033,10 +10511,11 @@ |
3558 | # a tarball read from stdin. |
3559 | # $(am__untar) < result.tar |
3560 | AC_DEFUN([_AM_PROG_TAR], |
3561 | -[# Always define AMTAR for backward compatibility. |
3562 | -AM_MISSING_PROG([AMTAR], [tar]) |
3563 | +[# Always define AMTAR for backward compatibility. Yes, it's still used |
3564 | +# in the wild :-( We should find a proper way to deprecate it ... |
3565 | +AC_SUBST([AMTAR], ['$${TAR-tar}']) |
3566 | m4_if([$1], [v7], |
3567 | - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], |
3568 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
3569 | [m4_case([$1], [ustar],, [pax],, |
3570 | [m4_fatal([Unknown tar format])]) |
3571 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
3572 | @@ -10044,7 +10523,7 @@ |
3573 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
3574 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
3575 | # Do not fold the above two line into one, because Tru64 sh and |
3576 | -# Solaris sh will not grok spaces in the rhs of `-'. |
3577 | +# Solaris sh will not grok spaces in the rhs of '-'. |
3578 | for _am_tool in $_am_tools |
3579 | do |
3580 | case $_am_tool in |
3581 | @@ -10112,19 +10591,19 @@ |
3582 | dnl |
3583 | dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>. |
3584 | dnl |
3585 | -dnl This program is free software; you can redistribute it and/or modify it |
3586 | -dnl under the terms of the GNU General Public License as published by the Free |
3587 | -dnl Software Foundation; either version 2 of the License, or (at your option) |
3588 | -dnl any later version. |
3589 | -dnl |
3590 | -dnl This program is distributed in the hope that it will be useful, but WITHOUT |
3591 | -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
3592 | -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
3593 | -dnl more details. |
3594 | -dnl |
3595 | -dnl You should have received a copy of the GNU General Public License along with |
3596 | -dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3597 | -dnl Place, Suite 330, Boston, MA 02111-1307 USA |
3598 | +dnl This program is free software; you can redistribute it and/or modify |
3599 | +dnl it under the terms of the GNU General Public License as published by |
3600 | +dnl the Free Software Foundation; either version 2 of the License, or |
3601 | +dnl (at your option) any later version. |
3602 | +dnl |
3603 | +dnl This program is distributed in the hope that it will be useful, |
3604 | +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of |
3605 | +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3606 | +dnl GNU General Public License for more details. |
3607 | +dnl |
3608 | +dnl You should have received a copy of the GNU General Public License along |
3609 | +dnl with this program; if not, write to the Free Software Foundation, Inc., |
3610 | +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
3611 | dnl |
3612 | dnl xdt-depends |
3613 | dnl ----------- |
3614 | @@ -10150,11 +10629,23 @@ |
3615 | # minimum supported version of pkg-config |
3616 | xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
3617 | |
3618 | - # lookup pkg-config utility |
3619 | - if test x"$PKG_CONFIG" = x""; then |
3620 | - AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) |
3621 | + m4_ifdef([PKG_PROG_PKG_CONFIG], |
3622 | + [ |
3623 | + PKG_PROG_PKG_CONFIG([$xdt_cv_PKG_CONFIG_MIN_VERSION]) |
3624 | |
3625 | - if test x"$PKG_CONFIG" = x"no"; then |
3626 | + if test x"$PKG_CONFIG" = x""; then |
3627 | + echo |
3628 | + echo "*** Your version of pkg-config is too old. You need atleast" |
3629 | + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
3630 | + echo "*** from the freedesktop.org software repository at" |
3631 | + echo "***" |
3632 | + echo "*** http://www.freedesktop.org/software/pkgconfig" |
3633 | + echo "***" |
3634 | + exit 1; |
3635 | + fi |
3636 | + ], |
3637 | + [ |
3638 | + echo |
3639 | echo "*** The pkg-config utility could not be found on your system." |
3640 | echo "*** Make sure it is in your path, or set the PKG_CONFIG" |
3641 | echo "*** environment variable to the full path to pkg-config." |
3642 | @@ -10164,25 +10655,7 @@ |
3643 | echo "*** http://www.freedesktop.org/software/pkgconfig" |
3644 | echo "***" |
3645 | exit 1 |
3646 | - fi |
3647 | - |
3648 | - # check pkg-config version |
3649 | - AC_MSG_CHECKING([for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION]) |
3650 | - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then |
3651 | - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` |
3652 | - AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION]) |
3653 | - else |
3654 | - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` |
3655 | - AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION]) |
3656 | - echo "*** Your version of pkg-config is too old. You need atleast" |
3657 | - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " |
3658 | - echo "*** from the freedesktop.org software repository at" |
3659 | - echo "***" |
3660 | - echo "*** http://www.freedesktop.org/software/pkgconfig" |
3661 | - echo "***" |
3662 | - exit 1 |
3663 | - fi |
3664 | - fi |
3665 | + ]) |
3666 | ]) |
3667 | |
3668 | |
3669 | @@ -10315,30 +10788,6 @@ |
3670 | |
3671 | |
3672 | |
3673 | -dnl BM_DEPEND(varname, package, version) |
3674 | -dnl |
3675 | -dnl Simple wrapper for XDT_CHECK_PACKAGE("varname", "package", "version"). Kept |
3676 | -dnl for backward compatibility. Will be removed in the future. |
3677 | -dnl |
3678 | -AC_DEFUN([BM_DEPEND], |
3679 | -[ |
3680 | - XDT_CHECK_PACKAGE([$1], [$2], [$3]) |
3681 | -]) |
3682 | - |
3683 | - |
3684 | - |
3685 | -dnl BM_DEPEND_CHECK(var, pkg, version, name, helpstring, default) |
3686 | -dnl |
3687 | -dnl Simple wrapper for XDT_CHECK_OPTIONAL_PACKAGE(). Kept for backward |
3688 | -dnl compatibility. Will be removed in the future. |
3689 | -dnl |
3690 | -AC_DEFUN([BM_DEPEND_CHECK], |
3691 | -[ |
3692 | - XDT_CHECK_OPTIONAL_PACKAGE([$1], [$2], [$3], [$4], [$5], [$6]) |
3693 | -]) |
3694 | - |
3695 | - |
3696 | - |
3697 | dnl XDT_CHECK_LIBX11() |
3698 | dnl |
3699 | dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS |
3700 | @@ -10475,66 +10924,6 @@ |
3701 | ]) |
3702 | |
3703 | |
3704 | - |
3705 | -dnl BM_LIBX11() |
3706 | -dnl |
3707 | -dnl Simple wrapper for XDT_CHECK_LIBX11. Kept for backward |
3708 | -dnl compatibility. Will be removed in the future. |
3709 | -dnl |
3710 | -AC_DEFUN([BM_LIBX11], |
3711 | -[ |
3712 | - AC_REQUIRE([XDT_CHECK_LIBX11]) |
3713 | -]) |
3714 | - |
3715 | - |
3716 | - |
3717 | -dnl BM_LIBX11_REQUIRE() |
3718 | -dnl |
3719 | -dnl Simple wrapper for XDT_CHECK_LIBX11_REQUIRE. Kept for backward |
3720 | -dnl compatibility. Will be removed in the future. |
3721 | -dnl |
3722 | -AC_DEFUN([BM_LIBX11_REQUIRE], |
3723 | -[ |
3724 | - AC_REQUIRE([XDT_CHECK_LIBX11_REQUIRE]) |
3725 | -]) |
3726 | - |
3727 | - |
3728 | - |
3729 | -dnl BM_LIBSM() |
3730 | -dnl |
3731 | -dnl Simple wrapper for XDT_CHECK_LIBSM. Kept for backward |
3732 | -dnl compatibility. Will be removed in the future. |
3733 | -dnl |
3734 | -AC_DEFUN([BM_LIBSM], |
3735 | -[ |
3736 | - AC_REQUIRE([XDT_CHECK_LIBSM]) |
3737 | -]) |
3738 | - |
3739 | - |
3740 | - |
3741 | -dnl BM_LIBXPM |
3742 | -dnl |
3743 | -dnl Simple wrapper for XDT_CHECK_LIBXPM. Kept for backward |
3744 | -dnl compatibility. Will be removed in the future. |
3745 | -dnl |
3746 | -AC_DEFUN([BM_LIBXPM], |
3747 | -[ |
3748 | - AC_REQUIRE([XDT_CHECK_LIBXPM]) |
3749 | -]) |
3750 | - |
3751 | - |
3752 | - |
3753 | -dnl BM_LIBXPM_REQUIRE |
3754 | -dnl |
3755 | -dnl Simple wrapper for XDT_CHECK_LIBXPM_REQUIRE. Kept for |
3756 | -dnl backward compatibility. Will be removed in the future. |
3757 | -dnl |
3758 | -AC_DEFUN([BM_LIBXPM_REQUIRE], |
3759 | -[ |
3760 | - AC_REQUIRE([XDT_CHECK_LIBXPM_REQUIRE]) |
3761 | -]) |
3762 | - |
3763 | - |
3764 | dnl $Id$ |
3765 | dnl |
3766 | dnl Copyright (c) 2002-2006 |
3767 | @@ -10542,19 +10931,19 @@ |
3768 | dnl |
3769 | dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>. |
3770 | dnl |
3771 | -dnl This program is free software; you can redistribute it and/or modify it |
3772 | -dnl under the terms of the GNU General Public License as published by the Free |
3773 | -dnl Software Foundation; either version 2 of the License, or (at your option) |
3774 | -dnl any later version. |
3775 | -dnl |
3776 | -dnl This program is distributed in the hope that it will be useful, but WITHOUT |
3777 | -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
3778 | -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
3779 | -dnl more details. |
3780 | -dnl |
3781 | -dnl You should have received a copy of the GNU General Public License along with |
3782 | -dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3783 | -dnl Place, Suite 330, Boston, MA 02111-1307 USA |
3784 | +dnl This program is free software; you can redistribute it and/or modify |
3785 | +dnl it under the terms of the GNU General Public License as published by |
3786 | +dnl the Free Software Foundation; either version 2 of the License, or |
3787 | +dnl (at your option) any later version. |
3788 | +dnl |
3789 | +dnl This program is distributed in the hope that it will be useful, |
3790 | +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of |
3791 | +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3792 | +dnl GNU General Public License for more details. |
3793 | +dnl |
3794 | +dnl You should have received a copy of the GNU General Public License along |
3795 | +dnl with this program; if not, write to the Free Software Foundation, Inc., |
3796 | +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
3797 | dnl |
3798 | dnl xdt-depends |
3799 | dnl ----------- |
3800 | @@ -10611,17 +11000,25 @@ |
3801 | -Wno-missing-field-initializers \ |
3802 | -Wno-unused-parameter -Wold-style-definition \ |
3803 | -Wdeclaration-after-statement \ |
3804 | - -Wmissing-declarations -Wredundant-decls \ |
3805 | + -Wmissing-declarations \ |
3806 | -Wmissing-noreturn -Wshadow -Wpointer-arith \ |
3807 | -Wcast-align -Wformat-security \ |
3808 | -Winit-self -Wmissing-include-dirs -Wundef \ |
3809 | - -Wmissing-format-attribute -Wnested-externs \ |
3810 | - -fstack-protector" |
3811 | + -Wmissing-format-attribute -Wnested-externs" |
3812 | CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" |
3813 | - |
3814 | + |
3815 | + if test x`uname` = x"Linux"; then |
3816 | + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" |
3817 | + fi |
3818 | + |
3819 | + dnl # signal.h inline is crapy on openbsd |
3820 | + if test x`uname` != x"OpenBSD"; then |
3821 | + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls" |
3822 | + fi |
3823 | + |
3824 | if test x"$enable_debug" = x"full"; then |
3825 | AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support]) |
3826 | - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g3 -Werror" |
3827 | + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror" |
3828 | CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" |
3829 | AC_MSG_RESULT([full]) |
3830 | else |
3831 | @@ -10648,7 +11045,7 @@ |
3832 | CPPFLAGS="$CPPFLAGS -DNDEBUG" |
3833 | |
3834 | if test x"$enable_debug" = x"no"; then |
3835 | - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" |
3836 | + CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" |
3837 | AC_MSG_RESULT([no]) |
3838 | else |
3839 | AC_MSG_RESULT([minimum]) |
3840 | @@ -10701,7 +11098,11 @@ |
3841 | |
3842 | if test "x$have_gnuc_visibility" = "xyes"; then |
3843 | CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY" |
3844 | - XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden]) |
3845 | + xdt_vis_hidden_cflags="" |
3846 | + XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-xldscope=hidden]) |
3847 | + if test "x$xdt_vis_hidden_cflags" = "x"; then |
3848 | + XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden]) |
3849 | + fi |
3850 | CFLAGS="$CFLAGS $xdt_vis_hidden_cflags" |
3851 | fi |
3852 | |
3853 | @@ -10720,104 +11121,28 @@ |
3854 | [enable_linker_opts=$enableval], [enable_linker_opts=yes]) |
3855 | |
3856 | if test "x$enable_linker_opts" != "xno"; then |
3857 | - AC_MSG_CHECKING([whether $LD accepts --as-needed]) |
3858 | - case `$LD --as-needed -v 2>&1 </dev/null` in |
3859 | - *GNU* | *'with BFD'*) |
3860 | - LDFLAGS="$LDFLAGS -Wl,--as-needed" |
3861 | - AC_MSG_RESULT([yes]) |
3862 | - ;; |
3863 | - *) |
3864 | - AC_MSG_RESULT([no]) |
3865 | - ;; |
3866 | - esac |
3867 | - AC_MSG_CHECKING([whether $LD accepts -O1]) |
3868 | - case `$LD -O1 -v 2>&1 </dev/null` in |
3869 | - *GNU* | *'with BFD'*) |
3870 | - LDFLAGS="$LDFLAGS -Wl,-O1" |
3871 | - AC_MSG_RESULT([yes]) |
3872 | - ;; |
3873 | - *) |
3874 | - AC_MSG_RESULT([no]) |
3875 | - ;; |
3876 | - esac |
3877 | - fi |
3878 | -]) |
3879 | - |
3880 | -dnl BM_DEBUG_SUPPORT() |
3881 | -dnl |
3882 | -AC_DEFUN([BM_DEBUG_SUPPORT], |
3883 | -[ |
3884 | -dnl # --enable-debug |
3885 | - AC_REQUIRE([XDT_FEATURE_DEBUG]) |
3886 | - |
3887 | -dnl # --enable-profiling |
3888 | - AC_ARG_ENABLE([profiling], |
3889 | -AC_HELP_STRING([--enable-profiling], |
3890 | - [Generate extra code to write profile information]) |
3891 | -AC_HELP_STRING([--disable-profiling], |
3892 | - [No extra code for profiling (default)]), |
3893 | - [], [enable_profiling=no]) |
3894 | - |
3895 | - AC_MSG_CHECKING([whether to build with profiling support]) |
3896 | - if test x"$enable_profiling" != x"no"; then |
3897 | - CFLAGS="$CFLAGS -pg" |
3898 | - LDFLAGS="$LDFLAGS -pg" |
3899 | - AC_MSG_RESULT([yes]) |
3900 | - else |
3901 | - AC_MSG_RESULT([no]) |
3902 | - fi |
3903 | - |
3904 | -dnl # --enable-gcov |
3905 | - AC_ARG_ENABLE([gcov], |
3906 | -AC_HELP_STRING([--enable-gcov], |
3907 | - [compile with coverage profiling instrumentation (gcc only)]) |
3908 | -AC_HELP_STRING([--disable-gcov], |
3909 | - [do not generate coverage profiling instrumentation (default)]), |
3910 | - [], [enable_gcov=no]) |
3911 | - |
3912 | - AC_MSG_CHECKING([whether to compile with coverage profiling instrumentation]) |
3913 | - if test x"$enable_gcov" != x"no"; then |
3914 | - CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage" |
3915 | - AC_MSG_RESULT([yes]) |
3916 | - else |
3917 | - AC_MSG_RESULT([no]) |
3918 | - fi |
3919 | - |
3920 | -dnl # --disable-asserts |
3921 | - AC_ARG_ENABLE([asserts], |
3922 | -AC_HELP_STRING([--disable-asserts], [Disable assertions [DANGEROUS]]), |
3923 | - [], [enable_asserts=yes]) |
3924 | - |
3925 | - AC_MSG_CHECKING([whether to disable assertions]) |
3926 | - if test x"$enable_asserts" = x"no"; then |
3927 | - AC_MSG_RESULT([yes]) |
3928 | - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CHECKS -DG_DISABLE_ASSERT" |
3929 | - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS" |
3930 | - else |
3931 | - AC_MSG_RESULT([no]) |
3932 | - fi |
3933 | - |
3934 | -dnl # --enable-final |
3935 | - AC_REQUIRE([AC_PROG_LD]) |
3936 | - AC_ARG_ENABLE([final], |
3937 | -AC_HELP_STRING([--enable-final], [Build final version]), |
3938 | - [], [enable_final=yes]) |
3939 | - |
3940 | - AC_MSG_CHECKING([whether to build final version]) |
3941 | - if test x"$enable_final" = x"yes"; then |
3942 | - AC_MSG_RESULT([yes]) |
3943 | - AC_MSG_CHECKING([whether $LD accepts -O1]) |
3944 | - case `$LD -O1 -v 2>&1 </dev/null` in |
3945 | - *GNU* | *'with BFD'*) |
3946 | - LDFLAGS="$LDFLAGS -Wl,-O1" |
3947 | - AC_MSG_RESULT([yes]) |
3948 | - ;; |
3949 | - *) |
3950 | - AC_MSG_RESULT([no]) |
3951 | - ;; |
3952 | - esac |
3953 | - else |
3954 | - AC_MSG_RESULT([no]) |
3955 | + if test x`uname` != x"OpenBSD"; then |
3956 | + AC_MSG_CHECKING([whether $LD accepts --as-needed]) |
3957 | + case `$LD --as-needed -v 2>&1 </dev/null` in |
3958 | + *GNU* | *'with BFD'*) |
3959 | + LDFLAGS="$LDFLAGS -Wl,--as-needed" |
3960 | + AC_MSG_RESULT([yes]) |
3961 | + ;; |
3962 | + *) |
3963 | + AC_MSG_RESULT([no]) |
3964 | + ;; |
3965 | + esac |
3966 | + fi |
3967 | + AC_MSG_CHECKING([whether $LD accepts -O1]) |
3968 | + case `$LD -O1 -v 2>&1 </dev/null` in |
3969 | + *GNU* | *'with BFD'*) |
3970 | + LDFLAGS="$LDFLAGS -Wl,-O1" |
3971 | + AC_MSG_RESULT([yes]) |
3972 | + ;; |
3973 | + *) |
3974 | + AC_MSG_RESULT([no]) |
3975 | + ;; |
3976 | + esac |
3977 | fi |
3978 | ]) |
3979 | |
3980 | @@ -10828,19 +11153,19 @@ |
3981 | dnl |
3982 | dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>. |
3983 | dnl |
3984 | -dnl This program is free software; you can redistribute it and/or modify it |
3985 | -dnl under the terms of the GNU General Public License as published by the Free |
3986 | -dnl Software Foundation; either version 2 of the License, or (at your option) |
3987 | -dnl any later version. |
3988 | -dnl |
3989 | -dnl This program is distributed in the hope that it will be useful, but WITHOUT |
3990 | -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
3991 | -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
3992 | -dnl more details. |
3993 | -dnl |
3994 | -dnl You should have received a copy of the GNU General Public License along with |
3995 | -dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple |
3996 | -dnl Place, Suite 330, Boston, MA 02111-1307 USA |
3997 | +dnl This program is free software; you can redistribute it and/or modify |
3998 | +dnl it under the terms of the GNU General Public License as published by |
3999 | +dnl the Free Software Foundation; either version 2 of the License, or |
4000 | +dnl (at your option) any later version. |
4001 | +dnl |
4002 | +dnl This program is distributed in the hope that it will be useful, |
4003 | +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of |
4004 | +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4005 | +dnl GNU General Public License for more details. |
4006 | +dnl |
4007 | +dnl You should have received a copy of the GNU General Public License along |
4008 | +dnl with this program; if not, write to the Free Software Foundation, Inc., |
4009 | +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
4010 | dnl |
4011 | dnl xdt-i18n |
4012 | dnl -------- |
4013 | @@ -10899,16 +11224,3 @@ |
4014 | ]) |
4015 | |
4016 | |
4017 | - |
4018 | -dnl BM_I18N(PACKAGE, LINGUAS) |
4019 | -dnl |
4020 | -dnl Simple wrapper for XDT_I18N(LINGUAS, PACKAGE). Kept for |
4021 | -dnl backward compatibility. Will be removed in the |
4022 | -dnl future. |
4023 | -dnl |
4024 | -AC_DEFUN([BM_I18N], |
4025 | -[ |
4026 | - XDT_I18N([$2], [$1]) |
4027 | -]) |
4028 | - |
4029 | - |
4030 | |
4031 | === added file 'compile' |
4032 | --- compile 1970-01-01 00:00:00 +0000 |
4033 | +++ compile 2014-05-27 22:31:05 +0000 |
4034 | @@ -0,0 +1,347 @@ |
4035 | +#! /bin/sh |
4036 | +# Wrapper for compilers which do not understand '-c -o'. |
4037 | + |
4038 | +scriptversion=2012-10-14.11; # UTC |
4039 | + |
4040 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
4041 | +# Written by Tom Tromey <tromey@cygnus.com>. |
4042 | +# |
4043 | +# This program is free software; you can redistribute it and/or modify |
4044 | +# it under the terms of the GNU General Public License as published by |
4045 | +# the Free Software Foundation; either version 2, or (at your option) |
4046 | +# any later version. |
4047 | +# |
4048 | +# This program is distributed in the hope that it will be useful, |
4049 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
4050 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4051 | +# GNU General Public License for more details. |
4052 | +# |
4053 | +# You should have received a copy of the GNU General Public License |
4054 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
4055 | + |
4056 | +# As a special exception to the GNU General Public License, if you |
4057 | +# distribute this file as part of a program that contains a |
4058 | +# configuration script generated by Autoconf, you may include it under |
4059 | +# the same distribution terms that you use for the rest of that program. |
4060 | + |
4061 | +# This file is maintained in Automake, please report |
4062 | +# bugs to <bug-automake@gnu.org> or send patches to |
4063 | +# <automake-patches@gnu.org>. |
4064 | + |
4065 | +nl=' |
4066 | +' |
4067 | + |
4068 | +# We need space, tab and new line, in precisely that order. Quoting is |
4069 | +# there to prevent tools from complaining about whitespace usage. |
4070 | +IFS=" "" $nl" |
4071 | + |
4072 | +file_conv= |
4073 | + |
4074 | +# func_file_conv build_file lazy |
4075 | +# Convert a $build file to $host form and store it in $file |
4076 | +# Currently only supports Windows hosts. If the determined conversion |
4077 | +# type is listed in (the comma separated) LAZY, no conversion will |
4078 | +# take place. |
4079 | +func_file_conv () |
4080 | +{ |
4081 | + file=$1 |
4082 | + case $file in |
4083 | + / | /[!/]*) # absolute file, and not a UNC file |
4084 | + if test -z "$file_conv"; then |
4085 | + # lazily determine how to convert abs files |
4086 | + case `uname -s` in |
4087 | + MINGW*) |
4088 | + file_conv=mingw |
4089 | + ;; |
4090 | + CYGWIN*) |
4091 | + file_conv=cygwin |
4092 | + ;; |
4093 | + *) |
4094 | + file_conv=wine |
4095 | + ;; |
4096 | + esac |
4097 | + fi |
4098 | + case $file_conv/,$2, in |
4099 | + *,$file_conv,*) |
4100 | + ;; |
4101 | + mingw/*) |
4102 | + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` |
4103 | + ;; |
4104 | + cygwin/*) |
4105 | + file=`cygpath -m "$file" || echo "$file"` |
4106 | + ;; |
4107 | + wine/*) |
4108 | + file=`winepath -w "$file" || echo "$file"` |
4109 | + ;; |
4110 | + esac |
4111 | + ;; |
4112 | + esac |
4113 | +} |
4114 | + |
4115 | +# func_cl_dashL linkdir |
4116 | +# Make cl look for libraries in LINKDIR |
4117 | +func_cl_dashL () |
4118 | +{ |
4119 | + func_file_conv "$1" |
4120 | + if test -z "$lib_path"; then |
4121 | + lib_path=$file |
4122 | + else |
4123 | + lib_path="$lib_path;$file" |
4124 | + fi |
4125 | + linker_opts="$linker_opts -LIBPATH:$file" |
4126 | +} |
4127 | + |
4128 | +# func_cl_dashl library |
4129 | +# Do a library search-path lookup for cl |
4130 | +func_cl_dashl () |
4131 | +{ |
4132 | + lib=$1 |
4133 | + found=no |
4134 | + save_IFS=$IFS |
4135 | + IFS=';' |
4136 | + for dir in $lib_path $LIB |
4137 | + do |
4138 | + IFS=$save_IFS |
4139 | + if $shared && test -f "$dir/$lib.dll.lib"; then |
4140 | + found=yes |
4141 | + lib=$dir/$lib.dll.lib |
4142 | + break |
4143 | + fi |
4144 | + if test -f "$dir/$lib.lib"; then |
4145 | + found=yes |
4146 | + lib=$dir/$lib.lib |
4147 | + break |
4148 | + fi |
4149 | + if test -f "$dir/lib$lib.a"; then |
4150 | + found=yes |
4151 | + lib=$dir/lib$lib.a |
4152 | + break |
4153 | + fi |
4154 | + done |
4155 | + IFS=$save_IFS |
4156 | + |
4157 | + if test "$found" != yes; then |
4158 | + lib=$lib.lib |
4159 | + fi |
4160 | +} |
4161 | + |
4162 | +# func_cl_wrapper cl arg... |
4163 | +# Adjust compile command to suit cl |
4164 | +func_cl_wrapper () |
4165 | +{ |
4166 | + # Assume a capable shell |
4167 | + lib_path= |
4168 | + shared=: |
4169 | + linker_opts= |
4170 | + for arg |
4171 | + do |
4172 | + if test -n "$eat"; then |
4173 | + eat= |
4174 | + else |
4175 | + case $1 in |
4176 | + -o) |
4177 | + # configure might choose to run compile as 'compile cc -o foo foo.c'. |
4178 | + eat=1 |
4179 | + case $2 in |
4180 | + *.o | *.[oO][bB][jJ]) |
4181 | + func_file_conv "$2" |
4182 | + set x "$@" -Fo"$file" |
4183 | + shift |
4184 | + ;; |
4185 | + *) |
4186 | + func_file_conv "$2" |
4187 | + set x "$@" -Fe"$file" |
4188 | + shift |
4189 | + ;; |
4190 | + esac |
4191 | + ;; |
4192 | + -I) |
4193 | + eat=1 |
4194 | + func_file_conv "$2" mingw |
4195 | + set x "$@" -I"$file" |
4196 | + shift |
4197 | + ;; |
4198 | + -I*) |
4199 | + func_file_conv "${1#-I}" mingw |
4200 | + set x "$@" -I"$file" |
4201 | + shift |
4202 | + ;; |
4203 | + -l) |
4204 | + eat=1 |
4205 | + func_cl_dashl "$2" |
4206 | + set x "$@" "$lib" |
4207 | + shift |
4208 | + ;; |
4209 | + -l*) |
4210 | + func_cl_dashl "${1#-l}" |
4211 | + set x "$@" "$lib" |
4212 | + shift |
4213 | + ;; |
4214 | + -L) |
4215 | + eat=1 |
4216 | + func_cl_dashL "$2" |
4217 | + ;; |
4218 | + -L*) |
4219 | + func_cl_dashL "${1#-L}" |
4220 | + ;; |
4221 | + -static) |
4222 | + shared=false |
4223 | + ;; |
4224 | + -Wl,*) |
4225 | + arg=${1#-Wl,} |
4226 | + save_ifs="$IFS"; IFS=',' |
4227 | + for flag in $arg; do |
4228 | + IFS="$save_ifs" |
4229 | + linker_opts="$linker_opts $flag" |
4230 | + done |
4231 | + IFS="$save_ifs" |
4232 | + ;; |
4233 | + -Xlinker) |
4234 | + eat=1 |
4235 | + linker_opts="$linker_opts $2" |
4236 | + ;; |
4237 | + -*) |
4238 | + set x "$@" "$1" |
4239 | + shift |
4240 | + ;; |
4241 | + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) |
4242 | + func_file_conv "$1" |
4243 | + set x "$@" -Tp"$file" |
4244 | + shift |
4245 | + ;; |
4246 | + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) |
4247 | + func_file_conv "$1" mingw |
4248 | + set x "$@" "$file" |
4249 | + shift |
4250 | + ;; |
4251 | + *) |
4252 | + set x "$@" "$1" |
4253 | + shift |
4254 | + ;; |
4255 | + esac |
4256 | + fi |
4257 | + shift |
4258 | + done |
4259 | + if test -n "$linker_opts"; then |
4260 | + linker_opts="-link$linker_opts" |
4261 | + fi |
4262 | + exec "$@" $linker_opts |
4263 | + exit 1 |
4264 | +} |
4265 | + |
4266 | +eat= |
4267 | + |
4268 | +case $1 in |
4269 | + '') |
4270 | + echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
4271 | + exit 1; |
4272 | + ;; |
4273 | + -h | --h*) |
4274 | + cat <<\EOF |
4275 | +Usage: compile [--help] [--version] PROGRAM [ARGS] |
4276 | + |
4277 | +Wrapper for compilers which do not understand '-c -o'. |
4278 | +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining |
4279 | +arguments, and rename the output as expected. |
4280 | + |
4281 | +If you are trying to build a whole package this is not the |
4282 | +right script to run: please start by reading the file 'INSTALL'. |
4283 | + |
4284 | +Report bugs to <bug-automake@gnu.org>. |
4285 | +EOF |
4286 | + exit $? |
4287 | + ;; |
4288 | + -v | --v*) |
4289 | + echo "compile $scriptversion" |
4290 | + exit $? |
4291 | + ;; |
4292 | + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) |
4293 | + func_cl_wrapper "$@" # Doesn't return... |
4294 | + ;; |
4295 | +esac |
4296 | + |
4297 | +ofile= |
4298 | +cfile= |
4299 | + |
4300 | +for arg |
4301 | +do |
4302 | + if test -n "$eat"; then |
4303 | + eat= |
4304 | + else |
4305 | + case $1 in |
4306 | + -o) |
4307 | + # configure might choose to run compile as 'compile cc -o foo foo.c'. |
4308 | + # So we strip '-o arg' only if arg is an object. |
4309 | + eat=1 |
4310 | + case $2 in |
4311 | + *.o | *.obj) |
4312 | + ofile=$2 |
4313 | + ;; |
4314 | + *) |
4315 | + set x "$@" -o "$2" |
4316 | + shift |
4317 | + ;; |
4318 | + esac |
4319 | + ;; |
4320 | + *.c) |
4321 | + cfile=$1 |
4322 | + set x "$@" "$1" |
4323 | + shift |
4324 | + ;; |
4325 | + *) |
4326 | + set x "$@" "$1" |
4327 | + shift |
4328 | + ;; |
4329 | + esac |
4330 | + fi |
4331 | + shift |
4332 | +done |
4333 | + |
4334 | +if test -z "$ofile" || test -z "$cfile"; then |
4335 | + # If no '-o' option was seen then we might have been invoked from a |
4336 | + # pattern rule where we don't need one. That is ok -- this is a |
4337 | + # normal compilation that the losing compiler can handle. If no |
4338 | + # '.c' file was seen then we are probably linking. That is also |
4339 | + # ok. |
4340 | + exec "$@" |
4341 | +fi |
4342 | + |
4343 | +# Name of file we expect compiler to create. |
4344 | +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` |
4345 | + |
4346 | +# Create the lock directory. |
4347 | +# Note: use '[/\\:.-]' here to ensure that we don't use the same name |
4348 | +# that we are using for the .o file. Also, base the name on the expected |
4349 | +# object file name, since that is what matters with a parallel build. |
4350 | +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d |
4351 | +while true; do |
4352 | + if mkdir "$lockdir" >/dev/null 2>&1; then |
4353 | + break |
4354 | + fi |
4355 | + sleep 1 |
4356 | +done |
4357 | +# FIXME: race condition here if user kills between mkdir and trap. |
4358 | +trap "rmdir '$lockdir'; exit 1" 1 2 15 |
4359 | + |
4360 | +# Run the compile. |
4361 | +"$@" |
4362 | +ret=$? |
4363 | + |
4364 | +if test -f "$cofile"; then |
4365 | + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" |
4366 | +elif test -f "${cofile}bj"; then |
4367 | + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" |
4368 | +fi |
4369 | + |
4370 | +rmdir "$lockdir" |
4371 | +exit $ret |
4372 | + |
4373 | +# Local Variables: |
4374 | +# mode: shell-script |
4375 | +# sh-indentation: 2 |
4376 | +# eval: (add-hook 'write-file-hooks 'time-stamp) |
4377 | +# time-stamp-start: "scriptversion=" |
4378 | +# time-stamp-format: "%:y-%02m-%02d.%02H" |
4379 | +# time-stamp-time-zone: "UTC" |
4380 | +# time-stamp-end: "; # UTC" |
4381 | +# End: |
4382 | |
4383 | === modified file 'config.guess' |
4384 | --- config.guess 2011-01-19 20:17:31 +0000 |
4385 | +++ config.guess 2014-05-27 22:31:05 +0000 |
4386 | @@ -1,14 +1,14 @@ |
4387 | #! /bin/sh |
4388 | # Attempt to guess a canonical system name. |
4389 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4390 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
4391 | -# Free Software Foundation, Inc. |
4392 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
4393 | +# 2011, 2012, 2013 Free Software Foundation, Inc. |
4394 | |
4395 | -timestamp='2009-11-20' |
4396 | +timestamp='2012-12-30' |
4397 | |
4398 | # This file is free software; you can redistribute it and/or modify it |
4399 | # under the terms of the GNU General Public License as published by |
4400 | -# the Free Software Foundation; either version 2 of the License, or |
4401 | +# the Free Software Foundation; either version 3 of the License, or |
4402 | # (at your option) any later version. |
4403 | # |
4404 | # This program is distributed in the hope that it will be useful, but |
4405 | @@ -17,26 +17,22 @@ |
4406 | # General Public License for more details. |
4407 | # |
4408 | # You should have received a copy of the GNU General Public License |
4409 | -# along with this program; if not, write to the Free Software |
4410 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
4411 | -# 02110-1301, USA. |
4412 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
4413 | # |
4414 | # As a special exception to the GNU General Public License, if you |
4415 | # distribute this file as part of a program that contains a |
4416 | # configuration script generated by Autoconf, you may include it under |
4417 | -# the same distribution terms that you use for the rest of that program. |
4418 | - |
4419 | - |
4420 | -# Originally written by Per Bothner. Please send patches (context |
4421 | -# diff format) to <config-patches@gnu.org> and include a ChangeLog |
4422 | -# entry. |
4423 | +# the same distribution terms that you use for the rest of that |
4424 | +# program. This Exception is an additional permission under section 7 |
4425 | +# of the GNU General Public License, version 3 ("GPLv3"). |
4426 | # |
4427 | -# This script attempts to guess a canonical system name similar to |
4428 | -# config.sub. If it succeeds, it prints the system name on stdout, and |
4429 | -# exits with 0. Otherwise, it exits with 1. |
4430 | +# Originally written by Per Bothner. |
4431 | # |
4432 | # You can get the latest version of this script from: |
4433 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
4434 | +# |
4435 | +# Please send patches with a ChangeLog entry to config-patches@gnu.org. |
4436 | + |
4437 | |
4438 | me=`echo "$0" | sed -e 's,.*/,,'` |
4439 | |
4440 | @@ -56,8 +52,9 @@ |
4441 | GNU config.guess ($timestamp) |
4442 | |
4443 | Originally written by Per Bothner. |
4444 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
4445 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4446 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
4447 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, |
4448 | +2012, 2013 Free Software Foundation, Inc. |
4449 | |
4450 | This is free software; see the source for copying conditions. There is NO |
4451 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4452 | @@ -139,12 +136,35 @@ |
4453 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
4454 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
4455 | |
4456 | +case "${UNAME_SYSTEM}" in |
4457 | +Linux|GNU/*) |
4458 | + eval $set_cc_for_build |
4459 | + cat <<-EOF > $dummy.c |
4460 | + #include <features.h> |
4461 | + #ifdef __UCLIBC__ |
4462 | + # ifdef __UCLIBC_CONFIG_VERSION__ |
4463 | + LIBC=uclibc __UCLIBC_CONFIG_VERSION__ |
4464 | + # else |
4465 | + LIBC=uclibc |
4466 | + # endif |
4467 | + #else |
4468 | + # ifdef __dietlibc__ |
4469 | + LIBC=dietlibc |
4470 | + # else |
4471 | + LIBC=gnu |
4472 | + # endif |
4473 | + #endif |
4474 | + EOF |
4475 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
4476 | + ;; |
4477 | +esac |
4478 | + |
4479 | # Note: order is significant - the case branches are not exclusive. |
4480 | |
4481 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
4482 | *:NetBSD:*:*) |
4483 | # NetBSD (nbsd) targets should (where applicable) match one or |
4484 | - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, |
4485 | + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
4486 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
4487 | # switched to ELF, *-*-netbsd* would select the old |
4488 | # object file format. This provides both forward |
4489 | @@ -180,7 +200,7 @@ |
4490 | fi |
4491 | ;; |
4492 | *) |
4493 | - os=netbsd |
4494 | + os=netbsd |
4495 | ;; |
4496 | esac |
4497 | # The OS release |
4498 | @@ -201,6 +221,10 @@ |
4499 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
4500 | echo "${machine}-${os}${release}" |
4501 | exit ;; |
4502 | + *:Bitrig:*:*) |
4503 | + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
4504 | + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} |
4505 | + exit ;; |
4506 | *:OpenBSD:*:*) |
4507 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
4508 | echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} |
4509 | @@ -223,7 +247,7 @@ |
4510 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
4511 | ;; |
4512 | *5.*) |
4513 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
4514 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
4515 | ;; |
4516 | esac |
4517 | # According to Compaq, /usr/sbin/psrinfo has been available on |
4518 | @@ -269,7 +293,10 @@ |
4519 | # A Xn.n version is an unreleased experimental baselevel. |
4520 | # 1.2 uses "1.2" for uname -r. |
4521 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
4522 | - exit ;; |
4523 | + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
4524 | + exitcode=$? |
4525 | + trap '' 0 |
4526 | + exit $exitcode ;; |
4527 | Alpha\ *:Windows_NT*:*) |
4528 | # How do we know it's Interix rather than the generic POSIX subsystem? |
4529 | # Should we change UNAME_MACHINE based on the output of uname instead |
4530 | @@ -295,12 +322,12 @@ |
4531 | echo s390-ibm-zvmoe |
4532 | exit ;; |
4533 | *:OS400:*:*) |
4534 | - echo powerpc-ibm-os400 |
4535 | + echo powerpc-ibm-os400 |
4536 | exit ;; |
4537 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
4538 | echo arm-acorn-riscix${UNAME_RELEASE} |
4539 | exit ;; |
4540 | - arm:riscos:*:*|arm:RISCOS:*:*) |
4541 | + arm*:riscos:*:*|arm*:RISCOS:*:*) |
4542 | echo arm-unknown-riscos |
4543 | exit ;; |
4544 | SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) |
4545 | @@ -394,23 +421,23 @@ |
4546 | # MiNT. But MiNT is downward compatible to TOS, so this should |
4547 | # be no problem. |
4548 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
4549 | - echo m68k-atari-mint${UNAME_RELEASE} |
4550 | + echo m68k-atari-mint${UNAME_RELEASE} |
4551 | exit ;; |
4552 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
4553 | echo m68k-atari-mint${UNAME_RELEASE} |
4554 | - exit ;; |
4555 | + exit ;; |
4556 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
4557 | - echo m68k-atari-mint${UNAME_RELEASE} |
4558 | + echo m68k-atari-mint${UNAME_RELEASE} |
4559 | exit ;; |
4560 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
4561 | - echo m68k-milan-mint${UNAME_RELEASE} |
4562 | - exit ;; |
4563 | + echo m68k-milan-mint${UNAME_RELEASE} |
4564 | + exit ;; |
4565 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
4566 | - echo m68k-hades-mint${UNAME_RELEASE} |
4567 | - exit ;; |
4568 | + echo m68k-hades-mint${UNAME_RELEASE} |
4569 | + exit ;; |
4570 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
4571 | - echo m68k-unknown-mint${UNAME_RELEASE} |
4572 | - exit ;; |
4573 | + echo m68k-unknown-mint${UNAME_RELEASE} |
4574 | + exit ;; |
4575 | m68k:machten:*:*) |
4576 | echo m68k-apple-machten${UNAME_RELEASE} |
4577 | exit ;; |
4578 | @@ -480,8 +507,8 @@ |
4579 | echo m88k-motorola-sysv3 |
4580 | exit ;; |
4581 | AViiON:dgux:*:*) |
4582 | - # DG/UX returns AViiON for all architectures |
4583 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
4584 | + # DG/UX returns AViiON for all architectures |
4585 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
4586 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
4587 | then |
4588 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
4589 | @@ -494,7 +521,7 @@ |
4590 | else |
4591 | echo i586-dg-dgux${UNAME_RELEASE} |
4592 | fi |
4593 | - exit ;; |
4594 | + exit ;; |
4595 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
4596 | echo m88k-dolphin-sysv3 |
4597 | exit ;; |
4598 | @@ -551,7 +578,7 @@ |
4599 | echo rs6000-ibm-aix3.2 |
4600 | fi |
4601 | exit ;; |
4602 | - *:AIX:*:[456]) |
4603 | + *:AIX:*:[4567]) |
4604 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
4605 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
4606 | IBM_ARCH=rs6000 |
4607 | @@ -594,52 +621,52 @@ |
4608 | 9000/[678][0-9][0-9]) |
4609 | if [ -x /usr/bin/getconf ]; then |
4610 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
4611 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
4612 | - case "${sc_cpu_version}" in |
4613 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
4614 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
4615 | - 532) # CPU_PA_RISC2_0 |
4616 | - case "${sc_kernel_bits}" in |
4617 | - 32) HP_ARCH="hppa2.0n" ;; |
4618 | - 64) HP_ARCH="hppa2.0w" ;; |
4619 | + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
4620 | + case "${sc_cpu_version}" in |
4621 | + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
4622 | + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
4623 | + 532) # CPU_PA_RISC2_0 |
4624 | + case "${sc_kernel_bits}" in |
4625 | + 32) HP_ARCH="hppa2.0n" ;; |
4626 | + 64) HP_ARCH="hppa2.0w" ;; |
4627 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
4628 | - esac ;; |
4629 | - esac |
4630 | + esac ;; |
4631 | + esac |
4632 | fi |
4633 | if [ "${HP_ARCH}" = "" ]; then |
4634 | eval $set_cc_for_build |
4635 | - sed 's/^ //' << EOF >$dummy.c |
4636 | - |
4637 | - #define _HPUX_SOURCE |
4638 | - #include <stdlib.h> |
4639 | - #include <unistd.h> |
4640 | - |
4641 | - int main () |
4642 | - { |
4643 | - #if defined(_SC_KERNEL_BITS) |
4644 | - long bits = sysconf(_SC_KERNEL_BITS); |
4645 | - #endif |
4646 | - long cpu = sysconf (_SC_CPU_VERSION); |
4647 | - |
4648 | - switch (cpu) |
4649 | - { |
4650 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
4651 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
4652 | - case CPU_PA_RISC2_0: |
4653 | - #if defined(_SC_KERNEL_BITS) |
4654 | - switch (bits) |
4655 | - { |
4656 | - case 64: puts ("hppa2.0w"); break; |
4657 | - case 32: puts ("hppa2.0n"); break; |
4658 | - default: puts ("hppa2.0"); break; |
4659 | - } break; |
4660 | - #else /* !defined(_SC_KERNEL_BITS) */ |
4661 | - puts ("hppa2.0"); break; |
4662 | - #endif |
4663 | - default: puts ("hppa1.0"); break; |
4664 | - } |
4665 | - exit (0); |
4666 | - } |
4667 | + sed 's/^ //' << EOF >$dummy.c |
4668 | + |
4669 | + #define _HPUX_SOURCE |
4670 | + #include <stdlib.h> |
4671 | + #include <unistd.h> |
4672 | + |
4673 | + int main () |
4674 | + { |
4675 | + #if defined(_SC_KERNEL_BITS) |
4676 | + long bits = sysconf(_SC_KERNEL_BITS); |
4677 | + #endif |
4678 | + long cpu = sysconf (_SC_CPU_VERSION); |
4679 | + |
4680 | + switch (cpu) |
4681 | + { |
4682 | + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
4683 | + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
4684 | + case CPU_PA_RISC2_0: |
4685 | + #if defined(_SC_KERNEL_BITS) |
4686 | + switch (bits) |
4687 | + { |
4688 | + case 64: puts ("hppa2.0w"); break; |
4689 | + case 32: puts ("hppa2.0n"); break; |
4690 | + default: puts ("hppa2.0"); break; |
4691 | + } break; |
4692 | + #else /* !defined(_SC_KERNEL_BITS) */ |
4693 | + puts ("hppa2.0"); break; |
4694 | + #endif |
4695 | + default: puts ("hppa1.0"); break; |
4696 | + } |
4697 | + exit (0); |
4698 | + } |
4699 | EOF |
4700 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
4701 | test -z "$HP_ARCH" && HP_ARCH=hppa |
4702 | @@ -730,22 +757,22 @@ |
4703 | exit ;; |
4704 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
4705 | echo c1-convex-bsd |
4706 | - exit ;; |
4707 | + exit ;; |
4708 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
4709 | if getsysinfo -f scalar_acc |
4710 | then echo c32-convex-bsd |
4711 | else echo c2-convex-bsd |
4712 | fi |
4713 | - exit ;; |
4714 | + exit ;; |
4715 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
4716 | echo c34-convex-bsd |
4717 | - exit ;; |
4718 | + exit ;; |
4719 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
4720 | echo c38-convex-bsd |
4721 | - exit ;; |
4722 | + exit ;; |
4723 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
4724 | echo c4-convex-bsd |
4725 | - exit ;; |
4726 | + exit ;; |
4727 | CRAY*Y-MP:*:*:*) |
4728 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
4729 | exit ;; |
4730 | @@ -769,14 +796,14 @@ |
4731 | exit ;; |
4732 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
4733 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
4734 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
4735 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
4736 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
4737 | - exit ;; |
4738 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
4739 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
4740 | + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
4741 | + exit ;; |
4742 | 5000:UNIX_System_V:4.*:*) |
4743 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
4744 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
4745 | - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
4746 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
4747 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
4748 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
4749 | exit ;; |
4750 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
4751 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
4752 | @@ -788,30 +815,35 @@ |
4753 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
4754 | exit ;; |
4755 | *:FreeBSD:*:*) |
4756 | - case ${UNAME_MACHINE} in |
4757 | - pc98) |
4758 | - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
4759 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
4760 | + case ${UNAME_PROCESSOR} in |
4761 | amd64) |
4762 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
4763 | *) |
4764 | - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
4765 | + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
4766 | esac |
4767 | exit ;; |
4768 | i*:CYGWIN*:*) |
4769 | echo ${UNAME_MACHINE}-pc-cygwin |
4770 | exit ;; |
4771 | + *:MINGW64*:*) |
4772 | + echo ${UNAME_MACHINE}-pc-mingw64 |
4773 | + exit ;; |
4774 | *:MINGW*:*) |
4775 | echo ${UNAME_MACHINE}-pc-mingw32 |
4776 | exit ;; |
4777 | + i*:MSYS*:*) |
4778 | + echo ${UNAME_MACHINE}-pc-msys |
4779 | + exit ;; |
4780 | i*:windows32*:*) |
4781 | - # uname -m includes "-pc" on this system. |
4782 | - echo ${UNAME_MACHINE}-mingw32 |
4783 | + # uname -m includes "-pc" on this system. |
4784 | + echo ${UNAME_MACHINE}-mingw32 |
4785 | exit ;; |
4786 | i*:PW*:*) |
4787 | echo ${UNAME_MACHINE}-pc-pw32 |
4788 | exit ;; |
4789 | *:Interix*:*) |
4790 | - case ${UNAME_MACHINE} in |
4791 | + case ${UNAME_MACHINE} in |
4792 | x86) |
4793 | echo i586-pc-interix${UNAME_RELEASE} |
4794 | exit ;; |
4795 | @@ -848,15 +880,22 @@ |
4796 | exit ;; |
4797 | *:GNU:*:*) |
4798 | # the GNU system |
4799 | - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
4800 | + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
4801 | exit ;; |
4802 | *:GNU/*:*:*) |
4803 | # other systems with GNU libc and userland |
4804 | - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu |
4805 | + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} |
4806 | exit ;; |
4807 | i*86:Minix:*:*) |
4808 | echo ${UNAME_MACHINE}-pc-minix |
4809 | exit ;; |
4810 | + aarch64:Linux:*:*) |
4811 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4812 | + exit ;; |
4813 | + aarch64_be:Linux:*:*) |
4814 | + UNAME_MACHINE=aarch64_be |
4815 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4816 | + exit ;; |
4817 | alpha:Linux:*:*) |
4818 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
4819 | EV5) UNAME_MACHINE=alphaev5 ;; |
4820 | @@ -866,52 +905,53 @@ |
4821 | EV6) UNAME_MACHINE=alphaev6 ;; |
4822 | EV67) UNAME_MACHINE=alphaev67 ;; |
4823 | EV68*) UNAME_MACHINE=alphaev68 ;; |
4824 | - esac |
4825 | + esac |
4826 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
4827 | - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
4828 | - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
4829 | + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi |
4830 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4831 | exit ;; |
4832 | arm*:Linux:*:*) |
4833 | eval $set_cc_for_build |
4834 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
4835 | | grep -q __ARM_EABI__ |
4836 | then |
4837 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
4838 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4839 | else |
4840 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
4841 | + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
4842 | + | grep -q __ARM_PCS_VFP |
4843 | + then |
4844 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi |
4845 | + else |
4846 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf |
4847 | + fi |
4848 | fi |
4849 | exit ;; |
4850 | avr32*:Linux:*:*) |
4851 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
4852 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4853 | exit ;; |
4854 | cris:Linux:*:*) |
4855 | - echo cris-axis-linux-gnu |
4856 | + echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
4857 | exit ;; |
4858 | crisv32:Linux:*:*) |
4859 | - echo crisv32-axis-linux-gnu |
4860 | + echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
4861 | exit ;; |
4862 | frv:Linux:*:*) |
4863 | - echo frv-unknown-linux-gnu |
4864 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4865 | + exit ;; |
4866 | + hexagon:Linux:*:*) |
4867 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4868 | exit ;; |
4869 | i*86:Linux:*:*) |
4870 | - LIBC=gnu |
4871 | - eval $set_cc_for_build |
4872 | - sed 's/^ //' << EOF >$dummy.c |
4873 | - #ifdef __dietlibc__ |
4874 | - LIBC=dietlibc |
4875 | - #endif |
4876 | -EOF |
4877 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
4878 | - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
4879 | + echo ${UNAME_MACHINE}-pc-linux-${LIBC} |
4880 | exit ;; |
4881 | ia64:Linux:*:*) |
4882 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
4883 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4884 | exit ;; |
4885 | m32r*:Linux:*:*) |
4886 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
4887 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4888 | exit ;; |
4889 | m68*:Linux:*:*) |
4890 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
4891 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4892 | exit ;; |
4893 | mips:Linux:*:* | mips64:Linux:*:*) |
4894 | eval $set_cc_for_build |
4895 | @@ -930,51 +970,54 @@ |
4896 | #endif |
4897 | EOF |
4898 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
4899 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
4900 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
4901 | ;; |
4902 | or32:Linux:*:*) |
4903 | - echo or32-unknown-linux-gnu |
4904 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4905 | exit ;; |
4906 | padre:Linux:*:*) |
4907 | - echo sparc-unknown-linux-gnu |
4908 | + echo sparc-unknown-linux-${LIBC} |
4909 | exit ;; |
4910 | parisc64:Linux:*:* | hppa64:Linux:*:*) |
4911 | - echo hppa64-unknown-linux-gnu |
4912 | + echo hppa64-unknown-linux-${LIBC} |
4913 | exit ;; |
4914 | parisc:Linux:*:* | hppa:Linux:*:*) |
4915 | # Look for CPU level |
4916 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
4917 | - PA7*) echo hppa1.1-unknown-linux-gnu ;; |
4918 | - PA8*) echo hppa2.0-unknown-linux-gnu ;; |
4919 | - *) echo hppa-unknown-linux-gnu ;; |
4920 | + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; |
4921 | + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; |
4922 | + *) echo hppa-unknown-linux-${LIBC} ;; |
4923 | esac |
4924 | exit ;; |
4925 | ppc64:Linux:*:*) |
4926 | - echo powerpc64-unknown-linux-gnu |
4927 | + echo powerpc64-unknown-linux-${LIBC} |
4928 | exit ;; |
4929 | ppc:Linux:*:*) |
4930 | - echo powerpc-unknown-linux-gnu |
4931 | + echo powerpc-unknown-linux-${LIBC} |
4932 | exit ;; |
4933 | s390:Linux:*:* | s390x:Linux:*:*) |
4934 | echo ${UNAME_MACHINE}-ibm-linux |
4935 | exit ;; |
4936 | sh64*:Linux:*:*) |
4937 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
4938 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4939 | exit ;; |
4940 | sh*:Linux:*:*) |
4941 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
4942 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4943 | exit ;; |
4944 | sparc:Linux:*:* | sparc64:Linux:*:*) |
4945 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
4946 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4947 | + exit ;; |
4948 | + tile*:Linux:*:*) |
4949 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4950 | exit ;; |
4951 | vax:Linux:*:*) |
4952 | - echo ${UNAME_MACHINE}-dec-linux-gnu |
4953 | + echo ${UNAME_MACHINE}-dec-linux-${LIBC} |
4954 | exit ;; |
4955 | x86_64:Linux:*:*) |
4956 | - echo x86_64-unknown-linux-gnu |
4957 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4958 | exit ;; |
4959 | xtensa*:Linux:*:*) |
4960 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
4961 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4962 | exit ;; |
4963 | i*86:DYNIX/ptx:4*:*) |
4964 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
4965 | @@ -983,11 +1026,11 @@ |
4966 | echo i386-sequent-sysv4 |
4967 | exit ;; |
4968 | i*86:UNIX_SV:4.2MP:2.*) |
4969 | - # Unixware is an offshoot of SVR4, but it has its own version |
4970 | - # number series starting with 2... |
4971 | - # I am not positive that other SVR4 systems won't match this, |
4972 | + # Unixware is an offshoot of SVR4, but it has its own version |
4973 | + # number series starting with 2... |
4974 | + # I am not positive that other SVR4 systems won't match this, |
4975 | # I just have to hope. -- rms. |
4976 | - # Use sysv4.2uw... so that sysv4* matches it. |
4977 | + # Use sysv4.2uw... so that sysv4* matches it. |
4978 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
4979 | exit ;; |
4980 | i*86:OS/2:*:*) |
4981 | @@ -1019,7 +1062,7 @@ |
4982 | fi |
4983 | exit ;; |
4984 | i*86:*:5:[678]*) |
4985 | - # UnixWare 7.x, OpenUNIX and OpenServer 6. |
4986 | + # UnixWare 7.x, OpenUNIX and OpenServer 6. |
4987 | case `/bin/uname -X | grep "^Machine"` in |
4988 | *486*) UNAME_MACHINE=i486 ;; |
4989 | *Pentium) UNAME_MACHINE=i586 ;; |
4990 | @@ -1047,13 +1090,13 @@ |
4991 | exit ;; |
4992 | pc:*:*:*) |
4993 | # Left here for compatibility: |
4994 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
4995 | - # the processor, so we play safe by assuming i586. |
4996 | + # uname -m prints for DJGPP always 'pc', but it prints nothing about |
4997 | + # the processor, so we play safe by assuming i586. |
4998 | # Note: whatever this is, it MUST be the same as what config.sub |
4999 | # prints for the "djgpp" host, or else GDB configury will decide that |
5000 | # this is a cross-build. |
The diff has been truncated for viewing.
Uploaded, thanks!