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