1 |
grobian 10/12/01 17:42:39 |
2 |
|
3 |
Added: WPrefs-uk.po |
4 |
WindowMaker-0.80.2-cvs-alt-textfield.patch |
5 |
WindowMaker-0.91.0-alt-adialog.patch |
6 |
WindowMaker-0.91.0-alt-clipnotext.patch |
7 |
WindowMaker-0.91.0-alt-dockhotkeys.patch |
8 |
WindowMaker-0.91.0-alt-focus.patch |
9 |
WindowMaker-0.91.0-alt-menutrans.patch |
10 |
WindowMaker-0.91.0-alt-mmx.patch |
11 |
WindowMaker-0.91.0-alt-restartscrpt.patch |
12 |
WindowMaker-0.91.0-alt-session.patch |
13 |
WindowMaker-0.91.0-alt-sowings.patch |
14 |
WindowMaker-0.91.0-alt-titlebar.patch |
15 |
WindowMaker-0.91.0-alt-vlaad-newbuttons.patch |
16 |
WindowMaker-0.91.0-alt-vlaad-trance.patch |
17 |
WindowMaker-0.91.0-hmepas-minimizeall.patch |
18 |
WindowMaker-0.91.0-hmepas-swmenu_rclick.patch |
19 |
WindowMaker-0.91.0-peter-appicon-bouncer2.patch |
20 |
WindowMaker-0.91.0-peter-mouse-placement.patch |
21 |
WindowMaker-0.91.0-peter-newappicon.patch |
22 |
WindowMaker-0.91.0-sga-moving-add.patch |
23 |
WindowMaker-0.91.0-sga-swpanel-customization.patch |
24 |
WindowMaker-0.92.0-alt-newpo.patch |
25 |
WindowMaker-0.92.0-cvs-gcc41.patch |
26 |
WindowMaker-0.92.0-cvs20060123.patch |
27 |
WindowMaker-newbuttons.nextstyle.tiff |
28 |
WindowMaker-newbuttons.nextstyle.xpm |
29 |
WindowMaker-newbuttons.oldstyle.tiff |
30 |
WindowMaker-uk.po |
31 |
Log: |
32 |
windowmaker-0.92.0-patchset-1 |
33 |
|
34 |
Revision Changes Path |
35 |
1.1 src/patchsets/windowmaker/0.92.0/WPrefs-uk.po |
36 |
|
37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WPrefs-uk.po?rev=1.1&view=markup |
38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WPrefs-uk.po?rev=1.1&content-type=text/plain |
39 |
|
40 |
Index: WPrefs-uk.po |
41 |
=================================================================== |
42 |
msgid "" |
43 |
msgstr "" |
44 |
"Project-Id-Version: WPrefs.app 0.80.1\n" |
45 |
"POT-Creation-Date: 2002-02-18 10:15+0200\n" |
46 |
"PO-Revision-Date: 2004-09-06 21:42+4000\n" |
47 |
"Last-Translator: Victor Forsyuk <victor@×××××××××.com>\n" |
48 |
"Language-Team: KSI Linux Ukrainian <uk@×××××××××.com>\n" |
49 |
"MIME-Version: 1.0\n" |
50 |
"Content-Type: text/plain; charset=koi8-u\n" |
51 |
"Content-Transfer-Encoding: 8bit\n" |
52 |
"Date: 1999-05-31 19:29:53+0400\n" |
53 |
"From: Victor Forsyuk,,,<victor@×××××××××.com>\n" |
54 |
"Xgettext-Options: --default-domain=WPrefs --add-comments --keyword=_\n" |
55 |
"Files: ../../WPrefs.app/main.c ../../WPrefs.app/WPrefs.c " |
56 |
"../../WPrefs.app/Appearance.c ../../WPrefs.app/Configurations.c " |
57 |
"../../WPrefs.app/Expert.c ../../WPrefs.app/Focus.c ../../WPrefs.app/Icons.c " |
58 |
"../../WPrefs.app/KeyboardSettings.c ../../WPrefs.app/KeyboardShortcuts.c " |
59 |
"../../WPrefs.app/Menu.c ../../WPrefs.app/MenuPreferences.c " |
60 |
"../../WPrefs.app/MouseSettings.c ../../WPrefs.app/NoMenuAlert.c " |
61 |
"../../WPrefs.app/Paths.c ../../WPrefs.app/Preferences.c " |
62 |
"../../WPrefs.app/Text.c ../../WPrefs.app/TexturePanel.c " |
63 |
"../../WPrefs.app/Themes.c ../../WPrefs.app/WindowHandling.c " |
64 |
"../../WPrefs.app/Workspace.c ../../WPrefs.app/double.c " |
65 |
"../../WPrefs.app/editmenu.c ../../WPrefs.app/MenuGuru.c " |
66 |
"../../WPrefs.app/xmodifier.c\n" |
67 |
|
68 |
#: ../../WPrefs.app/Appearance.c:1131 |
69 |
msgid "Select File" |
70 |
msgstr "÷ÉÂÅÒ¦ÔØ ÆÁÊÌ" |
71 |
|
72 |
#: ../../WPrefs.app/Appearance.c:1533 |
73 |
msgid "Focused Window" |
74 |
msgstr "áËÔÉ×ΊצËÎÏ" |
75 |
|
76 |
#: ../../WPrefs.app/Appearance.c:1537 |
77 |
msgid "Unfocused Window" |
78 |
msgstr "îÅÁËÔÉ×ΊצËÎÏ" |
79 |
|
80 |
#: ../../WPrefs.app/Appearance.c:1541 |
81 |
msgid "Owner of Focused Window" |
82 |
msgstr "÷ÌÁÓÎÉË ÁËÔÉ×ÎÏÇÏ ×¦ËÎÁ" |
83 |
|
84 |
#: ../../WPrefs.app/Appearance.c:1545 ../../WPrefs.app/Appearance.c:1862 |
85 |
msgid "Menu Title" |
86 |
msgstr "ûÁÐËÁ ÍÅÎÀ" |
87 |
|
88 |
#: ../../WPrefs.app/Appearance.c:1549 ../../WPrefs.app/Appearance.c:1551 |
89 |
msgid "Normal Item" |
90 |
msgstr "îÏÒÍ. ÐÕÎËÔ" |
91 |
|
92 |
#: ../../WPrefs.app/Appearance.c:1555 |
93 |
msgid "Disabled Item" |
94 |
msgstr "îÅÄÏÓÔÕÐÎÉÊ" |
95 |
|
96 |
#: ../../WPrefs.app/Appearance.c:1564 |
97 |
msgid "Highlighted" |
98 |
msgstr "ð¦ÄÓצÞÅÎÉÊ" |
99 |
|
100 |
#: ../../WPrefs.app/Appearance.c:1755 |
101 |
msgid "Texture" |
102 |
msgstr "ôÅËÓÔÕÒÁ" |
103 |
|
104 |
#: ../../WPrefs.app/Appearance.c:1763 |
105 |
msgid "Titlebar of Focused Window" |
106 |
msgstr "úÁÇÏÌÏ×ÏË ÁËÔÉ×ÎÏÇÏ ×¦ËÎÁ" |
107 |
|
108 |
#: ../../WPrefs.app/Appearance.c:1764 |
109 |
msgid "Titlebar of Unfocused Windows" |
110 |
msgstr "úÁÇÏÌÏ×ÏË ÎÅÁËÔÉ×ÎÉÈ ×¦ËÏÎ" |
111 |
|
112 |
#: ../../WPrefs.app/Appearance.c:1765 |
113 |
msgid "Titlebar of Focused Window's Owner" |
114 |
msgstr "úÁÇÏÌÏ×ÏË ×ÌÁÓÎÉËÁ ÁËÔÉ×ÎÏÇÏ ×¦ËÎÁ" |
115 |
|
116 |
#: ../../WPrefs.app/Appearance.c:1766 |
117 |
msgid "Window Resizebar" |
118 |
msgstr "óÍÕÖËÁ ÚͦÎÉ ÒÏÚͦÒÕ ×¦ËÎÁ" |
119 |
|
120 |
#: ../../WPrefs.app/Appearance.c:1767 |
121 |
msgid "Titlebar of Menus" |
122 |
msgstr "úÁÇÏÌÏ×ÏË ÍÅÎÀ" |
123 |
|
124 |
#: ../../WPrefs.app/Appearance.c:1768 |
125 |
msgid "Menu Items" |
126 |
msgstr "ðÕÎËÔÉ ÍÅÎÀ" |
127 |
|
128 |
#: ../../WPrefs.app/Appearance.c:1769 |
129 |
msgid "Icon Background" |
130 |
msgstr "æÏÎ ¦ËÏÎËÉ" |
131 |
|
132 |
#: ../../WPrefs.app/Appearance.c:1784 |
133 |
msgid "" |
134 |
"Double click in the texture you want to use\n" |
135 |
"for the selected item." |
136 |
msgstr "" |
137 |
"úÒϦÔØ ÐÏÄצÊÎÉÊ ËÌ¦Ë ÎÁ ÔÅËÓÔÕÒ¦, ËÏÔÒÕ ÈÏÞÅÔÅ\n" |
138 |
"×ÉËÏÒÉÓÔÁÔÉ ÄÌÑ ×ÉÂÒÁÎÏÇÏ ÅÌÅÍÅÎÔÕ." |
139 |
|
140 |
#: ../../WPrefs.app/Appearance.c:1798 |
141 |
msgid "New" |
142 |
msgstr "îÏ×Á" |
143 |
|
144 |
#: ../../WPrefs.app/Appearance.c:1802 |
145 |
msgid "Create a new texture." |
146 |
msgstr "óÔ×ÏÒÅÎÎÑ ÎÏ×ϧ ÔÅËÓÔÕÒÉ." |
147 |
|
148 |
#: ../../WPrefs.app/Appearance.c:1810 |
149 |
msgid "Extract..." |
150 |
msgstr "ä¦ÓÔÁÔÉ..." |
151 |
|
152 |
#: ../../WPrefs.app/Appearance.c:1814 |
153 |
msgid "Extract texture(s) from a theme or a style file." |
154 |
msgstr "ïÔÒÉÍÁÎÎÑ ÔÅËÓÔÕÒ(É) Ú ôÅÍÉ ÞÉ ÓÔÉÌØÏ×ÏÇÏ ÆÁÊÌÕ." |
155 |
|
156 |
#: ../../WPrefs.app/Appearance.c:1824 |
157 |
msgid "Edit" |
158 |
msgstr "úͦÎÉÔÉ" |
159 |
|
160 |
#: ../../WPrefs.app/Appearance.c:1827 |
161 |
msgid "Edit the highlighted texture." |
162 |
msgstr "òÅÄÁÇÕ×ÁÎÎÑ Ð¦ÄÓצÞÅÎϧ ÔÅËÓÔÕÒÉ." |
163 |
|
164 |
#: ../../WPrefs.app/Appearance.c:1835 ../../WPrefs.app/TexturePanel.c:1316 |
165 |
msgid "Delete" |
166 |
msgstr "÷ÉÄÁÌÉÔÉ" |
167 |
|
168 |
#: ../../WPrefs.app/Appearance.c:1839 |
169 |
msgid "Delete the highlighted texture." |
170 |
msgstr "÷ÉÄÁÌÅÎÎÑ Ð¦ÄÓצÞÅÎϧ ÔÅËÓÔÕÒÉ." |
171 |
|
172 |
#: ../../WPrefs.app/Appearance.c:1852 |
173 |
msgid "Color" |
174 |
msgstr "ëÏ̦Ò" |
175 |
|
176 |
#: ../../WPrefs.app/Appearance.c:1859 |
177 |
msgid "Focused Window Title" |
178 |
msgstr "úÁÇÏÌÏ×ÏË ÁËÔÉ×ÎÏÇÏ ×¦ËÎÁ" |
179 |
|
180 |
#: ../../WPrefs.app/Appearance.c:1860 |
181 |
msgid "Unfocused Window Title" |
182 |
msgstr "úÁÇÏÌÏ×ÏË ÎÅÁËÔÉ×ÎÉÈ ×¦ËÏÎ" |
183 |
|
184 |
#: ../../WPrefs.app/Appearance.c:1861 |
185 |
msgid "Owner of Focused Window Title" |
186 |
msgstr "úÁÇÏÌÏ×ÏË ×ÌÁÓÎÉËÁ ÁËÔÉ×ÎÏÇÏ ×¦ËÎÁ" |
187 |
|
188 |
#: ../../WPrefs.app/Appearance.c:1863 |
189 |
msgid "Menu Item Text" |
190 |
msgstr "ôÅËÓÔ ÐÕÎËÔÁ ÍÅÎÀ" |
191 |
|
192 |
#: ../../WPrefs.app/Appearance.c:1864 |
193 |
msgid "Disabled Menu Item Text" |
194 |
msgstr "ôÅËÓÔ ÎÅÄÏÓÔÕÐÎÏÇÏ ÐÕÎËÔÁ ÍÅÎÀ" |
195 |
|
196 |
#: ../../WPrefs.app/Appearance.c:1865 |
197 |
msgid "Menu Highlight Color" |
198 |
msgstr "ëÏÌ¦Ò Ð¦ÄÓצÔËÉ ÐÕÎËÔÁ ÍÅÎÀ" |
199 |
|
200 |
#: ../../WPrefs.app/Appearance.c:1866 |
201 |
msgid "Highlighted Menu Text Color" |
202 |
msgstr "ëÏÌ¦Ò ÔÅËÓÔÕ Ð¦ÄÓצÞÅÎÏÇÏ ÐÕÎËÔÕ" |
203 |
|
204 |
#: ../../WPrefs.app/Appearance.c:1905 |
205 |
msgid "Background" |
206 |
msgstr "æÏÎ" |
207 |
|
208 |
#: ../../WPrefs.app/Appearance.c:1917 ../../WPrefs.app/TexturePanel.c:1503 |
209 |
msgid "Browse..." |
210 |
msgstr "÷ÉÂÒÁÔÉ..." |
211 |
|
212 |
#: ../../WPrefs.app/Appearance.c:1930 |
213 |
msgid "Options" |
214 |
msgstr "ïÐæ§:" |
215 |
|
216 |
#: ../../WPrefs.app/Appearance.c:1937 |
217 |
msgid "Menu Style" |
218 |
msgstr "óÔÉÌØ ÍÅÎÀ" |
219 |
|
220 |
#: ../../WPrefs.app/Appearance.c:1965 ../../WPrefs.app/Configurations.c:242 |
221 |
#: ../../WPrefs.app/Configurations.c:254 ../../WPrefs.app/Focus.c:288 |
222 |
#: ../../WPrefs.app/Focus.c:299 ../../WPrefs.app/MenuPreferences.c:134 |
223 |
#: ../../WPrefs.app/MenuPreferences.c:145 |
224 |
#: ../../WPrefs.app/MenuPreferences.c:173 |
225 |
#: ../../WPrefs.app/MenuPreferences.c:188 ../../WPrefs.app/MouseSettings.c:560 |
226 |
#: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:558 |
227 |
#: ../../WPrefs.app/WPrefs.c:583 |
228 |
#, c-format |
229 |
msgid "could not load icon file %s" |
230 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ ÆÁÊÌ ¦ËÏÎËÉ %s" |
231 |
|
232 |
#: ../../WPrefs.app/Appearance.c:1979 |
233 |
msgid "Title Alignment" |
234 |
msgstr "úÁÇÏÌÏ×ÏË" |
235 |
|
236 |
#: ../../WPrefs.app/Appearance.c:1986 |
237 |
msgid "Left" |
238 |
msgstr "ì¦×ÏÒÕÞ" |
239 |
|
240 |
#: ../../WPrefs.app/Appearance.c:1989 ../../WPrefs.app/TexturePanel.c:1517 |
241 |
#: ../../WPrefs.app/Workspace.c:270 |
242 |
msgid "Center" |
243 |
msgstr "ðÏ ÃÅÎÔÒÕ" |
244 |
|
245 |
#: ../../WPrefs.app/Appearance.c:1992 |
246 |
msgid "Right" |
247 |
msgstr "ðÒÁ×ÏÒÕÞ" |
248 |
|
249 |
#: ../../WPrefs.app/Appearance.c:2216 |
250 |
msgid "Appearance Preferences" |
251 |
msgstr "úÏ×ΦÛÎ¦Ê ×ÉÇÌÑÄ" |
252 |
|
253 |
#: ../../WPrefs.app/Appearance.c:2218 |
254 |
msgid "" |
255 |
"Background texture configuration for windows,\n" |
256 |
"menus and icons." |
257 |
msgstr "" |
258 |
"ëÏÎƦÇÕÒÁÃ¦Ñ ÆÏÎÏ×ÉÈ ÔÅËÓÔÕÒ ÄÌÑ ×¦ËÏÎ,\n" |
259 |
"ÍÅÎÀ ÔÁ ¦ËÏÎÏË." |
260 |
|
261 |
#: ../../WPrefs.app/Appearance.c:2263 |
262 |
msgid "Extract Texture" |
263 |
msgstr "ïÔÒÉÍÁÔÉ ÔÅËÓÔÕÒÕ" |
264 |
|
265 |
#: ../../WPrefs.app/Appearance.c:2283 |
266 |
msgid "Textures" |
267 |
msgstr "ôÅËÓÔÕÒÉ" |
268 |
|
269 |
#: ../../WPrefs.app/Appearance.c:2294 ../../WPrefs.app/WPrefs.c:302 |
270 |
msgid "Close" |
271 |
msgstr "úÁËÒÉÔÉ" |
272 |
|
273 |
#: ../../WPrefs.app/Appearance.c:2299 |
274 |
msgid "Extract" |
275 |
msgstr "÷ÉÔÑÇÔÉ" |
276 |
|
277 |
#: ../../WPrefs.app/Configurations.c:150 ../../WPrefs.app/Configurations.c:156 |
278 |
#: ../../WPrefs.app/MouseSettings.c:490 ../../WPrefs.app/WindowHandling.c:339 |
279 |
#: ../../WPrefs.app/WindowHandling.c:351 ../../WPrefs.app/Workspace.c:90 |
280 |
#: ../../WPrefs.app/Workspace.c:101 |
281 |
#, c-format |
282 |
msgid "could not load icon %s" |
283 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ ¦ËÏÎËÕ %s" |
284 |
|
285 |
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109 |
286 |
#, c-format |
287 |
msgid "could not process icon %s:" |
288 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÏÂÒÏÂÉÔÉ ¦ËÏÎËÕ %s:" |
289 |
|
290 |
#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164 |
291 |
#, c-format |
292 |
msgid "could not load image file %s" |
293 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ ÆÁÊÌ ÚÏÂÒÁÖÅÎÎÑ %s" |
294 |
|
295 |
#: ../../WPrefs.app/Configurations.c:203 |
296 |
msgid "Icon Slide Speed" |
297 |
msgstr "û×ÉÄ˦ÓÔØ ÚÓÕ×Õ ¦ËÏÎËÉ" |
298 |
|
299 |
#: ../../WPrefs.app/Configurations.c:209 |
300 |
msgid "Shade Animation Speed" |
301 |
msgstr "û×ÉÄ˦ÓÔØ ÓÔÉÓËÁÎÎÑ ×¦ËÎÁ" |
302 |
|
303 |
#: ../../WPrefs.app/Configurations.c:271 |
304 |
msgid "Smooth Scaling" |
305 |
msgstr "úÇÌÁÖÕ×ÁÎÎÑ" |
306 |
|
307 |
#: ../../WPrefs.app/Configurations.c:272 |
308 |
msgid "" |
309 |
"Smooth scaled background images, neutralizing\n" |
310 |
"the `pixelization' effect. This will slow\n" |
311 |
"down loading of background images considerably." |
312 |
msgstr "" |
313 |
"úÇÌÁÖÕ×ÁÎÎÑ ÍÁÓÛÔÁÂÏ×ÁÎÉÈ ÆÏÎÏ×ÉÈ ÚÏÂÒÁÖÅÎØ,\n" |
314 |
"ÎÅÊÔÒÁ̦ÚÕÀÞÉ ÅÆÅËÔ `ЦËÓÅ̦ÚÁæ§'. ãÅ ÚÎÁÞÎÏ\n" |
315 |
"ÕÐÏצÌØÎÉÔØ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÆÏÎÏ×ÉÈ ÚÏÂÒÁÖÅÎØ." |
316 |
|
317 |
#: ../../WPrefs.app/Configurations.c:313 |
318 |
msgid "Titlebar Style" |
319 |
msgstr "óÔÉÌØ ÛÁÐËÉ" |
320 |
|
321 |
#: ../../WPrefs.app/Configurations.c:351 |
322 |
msgid "Animations and Sound" |
323 |
msgstr "áΦÍÁÃ¦Ñ ÔÁ ú×ÕË" |
324 |
|
325 |
#: ../../WPrefs.app/Configurations.c:357 |
326 |
msgid "Animations" |
327 |
msgstr "áΦÍÁæÑ" |
328 |
|
329 |
#: ../../WPrefs.app/Configurations.c:368 |
330 |
msgid "" |
331 |
"Disable/enable animations such as those shown\n" |
332 |
"for window miniaturization, shading etc." |
333 |
msgstr "" |
334 |
"úÁÂÏÒÏÎÉÔÉ/ÄÏÚ×ÏÌÉÔÉ ÁΦÍÁæÊΦ ÅÆÅËÔÉ ÔÉÐÕ ÁΦÍÁæ§\n" |
335 |
"ͦΦͦÚÁæ§ צËÎÁ, ÓÔÉÓËÁÎÎÑ ×¦ËÎÁ × ÓÍÕÖËÕ ¦ Ô.Ð." |
336 |
|
337 |
#: ../../WPrefs.app/Configurations.c:376 |
338 |
msgid "Superfluous" |
339 |
msgstr "ëÒÁÓÉ×ÏÓÔ¦" |
340 |
|
341 |
#: ../../WPrefs.app/Configurations.c:387 |
342 |
msgid "" |
343 |
"Disable/enable `superfluous' features and\n" |
344 |
"animations. These include the `ghosting' of the\n" |
345 |
"dock when it's being moved to another side and\n" |
346 |
"the explosion animation when undocking icons." |
347 |
msgstr "" |
348 |
"úÁÂÏÒÏÎÉÔÉ/ÄÏÚ×ÏÌÉÔÉ `ƤΤÞËÉ' :) ÔÁ ÄÏÄÁÔËÏ×Õ\n" |
349 |
"ÁΦÍÁæÀ. ãÅ ×ËÌÀÞÁ¤ ÓÔ×ÏÒÅÎÎÑ `ÐÒÉ×ÉÄÁ' äÏËÕ\n" |
350 |
"ÐÒÉ ÐÅÒÅͦÝÅÎΦ ÊÏÇÏ ÎÁ ¦ÎÛÕ ÓÔÏÒÏÎÕ ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ\n" |
351 |
"ÔÁ `×ÉÂÕÈÏ×Õ' ÁΦÍÁæÀ ×É×ÅÄÅÎÎÑ ¦ËÏÎÏË Ú ÄÏËÕ." |
352 |
|
353 |
#: ../../WPrefs.app/Configurations.c:397 |
354 |
msgid "Sounds" |
355 |
msgstr "ú×ÕËÉ" |
356 |
|
357 |
#: ../../WPrefs.app/Configurations.c:408 |
358 |
msgid "" |
359 |
"Disable/enable support for sound effects played\n" |
360 |
"for actions like shading and closing a window.\n" |
361 |
"You will need a module distributed separately\n" |
362 |
"for this. You can get it at:\n" |
363 |
"http://shadowmere.student.utwente.nl/" |
364 |
msgstr "" |
365 |
"úÁÂÏÒÏÎÉÔÉ/ÄÏÚ×ÏÌÉÔÉ Ð¦ÄÔÒÉÍËÕ Ú×ÕËÏ×ÉÈ ÅÆÅËÔ¦×,\n" |
366 |
"ÓÕÐÒÏ×ÏÄÖÕÀÞÉÈ Ä¦§ ÔÉÐÕ ÓÔÉÓËÁÎÎÑ ÔÁ ÚÁËÒÉÔÔÑ ×¦ËÎÁ.\n" |
367 |
"äÌÑ Ã¦¤§ ЦÄÔÒÉÍËÉ ÎÅÏÂȦÄÎÉÊ ÏËÒÅÍÏ ×ÓÔÁÎÏ×ÌÀ×ÁÎÉÊ\n" |
368 |
"ÍÏÄÕÌØ. äÏÍÁÛÎÑ ÓÔÏÒ¦ÎËÁ ÃØÏÇÏ ÍÏÄÕÌÑ:\n" |
369 |
"http://shadowmere.student.utwente.nl/" |
370 |
|
371 |
#: ../../WPrefs.app/Configurations.c:419 |
372 |
msgid "" |
373 |
"Note: sound requires a module distributed\n" |
374 |
"separately" |
375 |
msgstr "" |
376 |
"úÁÕ×ÁÖÅÎÎÑ: ÏÚ×ÕÞÕ×ÁÎÎÑ ÐÏÔÒÅÂÕ¤ ÏËÒÅÍÏÇÏ ÍÏÄÕÌÑ" |
377 |
|
378 |
#: ../../WPrefs.app/Configurations.c:429 |
379 |
msgid "Dithering colormap for 8bpp" |
380 |
msgstr "äÉÚÅÒ¦ÎÇ ÄÌÑ ÒÅÖÉÍÕ 256 ËÏÌØÏÒ¦× (8bpp)" |
381 |
|
382 |
#: ../../WPrefs.app/Configurations.c:431 |
383 |
msgid "" |
384 |
"Number of colors to reserve for Window Maker\n" |
385 |
"on displays that support only 8bpp (PseudoColor)." |
386 |
msgstr "" |
387 |
"ë¦ÌØ˦ÓÔØ ËÏÌØÏÒ¦×, ÝÏ ÒÅÚÅÒ×Õ¤ÔØÓÑ ÄÌÑ Window Maker\n" |
388 |
"× ÅËÒÁÎÎÉÈ ÒÅÖÉÍÁÈ Ú 8 ¦ÔÁÍÉ ÎÁ ЦËÓÅÌ (PseudoColor)." |
389 |
|
390 |
#: ../../WPrefs.app/Configurations.c:438 |
391 |
msgid "Disable dithering in any visual/depth" |
392 |
msgstr "úÁÂÏÒÏÎÉÔÉ ÄÉÚÅÒ¦ÎÇ × ÂÕÄØ-ÑËÉÈ ÒÅÖÉÍÁÈ" |
393 |
|
394 |
#: ../../WPrefs.app/Configurations.c:459 |
395 |
msgid "" |
396 |
"More colors for\n" |
397 |
"applications" |
398 |
msgstr "" |
399 |
"â¦ÌØÛÅ ËÏÌØÏÒ¦×\nÐÒÏÇÒÁÍÁÍ" |
400 |
|
401 |
#: ../../WPrefs.app/Configurations.c:466 |
402 |
msgid "" |
403 |
"More colors for\n" |
404 |
"Window Maker" |
405 |
msgstr "" |
406 |
"â¦ÌØÛÅ ËÏÌØÏÒ¦×\nWindowMaker'Õ" |
407 |
|
408 |
#: ../../WPrefs.app/Configurations.c:521 |
409 |
msgid "Other Configurations" |
410 |
msgstr "¶ÎÛ¦ ÎÁÓÔÒÏÊËÉ" |
411 |
|
412 |
#: ../../WPrefs.app/Configurations.c:523 |
413 |
msgid "" |
414 |
"Animation speeds, titlebar styles, various option\n" |
415 |
"toggling and number of colors to reserve for\n" |
416 |
"Window Maker on 8bit displays." |
417 |
msgstr "" |
418 |
"û×ÉÄ˦ÓÔØ ÁΦÍÁæÊ, ÓÔÉ̦ ÛÁÐËÉ ×¦ËÎÁ, Ò¦ÚÎÏÍÁΦÔΦ\n" |
419 |
"ÏÐæ§ ÔÁ ˦ÌØ˦ÓÔØ ËÏÌØÏÒ¦×, ÝÏ ÒÅÚÅÒ×Õ¤ÔØÓÑ ÄÌÑ\n" |
420 |
"WindowMaker Õ 8¦ÔÎÉÈ ÅËÒÁÎÎÉÈ ÒÅÖÉÍÁÈ." |
421 |
|
422 |
#: ../../WPrefs.app/Expert.c:75 |
423 |
msgid "" |
424 |
"Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME." |
425 |
msgstr "" |
426 |
"úÁÂÏÒÏÎÉÔÉ ¦ËÏÎËÉ ÄÌÑ Í¦Î¦Í¦ÚÏ×ÁÎÉÈ ×¦ËÏÎ. äÌÑ ×ÉËÏÒÉÓÔÁÎÎÑ Ú KDE/GNOME." |
427 |
|
428 |
#: ../../WPrefs.app/Expert.c:76 |
429 |
msgid "Do not set non-WindowMaker specific parameters (do not use xset)." |
430 |
msgstr "îÅ ×ÓÔÁÎÏ×ÌÀ×ÁÔÉ ÎÅ-WindowMaker ÐÁÒÁÍÅÔÒÉ (ÎÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ xset)" |
431 |
|
432 |
#: ../../WPrefs.app/Expert.c:77 |
433 |
msgid "Automatically save session when exiting Window Maker." |
434 |
msgstr "á×ÔÏÍÁÔÉÞÎÏ ÚÂÅÒ¦ÇÁÔÉ ÓÅÁÎÓ ÐÒÉ ×ÉÈÏĦ Ú WindowMaker." |
435 |
|
436 |
#: ../../WPrefs.app/Expert.c:78 |
437 |
msgid "Use SaveUnder in window frames, icons, menus and other objects." |
438 |
msgstr "" |
439 |
"÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ SaveUnder ÄÌÑ ÍÅÖ ×¦ËÏÎ, ¦ËÏÎÏË, ÍÅÎÀ ÔÁ ¦ÎÛÉÈ ÏÂ'¤ËÔ¦×." |
440 |
|
441 |
#: ../../WPrefs.app/Expert.c:79 |
442 |
msgid "Use Windoze style cycling." |
443 |
msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÐÅÒÅÈ¦Ä Í¦Ö ×¦ËÎÁÍÉ × ÓÔÉ̦ Windows." |
444 |
|
445 |
#: ../../WPrefs.app/Expert.c:80 |
446 |
msgid "Disable confirmation panel for the Kill command." |
447 |
msgstr "÷¦ÄËÌÀÞÉÔÉ ÐÁÎÅÌØ Ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÄÌÑ ËÏÍÁÎÄÉ `÷ÂÉÔÉ'" |
448 |
|
449 |
#: ../../WPrefs.app/Expert.c:81 |
450 |
msgid "Disable selection animation for selected icons." |
451 |
msgstr "úÁÂÏÒÏÎÉÔÉ ÁΦÍÁæÀ ×ÉÂÏÒÕ ÄÌÑ ×ÉÂÒÁÎÉÈ ¦ËÏÎÏË." |
452 |
|
453 |
#: ../../WPrefs.app/Expert.c:115 |
454 |
msgid "Expert User Preferences" |
455 |
msgstr "îÁÓÔÒÏÊËÉ ×ÐÏÄÏÂÁÎØ ÄÌÑ ÄÏÓצÄÞÅÎÏÇÏ ËÏÒÉÓÔÕ×ÁÞÁ" |
456 |
|
457 |
#: ../../WPrefs.app/Expert.c:117 |
458 |
msgid "" |
459 |
"Options for people who know what they're doing...\n" |
460 |
"Also have some other misc. options." |
461 |
msgstr "" |
462 |
"ðÁÒÁÍÅÔÒÉ ÄÌÑ ÔÉÈ, ÈÔÏ ÚÎÁ¤, ÝÏ ÒÏÂÉÔØ ;)...\n" |
463 |
"ôÁËÏÖ ÏÐæ§, ÝÏ ÎÅ ÐÏÐÁÌÉ × ¦ÎÛ¦ ËÁÔÅÇÏÒ¦§." |
464 |
|
465 |
#: ../../WPrefs.app/Focus.c:80 |
466 |
#, c-format |
467 |
msgid "bad option value %s for option FocusMode. Using default Manual" |
468 |
msgstr "ÎÅÐÒÁ×ÉÌØÎÅ ÚÎÁÞÅÎÎÑ %s ÄÌÑ FocusMode. ÷ÉËÏÒÉÓÔÏ×Õ¤Í Manual" |
469 |
|
470 |
#: ../../WPrefs.app/Focus.c:94 |
471 |
#, c-format |
472 |
msgid "bad option value %s for option ColormapMode. Using default Auto" |
473 |
msgstr "ÎÅÐÒÁ×ÉÌØÎÅ ÚÎÁÞÅÎÎÑ %s ÄÌÑ ColormapMode. ÷ÉËÏÒÉÓÔÏ×Õ¤Í Auto" |
474 |
|
475 |
#: ../../WPrefs.app/Focus.c:214 |
476 |
msgid "Input Focus Mode" |
477 |
msgstr "òÅÖÉÍ ÆÏËÕÓÕ ××ÏÄÕ" |
478 |
|
479 |
#: ../../WPrefs.app/Focus.c:222 |
480 |
msgid "Manual: Click on the window to set keyboard input focus" |
481 |
msgstr "" |
482 |
"òÕÞÎÉÊ: æÏËÕÓ ××ÏÄÕ Ú ËÌÁצÁÔÕÒÉ ×ÓÔÁÎÏ×ÌÀ¤ÔØÓÑ " |
483 |
"Ë̦ËÏÍ ÍÉÛ¦ ÎÁ צËΦ" |
484 |
|
485 |
#: ../../WPrefs.app/Focus.c:229 |
486 |
msgid "Auto: Set keyboard input focus to the window under the mouse pointer" |
487 |
msgstr "" |
488 |
"á×ÔÏÍÁÔÉÞÎÉÊ: æÏËÕÓ ××ÏÄÕ Ú ËÌÁצÁÔÕÒÉ Õ ×¦ËÎÁ Ð¦Ä ÕËÁÚËÏÀ ÍÉÛ¦" |
489 |
|
490 |
#: ../../WPrefs.app/Focus.c:243 |
491 |
msgid "Install colormap in the window..." |
492 |
msgstr "÷ÓÔÁÎÏ×ÉÔÉ colormap Õ ×¦ËΦ..." |
493 |
|
494 |
#: ../../WPrefs.app/Focus.c:248 |
495 |
msgid "...that has the input focus." |
496 |
msgstr "...ÝÏ ÍÁ¤ ÆÏËÕÓ ××ÏÄÕ." |
497 |
|
498 |
#: ../../WPrefs.app/Focus.c:253 |
499 |
msgid "...that is under the mouse pointer." |
500 |
msgstr "...Ð¦Ä ÕËÁÚËÏÀ ÍÉÛ¦." |
501 |
|
502 |
#: ../../WPrefs.app/Focus.c:262 |
503 |
msgid "Automatic Window Raise Delay" |
504 |
msgstr "ð¦ÄΦÍÁÔÉ ×¦ËÎÏ ÞÅÒÅÚ..." |
505 |
|
506 |
#: ../../WPrefs.app/Focus.c:319 ../../WPrefs.app/MouseSettings.c:601 |
507 |
msgid "msec" |
508 |
msgstr "" |
509 |
|
510 |
#: ../../WPrefs.app/Focus.c:336 |
511 |
msgid "" |
512 |
"Do not let applications receive\n" |
513 |
"the click used to focus windows." |
514 |
msgstr "" |
515 |
"îÅ ÐÅÒÅÄÁ×ÁÔÉ ÐÒÏÇÒÁÍÁÍ Ë̦Ë\nÕÓÔÁÎÏ×ËÉ ÆÏËÕÓÁ." |
516 |
|
517 |
#: ../../WPrefs.app/Focus.c:342 |
518 |
msgid "" |
519 |
"Automatically focus new\n" |
520 |
"windows." |
521 |
msgstr "" |
522 |
"òÏÂÉÔÉ ÎÏצ צËÎÁ ÁËÔÉ×ÎÉÍÉ\nÁ×ÔÏÍÁÔÉÞÎÏ." |
523 |
|
524 |
#: ../../WPrefs.app/Focus.c:363 |
525 |
msgid "Window Focus Preferences" |
526 |
msgstr "ðÁÒÁÍÅÔÒÉ ÆÏËÕÓÕ×ÁÎÎÑ ×¦ËÎÁ" |
527 |
|
528 |
#: ../../WPrefs.app/Focus.c:365 |
529 |
msgid "" |
530 |
"Keyboard focus switching policy, colormap switching\n" |
531 |
"policy for 8bpp displays and other related options." |
532 |
msgstr "" |
533 |
"ðÒÁ×ÉÌÁ ÐÅÒÅÍÉËÁÎÎÑ ÆÏËÕÓÕ ËÌÁצÁÔÕÒÎÏÇÏ ××ÏÄÕ,\n" |
534 |
"ÐÅÒÅÍÉËÁÎÎÑ ÐÁ̦ÔÒ ÄÌÑ 8-¦ÔÎÉÈ ÒÅÖÉͦ×." |
535 |
|
536 |
#: ../../WPrefs.app/Font.c:276 |
537 |
msgid "Could not locate font information file WPrefs.app/font.data" |
538 |
msgstr "" |
539 |
|
540 |
#: ../../WPrefs.app/Font.c:282 |
541 |
msgid "Could not read font information file WPrefs.app/font.data" |
542 |
msgstr "" |
543 |
|
544 |
#: ../../WPrefs.app/Font.c:293 |
545 |
msgid "" |
546 |
"Invalid data in font information file WPrefs.app/font.data.\n" |
547 |
"Encodings data not found." |
548 |
msgstr "" |
549 |
|
550 |
#: ../../WPrefs.app/Font.c:298 |
551 |
msgid "- Custom -" |
552 |
msgstr "" |
553 |
|
554 |
#: ../../WPrefs.app/Font.c:329 ../../WPrefs.app/Menu.c:1534 |
555 |
#: ../../WPrefs.app/MouseSettings.c:140 ../../WPrefs.app/MouseSettings.c:160 |
556 |
#: ../../WPrefs.app/TexturePanel.c:613 ../../WPrefs.app/TexturePanel.c:693 |
557 |
#: ../../WPrefs.app/Themes.c:96 ../../WPrefs.app/WPrefs.c:758 |
558 |
#: ../../WPrefs.app/WPrefs.c:763 ../../WPrefs.app/WPrefs.c:780 |
559 |
#: ../../WPrefs.app/WPrefs.c:790 ../../WPrefs.app/WPrefs.c:800 |
560 |
#: ../../WPrefs.app/WPrefs.c:838 ../../WPrefs.app/WPrefs.c:843 |
561 |
msgid "Error" |
562 |
msgstr "ðÏÍÉÌËÁ" |
563 |
|
564 |
#: ../../WPrefs.app/Font.c:329 ../../WPrefs.app/Menu.c:1534 |
565 |
#: ../../WPrefs.app/MouseSettings.c:142 ../../WPrefs.app/MouseSettings.c:162 |
566 |
#: ../../WPrefs.app/TexturePanel.c:614 ../../WPrefs.app/TexturePanel.c:695 |
567 |
#: ../../WPrefs.app/TexturePanel.c:1528 ../../WPrefs.app/Themes.c:98 |
568 |
#: ../../WPrefs.app/WPrefs.c:758 ../../WPrefs.app/WPrefs.c:763 |
569 |
#: ../../WPrefs.app/WPrefs.c:782 ../../WPrefs.app/WPrefs.c:794 |
570 |
#: ../../WPrefs.app/WPrefs.c:800 ../../WPrefs.app/WPrefs.c:807 |
571 |
#: ../../WPrefs.app/WPrefs.c:838 ../../WPrefs.app/WPrefs.c:843 |
572 |
#: ../../WPrefs.app/imagebrowser.c:105 |
573 |
msgid "OK" |
574 |
msgstr "" |
575 |
|
576 |
#: ../../WPrefs.app/Font.c:376 |
577 |
#, fuzzy |
578 |
msgid "Default Font Sets" |
579 |
msgstr "õÍÏ×ÞÁÎÎÑ" |
580 |
|
581 |
#: ../../WPrefs.app/Font.c:389 |
582 |
msgid "Font Set" |
583 |
msgstr "" |
584 |
|
585 |
#: ../../WPrefs.app/Font.c:418 |
586 |
msgid "Add..." |
587 |
msgstr "äÏÄÁÔÉ" |
588 |
|
589 |
#: ../../WPrefs.app/Font.c:423 ../../WPrefs.app/Font.c:438 |
590 |
msgid "Change..." |
591 |
msgstr "úͦÎÉÔÉ" |
592 |
|
593 |
#: ../../WPrefs.app/Font.c:428 ../../WPrefs.app/Paths.c:288 |
594 |
#: ../../WPrefs.app/Paths.c:319 |
595 |
msgid "Remove" |
596 |
msgstr "÷ÉÄÁÌÉÔÉ" |
597 |
|
598 |
#: ../../WPrefs.app/Font.c:477 |
599 |
msgid "Font Preferences" |
600 |
msgstr "îÁÓÔÒÏÊËÉ ×ÐÏÄÏÂÁÎØ ÄÌÑ ÛÒÉÆÔ¦×" |
601 |
|
602 |
#: ../../WPrefs.app/Font.c:478 |
603 |
msgid "Font Configurations for Windows, Menus etc" |
604 |
msgstr "ëÏÎƦÇÕÒÁÃ¦Ñ ÛÒÉÆÔ¦× ÄÌÑ ×¦ËÏÎ, ÍÅÎÀ ¦ Ô.Ð." |
605 |
|
606 |
#: ../../WPrefs.app/Icons.c:180 |
607 |
msgid "Icon Positioning" |
608 |
msgstr "òÏÚÔÁÛÕ×ÁÎÎÑ ¦ËÏÎÏË" |
609 |
|
610 |
#: ../../WPrefs.app/Icons.c:227 |
611 |
msgid "Iconification Animation" |
612 |
msgstr "áΦÍÁÃ¦Ñ ¦ËÏÎÏË" |
613 |
|
614 |
#: ../../WPrefs.app/Icons.c:238 |
615 |
msgid "Shrinking/Zooming" |
616 |
msgstr "úÍÅÎÛÅÎÎÑ/ú¦ÌØÛÅÎÎÑ" |
617 |
|
618 |
#: ../../WPrefs.app/Icons.c:239 |
619 |
msgid "Spinning/Twisting" |
620 |
msgstr "ïÂÅÒÔÁÎÎÑ/ëÒÕÞÅÎÎÑ" |
621 |
|
622 |
#: ../../WPrefs.app/Icons.c:240 |
623 |
msgid "3D-flipping" |
624 |
msgstr "3D-ÏÂÅÒÔÁÎÎÑ" |
625 |
|
626 |
#: ../../WPrefs.app/Icons.c:241 ../../WPrefs.app/MouseSettings.c:838 |
627 |
#: ../../WPrefs.app/MouseSettings.c:843 |
628 |
msgid "None" |
629 |
msgstr "îÅÍÁ¤" |
630 |
|
631 |
#: ../../WPrefs.app/Icons.c:254 |
632 |
msgid "Auto-arrange icons" |
633 |
msgstr "á×ÔÏÍÁÔÉÞÎÏ ×ÉÒ¦×ÎÀ×ÁÔÉ ¦ËÏÎËÉ" |
634 |
|
635 |
#: ../../WPrefs.app/Icons.c:256 |
636 |
msgid "Keep icons and miniwindows arranged all the time." |
637 |
msgstr "úÁ×ÖÄÉ ×ÉÒ¦×ÎÀ×ÁÔÉ ÒÏÚÔÁÛÕ×ÁÎÎÑ ¦ËÏÎÏË ¦ ͦΦצËÏÎ." |
638 |
|
639 |
#: ../../WPrefs.app/Icons.c:262 |
640 |
msgid "Omnipresent miniwindows" |
641 |
msgstr "í¦Î¦×¦ËÎÁ ÐÒÉÓÕÔΦ ×ÓÀÄÕ" |
642 |
|
643 |
#: ../../WPrefs.app/Icons.c:264 |
644 |
msgid "Make miniwindows be present in all workspaces." |
645 |
msgstr "òÏÂÉÔÉ Í¦Î¦×¦ËÎÁ ÐÒÉÓÕÔΦÍÉ ÎÁ ×Ó¦È ÒÏÂÏÞÉÈ ÓÔÏÌÁÈ." |
646 |
|
647 |
#: ../../WPrefs.app/Icons.c:273 |
648 |
msgid "Icon Size" |
649 |
msgstr "òÏÚÍ¦Ò ¦ËÏÎÏË" |
650 |
|
651 |
#: ../../WPrefs.app/Icons.c:275 |
652 |
msgid "The size of the dock/application icon and miniwindows" |
653 |
msgstr "òÏÚÍ¦Ò ¦ËÏÎÏË ÄÏËÁ/ÐÒÏÇÒÁÍ ¦ ͦΦצËÏÎ" |
654 |
|
655 |
#: ../../WPrefs.app/Icons.c:345 |
656 |
msgid "Icon Preferences" |
657 |
msgstr "îÁÓÔÒÏÊËÉ ÄÌÑ ¦ËÏÎÏË" |
658 |
|
659 |
#: ../../WPrefs.app/Icons.c:347 |
660 |
msgid "" |
661 |
"Icon/Miniwindow handling options. Icon positioning\n" |
662 |
"area, sizes of icons, miniaturization animation style." |
663 |
msgstr "" |
664 |
"ïÐæ§ ÏÂÒÏÂËÉ ¦ËÏÎÏË/ͦΦצËÏÎ. ïÂÌÁÓÔØ ÒÏÚͦÝÅÎÎÑ\n" |
665 |
"¦ËÏÎÏË, ÒÏÚͦÒÉ ¦ËÏÎÏË, ÓÔÉÌØ ÁΦÍÕ×ÁÎÎÑ Í¦Î¦Í¦ÚÁæ§." |
666 |
|
667 |
#: ../../WPrefs.app/KeyboardSettings.c:73 |
668 |
msgid "Initial Key Repeat" |
669 |
msgstr "" |
670 |
|
671 |
#: ../../WPrefs.app/KeyboardSettings.c:114 |
672 |
msgid "Key Repeat Rate" |
673 |
msgstr "" |
674 |
|
675 |
#: ../../WPrefs.app/KeyboardSettings.c:154 |
676 |
msgid "Type here to test" |
677 |
msgstr "äÌÑ ÔÅÓÔÕ×ÁÎÎÑ ÐÉÛ¦ÔØ ÓÀÄÉ" |
678 |
|
679 |
#: ../../WPrefs.app/KeyboardSettings.c:173 |
680 |
msgid "Keyboard Preferences" |
681 |
msgstr "îÁÓÔÒÏÊËÉ ÄÌÑ ËÌÁצÁÔÕÒÉ" |
682 |
|
683 |
#: ../../WPrefs.app/KeyboardSettings.c:175 |
684 |
msgid "Not done" |
685 |
msgstr "îÅ ÚÒÏÂÌÅÎÏ" |
686 |
|
687 |
#: ../../WPrefs.app/KeyboardShortcuts.c:187 ../../WPrefs.app/Menu.c:327 |
688 |
#: ../../WPrefs.app/TexturePanel.c:1534 ../../WPrefs.app/imagebrowser.c:100 |
689 |
msgid "Cancel" |
690 |
msgstr "÷¦ÄͦÎÁ" |
691 |
|
692 |
#: ../../WPrefs.app/KeyboardShortcuts.c:188 |
693 |
msgid "Press the desired shortcut key(s) or click Cancel to stop capturing." |
694 |
msgstr "îÁÔÉÓΦÔØ ËÌÁצÛÕ(¦) ÁÂÏ Ö ËÎÏÐËÕ ÷¦ÄͦÎÁ ÄÌÑ ÚÕÐÉÎËÉ." |
695 |
|
696 |
#: ../../WPrefs.app/KeyboardShortcuts.c:208 |
697 |
#: ../../WPrefs.app/KeyboardShortcuts.c:458 ../../WPrefs.app/Menu.c:338 |
698 |
#: ../../WPrefs.app/Menu.c:782 |
699 |
msgid "Capture" |
700 |
msgstr "úÁÈ×ÁÔ" |
701 |
|
702 |
#: ../../WPrefs.app/KeyboardShortcuts.c:209 |
703 |
#: ../../WPrefs.app/KeyboardShortcuts.c:466 |
704 |
msgid "Click Capture to interactively define the shortcut key." |
705 |
msgstr "îÁÔÉÓΦÔØ úÁÈ×ÁÔ ÄÌÑ ¦ÎÔÅÒÁËÔÉ×ÎÏÇÏ ÚÁÄÁÎÎÑ ÐÒÉÓËÏÒÀ×ÁÞÁ." |
706 |
|
707 |
#: ../../WPrefs.app/KeyboardShortcuts.c:364 |
708 |
msgid "Actions" |
709 |
msgstr "䦧" |
710 |
|
711 |
#: ../../WPrefs.app/KeyboardShortcuts.c:380 |
712 |
msgid "Open applications menu" |
713 |
msgstr "÷¦ÄËÒÉÔÉ ÍÅÎÀ ÐÒÏÇÒÁÍ" |
714 |
|
715 |
#: ../../WPrefs.app/KeyboardShortcuts.c:381 |
716 |
msgid "Open window list menu" |
717 |
msgstr "÷¦ÄËÒÉÔÉ ÓÐÉÓÏË ×¦ËÏÎ" |
718 |
|
719 |
#: ../../WPrefs.app/KeyboardShortcuts.c:382 |
720 |
msgid "Open window commands menu" |
721 |
msgstr "÷¦ÄËÒÉÔÉ ÍÅÎÀ ËÏÍÁÎÄ ÄÌÑ ×¦ËÎÁ" |
722 |
|
723 |
#: ../../WPrefs.app/KeyboardShortcuts.c:383 |
724 |
msgid "Hide active application" |
725 |
msgstr "óÈÏ×ÁÔÉ ÁËÔÉ×ÎÕ ÐÒÏÇÒÁÍÕ" |
726 |
|
727 |
#: ../../WPrefs.app/KeyboardShortcuts.c:384 |
728 |
msgid "Hide other applications" |
729 |
msgstr "óÈÏ×ÁÔÉ ¦ÎÛ¦ ÐÒÏÇÒÁÍÉ" |
730 |
|
731 |
#: ../../WPrefs.app/KeyboardShortcuts.c:385 |
732 |
msgid "Miniaturize active window" |
733 |
msgstr "í¦Î¦Í¦ÚÕ×ÁÔÉ ÁËÔÉ×ΊצËÎÏ" |
734 |
|
735 |
#: ../../WPrefs.app/KeyboardShortcuts.c:386 |
736 |
msgid "Close active window" |
737 |
msgstr "úÁËÒÉÔÉ ÁËÔÉ×ΊצËÎÏ" |
738 |
|
739 |
#: ../../WPrefs.app/KeyboardShortcuts.c:387 |
740 |
msgid "Maximize active window" |
741 |
msgstr "íÁËÓÉͦÚÕ×ÁÔÉ ÁËÔÉ×ΊצËÎÏ" |
742 |
|
743 |
#: ../../WPrefs.app/KeyboardShortcuts.c:388 |
744 |
msgid "Maximize active window vertically" |
745 |
msgstr "íÁËÓÉͦÚÕ×ÁÔÉ ÁËÔÉ×ΊצËÎÏ ÐÏ ×ÅÒÔÉËÁ̦" |
746 |
|
747 |
#: ../../WPrefs.app/KeyboardShortcuts.c:389 |
748 |
msgid "Maximize active window horizontally" |
749 |
msgstr "íÁËÓÉͦÚÕ×ÁÔÉ ÁËÔÉ×ΊצËÎÏ ÐÏ ÇÏÒÉÚÏÎÔÁ̦" |
750 |
|
751 |
#: ../../WPrefs.app/KeyboardShortcuts.c:390 |
752 |
msgid "Raise active window" |
753 |
msgstr "áËÔÉ×ΊצËÎÏ - ÎÁ ÐÅÒÅÄÎ¦Ê ÐÌÁÎ" |
754 |
|
755 |
#: ../../WPrefs.app/KeyboardShortcuts.c:391 |
756 |
msgid "Lower active window" |
757 |
msgstr "áËÔÉ×ΊצËÎÏ - ÎÁ ÚÁÄÎ¦Ê ÐÌÁÎ" |
758 |
|
759 |
#: ../../WPrefs.app/KeyboardShortcuts.c:392 |
760 |
msgid "Raise/Lower window under mouse pointer" |
761 |
msgstr "ð¦ÄÎÑÔÉ/÷ÔÏÐÉÔÉ ×¦ËÎÏ ÐÏÄ ÕËÁÚËÏÀ ÍÉÛ¦" |
762 |
|
763 |
#: ../../WPrefs.app/KeyboardShortcuts.c:393 |
764 |
msgid "Shade active window" |
765 |
msgstr "óÔÉÓÎÕÔÉ ÁËÔÉ×ΊצËÎÏ" |
766 |
|
767 |
#: ../../WPrefs.app/KeyboardShortcuts.c:394 |
768 |
msgid "Move/Resize active window" |
769 |
msgstr "ðÅÒÅͦÓÔÉÔÉ/úͦÎÉÔÉ ÒÏÚÍ¦Ò ÁËÔÉ×ÎÏÇÏ ×¦ËÎÁ" |
770 |
|
771 |
#: ../../WPrefs.app/KeyboardShortcuts.c:395 |
772 |
msgid "Select active window" |
773 |
msgstr "÷ÉÂÒÁÔÉ ÁËÔÉ×ΊצËÎÏ" |
774 |
|
775 |
#: ../../WPrefs.app/KeyboardShortcuts.c:396 |
776 |
msgid "Focus next window" |
777 |
msgstr "æÏËÕÓ - × ÎÁÓÔÕÐΊצËÎÏ" |
778 |
|
779 |
#: ../../WPrefs.app/KeyboardShortcuts.c:397 |
780 |
msgid "Focus previous window" |
781 |
msgstr "æÏËÕÓ - × ÐÏÐÅÒÅÄΤ צËÎÏ" |
782 |
|
783 |
#: ../../WPrefs.app/KeyboardShortcuts.c:398 |
784 |
msgid "Switch to next workspace" |
785 |
msgstr "îÁ ÎÁÓÔÕÐÎÉÊ ÒÏÂÏÞÉÊ ÓÔ¦Ì" |
786 |
|
787 |
#: ../../WPrefs.app/KeyboardShortcuts.c:399 |
788 |
msgid "Switch to previous workspace" |
789 |
msgstr "îÁ ÐÏÐÅÒÅÄÎ¦Ê ÒÏÂÏÞÉÊ ÓÔ¦Ì" |
790 |
|
791 |
#: ../../WPrefs.app/KeyboardShortcuts.c:400 |
792 |
msgid "Switch to next ten workspaces" |
793 |
msgstr "îÁÓÔÕÐΦ 10 ÒÏÂÏÞÉÈ ÓÔÏ̦×" |
794 |
|
795 |
#: ../../WPrefs.app/KeyboardShortcuts.c:401 |
796 |
msgid "Switch to previous ten workspaces" |
797 |
msgstr "ðÏÐÅÒÅÄΦ 10 ÒÏÂÏÞÉÈ ÓÔÏ̦×" |
798 |
|
799 |
#: ../../WPrefs.app/KeyboardShortcuts.c:402 |
800 |
msgid "Switch to workspace 1" |
801 |
msgstr "îÁ ÒÏÂÏÞÉÊ ÓÔ¦Ì 1" |
802 |
|
803 |
#: ../../WPrefs.app/KeyboardShortcuts.c:403 |
804 |
msgid "Switch to workspace 2" |
805 |
msgstr "îÁ ÒÏÂÏÞÉÊ ÓÔ¦Ì 2" |
806 |
|
807 |
#: ../../WPrefs.app/KeyboardShortcuts.c:404 |
808 |
msgid "Switch to workspace 3" |
809 |
msgstr "îÁ ÒÏÂÏÞÉÊ ÓÔ¦Ì 3" |
810 |
|
811 |
#: ../../WPrefs.app/KeyboardShortcuts.c:405 |
812 |
msgid "Switch to workspace 4" |
813 |
msgstr "îÁ ÒÏÂÏÞÉÊ ÓÔ¦Ì 4" |
814 |
|
815 |
#: ../../WPrefs.app/KeyboardShortcuts.c:406 |
816 |
msgid "Switch to workspace 5" |
817 |
msgstr "îÁ ÒÏÂÏÞÉÊ ÓÔ¦Ì 5" |
818 |
|
819 |
#: ../../WPrefs.app/KeyboardShortcuts.c:407 |
820 |
msgid "Switch to workspace 6" |
821 |
msgstr "îÁ ÒÏÂÏÞÉÊ ÓÔ¦Ì 6" |
822 |
|
823 |
#: ../../WPrefs.app/KeyboardShortcuts.c:408 |
824 |
msgid "Switch to workspace 7" |
825 |
msgstr "îÁ ÒÏÂÏÞÉÊ ÓÔ¦Ì 7" |
826 |
|
827 |
#: ../../WPrefs.app/KeyboardShortcuts.c:409 |
828 |
msgid "Switch to workspace 8" |
829 |
msgstr "îÁ ÒÏÂÏÞÉÊ ÓÔ¦Ì 8" |
830 |
|
831 |
#: ../../WPrefs.app/KeyboardShortcuts.c:410 |
832 |
msgid "Switch to workspace 9" |
833 |
msgstr "îÁ ÒÏÂÏÞÉÊ ÓÔ¦Ì 9" |
834 |
|
835 |
#: ../../WPrefs.app/KeyboardShortcuts.c:411 |
836 |
msgid "Switch to workspace 10" |
837 |
msgstr "îÁ ÒÏÂÏÞÉÊ ÓÔ¦Ì 10" |
838 |
|
839 |
#: ../../WPrefs.app/KeyboardShortcuts.c:412 |
840 |
msgid "Shortcut for window 1" |
841 |
msgstr "ðÒÉÓËÏÒÀ×ÁÞ ÄÌÑ ×¦ËÎÁ 1" |
842 |
|
843 |
#: ../../WPrefs.app/KeyboardShortcuts.c:413 |
844 |
msgid "Shortcut for window 2" |
845 |
msgstr "ðÒÉÓËÏÒÀ×ÁÞ ÄÌÑ ×¦ËÎÁ 2" |
846 |
|
847 |
#: ../../WPrefs.app/KeyboardShortcuts.c:414 |
848 |
msgid "Shortcut for window 3" |
849 |
msgstr "ðÒÉÓËÏÒÀ×ÁÞ ÄÌÑ ×¦ËÎÁ 3" |
850 |
|
851 |
#: ../../WPrefs.app/KeyboardShortcuts.c:415 |
852 |
msgid "Shortcut for window 4" |
853 |
msgstr "ðÒÉÓËÏÒÀ×ÁÞ ÄÌÑ ×¦ËÎÁ 4" |
854 |
|
855 |
#: ../../WPrefs.app/KeyboardShortcuts.c:416 |
856 |
msgid "Shortcut for window 5" |
857 |
msgstr "ðÒÉÓËÏÒÀ×ÁÞ ÄÌÑ ×¦ËÎÁ 5" |
858 |
|
859 |
#: ../../WPrefs.app/KeyboardShortcuts.c:417 |
860 |
msgid "Shortcut for window 6" |
861 |
msgstr "ðÒÉÓËÏÒÀ×ÁÞ ÄÌÑ ×¦ËÎÁ 6" |
862 |
|
863 |
#: ../../WPrefs.app/KeyboardShortcuts.c:418 |
864 |
msgid "Shortcut for window 7" |
865 |
msgstr "ðÒÉÓËÏÒÀ×ÁÞ ÄÌÑ ×¦ËÎÁ 7" |
866 |
|
867 |
#: ../../WPrefs.app/KeyboardShortcuts.c:419 |
868 |
msgid "Shortcut for window 8" |
869 |
msgstr "ðÒÉÓËÏÒÀ×ÁÞ ÄÌÑ ×¦ËÎÁ 8" |
870 |
|
871 |
#: ../../WPrefs.app/KeyboardShortcuts.c:420 |
872 |
msgid "Shortcut for window 9" |
873 |
msgstr "ðÒÉÓËÏÒÀ×ÁÞ ÄÌÑ ×¦ËÎÁ 9" |
874 |
|
875 |
#: ../../WPrefs.app/KeyboardShortcuts.c:421 |
876 |
msgid "Shortcut for window 10" |
877 |
msgstr "ðÒÉÓËÏÒÀ×ÁÞ ÄÌÑ ×¦ËÎÁ 10" |
878 |
|
879 |
#: ../../WPrefs.app/KeyboardShortcuts.c:422 |
880 |
msgid "Switch to Next Screen/Monitor" |
881 |
msgstr "ðÅÒÅÊÔÉ ÎÁ ÎÁÓÔÕÐÎÉÊ ÅËÒÁÎ/ÍÏΦÔÏÒ" |
882 |
|
883 |
#: ../../WPrefs.app/KeyboardShortcuts.c:423 |
884 |
msgid "Raise Clip" |
885 |
msgstr "\"óËÒ¦ÐËÕ\" - ÎÁ×ÅÒÈ" |
886 |
|
887 |
#: ../../WPrefs.app/KeyboardShortcuts.c:424 |
888 |
msgid "Lower Clip" |
889 |
msgstr "\"óËÒ¦ÐËÕ\" - Ð¦Ä ×¦ËÎÁ" |
890 |
|
891 |
#: ../../WPrefs.app/KeyboardShortcuts.c:425 |
892 |
msgid "Raise/Lower Clip" |
893 |
msgstr "\"óËÒ¦ÐËÕ\" - ××ÅÒÈ/×ÎÉÚ" |
894 |
|
895 |
#: ../../WPrefs.app/KeyboardShortcuts.c:427 |
896 |
msgid "Toggle keyboard language" |
897 |
msgstr "ðÅÒÅÍÉËÁÎÎÑ ÍÏ×É ËÌÁצÁÔÕÒÉ" |
898 |
|
899 |
#: ../../WPrefs.app/KeyboardShortcuts.c:441 |
900 |
msgid "Shortcut" |
901 |
msgstr "ðÒÉÓËÏÒÀ×ÁÞ" |
902 |
|
903 |
#: ../../WPrefs.app/KeyboardShortcuts.c:452 ../../WPrefs.app/Menu.c:788 |
904 |
msgid "Clear" |
905 |
msgstr "ïÞÉÓÔÉÔÉ" |
906 |
|
907 |
#: ../../WPrefs.app/KeyboardShortcuts.c:514 |
908 |
msgid "Keyboard Shortcut Preferences" |
909 |
msgstr "ëÌÁצÁÔÕÒΦ ÐÒÉÓËÏÒÀ×ÁÞ¦" |
910 |
|
911 |
#: ../../WPrefs.app/KeyboardShortcuts.c:516 |
912 |
msgid "" |
913 |
"Change the keyboard shortcuts for actions such\n" |
914 |
"as changing workspaces and opening menus." |
915 |
msgstr "" |
916 |
"úͦÎÉÔÉ ËÌÁצÁÔÕÒΦ ÐÒÉÓËÏÒÀ×ÁÞ¦ ÄÌÑ Ä¦Ê\n" |
917 |
"ÔÉÐÕ ÚͦÎÉ ÒÏÂÏÞÉÈ ÓÔÏÌ¦× ¦ צÄËÒÉÔÔÑ ÍÅÎÀ." |
918 |
|
919 |
#: ../../WPrefs.app/Menu.c:477 |
920 |
msgid "New Items" |
921 |
msgstr "îÏצ ÐÕÎËÔÉ" |
922 |
|
923 |
#: ../../WPrefs.app/Menu.c:478 |
924 |
msgid "Sample Commands" |
925 |
msgstr "úÒÁÚËÉ ËÏÍÁÎÄ" |
926 |
|
927 |
#: ../../WPrefs.app/Menu.c:479 |
928 |
msgid "Sample Submenus" |
929 |
msgstr "úÒÁÚËÉ Ð¦ÄÍÅÎÀ" |
930 |
|
931 |
#: ../../WPrefs.app/Menu.c:493 |
932 |
msgid "Run Program" |
933 |
msgstr "úÁÐÕÓË ÐÒÏÇÒÁÍÉ" |
934 |
|
935 |
#: ../../WPrefs.app/Menu.c:494 |
936 |
msgid "Internal Command" |
937 |
msgstr "÷ÎÕÔÒ¦ÛÎÑ ËÏÍÁÎÄÁ" |
938 |
|
939 |
#: ../../WPrefs.app/Menu.c:495 |
940 |
msgid "Submenu" |
941 |
msgstr "ð¦ÄÍÅÎÀ" |
942 |
|
943 |
#: ../../WPrefs.app/Menu.c:496 |
944 |
msgid "External Submenu" |
945 |
msgstr "úÏ×ΦÛΤ ЦÄÍÅÎÀ" |
946 |
|
947 |
#: ../../WPrefs.app/Menu.c:497 |
948 |
msgid "Generated Submenu" |
949 |
msgstr "ðÏÂÕÄÏ×ÁΊЦÄÍÅÎÀ" |
950 |
|
951 |
#: ../../WPrefs.app/Menu.c:498 |
952 |
msgid "Directory Contents" |
953 |
msgstr "÷ͦÓÔ ËÁÔÁÌÏÇÕ" |
954 |
|
955 |
#: ../../WPrefs.app/Menu.c:499 |
956 |
msgid "Workspace Menu" |
957 |
msgstr "íÅÎÀ ÒÏÂÏÞÉÈ ÓÔÏ̦×" |
958 |
|
959 |
#: ../../WPrefs.app/Menu.c:500 ../../WPrefs.app/MouseSettings.c:840 |
960 |
msgid "Window List Menu" |
961 |
msgstr "íÅÎÀ ÓÐÉÓËÕ ×¦ËÏÎ" |
962 |
|
963 |
#: ../../WPrefs.app/Menu.c:519 |
964 |
msgid "XTerm" |
965 |
msgstr "" |
966 |
|
967 |
#: ../../WPrefs.app/Menu.c:522 |
968 |
msgid "rxvt" |
969 |
msgstr "" |
970 |
|
971 |
#: ../../WPrefs.app/Menu.c:525 |
972 |
msgid "ETerm" |
973 |
msgstr "" |
974 |
|
975 |
#: ../../WPrefs.app/Menu.c:528 |
976 |
msgid "Run..." |
977 |
msgstr "" |
978 |
|
979 |
#: ../../WPrefs.app/Menu.c:529 |
980 |
msgid "%a(Run,Type command to run)" |
981 |
msgstr "%a(úÁÐÕÓË,÷×ÅĦÔØ ËÏÍÁÎÄÕ ÄÌÑ ÚÁÐÕÓËÕ)" |
982 |
|
983 |
#: ../../WPrefs.app/Menu.c:531 |
984 |
msgid "Netscape" |
985 |
msgstr "" |
986 |
|
987 |
#: ../../WPrefs.app/Menu.c:534 |
988 |
msgid "gimp" |
989 |
msgstr "" |
990 |
|
991 |
#: ../../WPrefs.app/Menu.c:537 |
992 |
msgid "epic" |
993 |
msgstr "" |
994 |
|
995 |
#: ../../WPrefs.app/Menu.c:540 |
996 |
msgid "ee" |
997 |
msgstr "" |
998 |
|
999 |
#: ../../WPrefs.app/Menu.c:543 |
1000 |
msgid "xv" |
1001 |
msgstr "" |
1002 |
|
1003 |
#: ../../WPrefs.app/Menu.c:546 |
1004 |
msgid "Acrobat Reader" |
1005 |
msgstr "" |
1006 |
|
1007 |
#: ../../WPrefs.app/Menu.c:549 |
1008 |
msgid "ghostview" |
1009 |
msgstr "" |
1010 |
|
1011 |
#: ../../WPrefs.app/Menu.c:552 ../../WPrefs.app/Menu.c:809 |
1012 |
msgid "Exit Window Maker" |
1013 |
msgstr "÷ÉÊÔÉ Ú WindowMaker" |
1014 |
|
1015 |
#: ../../WPrefs.app/Menu.c:575 |
1016 |
msgid "Debian Menu" |
1017 |
msgstr "" |
1018 |
|
1019 |
#: ../../WPrefs.app/Menu.c:578 |
1020 |
msgid "RedHat Menu" |
1021 |
msgstr "" |
1022 |
|
1023 |
#: ../../WPrefs.app/Menu.c:581 |
1024 |
msgid "Menu Conectiva" |
1025 |
msgstr "" |
1026 |
|
1027 |
#: ../../WPrefs.app/Menu.c:584 ../../WPrefs.app/Themes.c:250 |
1028 |
msgid "Themes" |
1029 |
msgstr "" |
1030 |
|
1031 |
#: ../../WPrefs.app/Menu.c:589 |
1032 |
msgid "Bg Images (scale)" |
1033 |
msgstr "" |
1034 |
|
1035 |
#: ../../WPrefs.app/Menu.c:594 |
1036 |
msgid "Bg Images (tile)" |
1037 |
msgstr "" |
1038 |
|
1039 |
#: ../../WPrefs.app/Menu.c:599 |
1040 |
msgid "Assorted XTerms" |
1041 |
msgstr "" |
1042 |
|
1043 |
#: ../../WPrefs.app/Menu.c:601 |
1044 |
msgid "XTerm Yellow on Blue" |
1045 |
msgstr "" |
1046 |
|
1047 |
#: ../../WPrefs.app/Menu.c:604 |
1048 |
msgid "XTerm White on Black" |
1049 |
msgstr "" |
1050 |
|
1051 |
#: ../../WPrefs.app/Menu.c:607 |
1052 |
msgid "XTerm Black on White" |
1053 |
msgstr "" |
1054 |
|
1055 |
#: ../../WPrefs.app/Menu.c:610 |
1056 |
msgid "XTerm Black on Beige" |
1057 |
msgstr "" |
1058 |
|
1059 |
#: ../../WPrefs.app/Menu.c:613 |
1060 |
msgid "XTerm White on Green" |
1061 |
msgstr "" |
1062 |
|
1063 |
#: ../../WPrefs.app/Menu.c:616 |
1064 |
msgid "XTerm White on Olive" |
1065 |
msgstr "" |
1066 |
|
1067 |
#: ../../WPrefs.app/Menu.c:619 |
1068 |
msgid "XTerm Blue on Blue" |
1069 |
msgstr "" |
1070 |
|
1071 |
#: ../../WPrefs.app/Menu.c:622 |
1072 |
msgid "XTerm BIG FONTS" |
1073 |
msgstr "" |
1074 |
|
1075 |
#: ../../WPrefs.app/Menu.c:644 |
1076 |
msgid "Program to Run" |
1077 |
msgstr "úÁÐÕÓËÁ¤ÔÓÑ ÐÒÏÇÒÁÍÁ:" |
1078 |
|
1079 |
#: ../../WPrefs.app/Menu.c:658 |
1080 |
msgid "Run the program inside a Xterm" |
1081 |
msgstr "" |
1082 |
|
1083 |
#: ../../WPrefs.app/Menu.c:668 |
1084 |
msgid "Path for Menu" |
1085 |
msgstr "ûÌÑÈ ÄÌÑ ÍÅÎÀ" |
1086 |
|
1087 |
#: ../../WPrefs.app/Menu.c:681 |
1088 |
msgid "" |
1089 |
"Enter the path for a file containing a menu\n" |
1090 |
"or a list of directories with the programs you\n" |
1091 |
"want to have listed in the menu. Ex:\n" |
1092 |
"~/GNUstep/Library/WindowMaker/menu\n" |
1093 |
"or\n" |
1094 |
"/usr/X11R6/bin ~/xbin" |
1095 |
msgstr "" |
1096 |
"÷×ÅĦÔØ ÛÌÑÈ ÄÏ ÆÁÊÌÕ ÍÅÎÀ ÞÉ ÓÐÉÓÏË ËÁÔÁÌÏÇ¦× Ú\n" |
1097 |
"ÐÒÏÇÒÁÍÁÍÉ, Ñ˦ ÷É ÈÏÞÅÔÅ ÂÁÞÉÔÉ × ÍÅÎÀ. îÁÐÒÉËÌÁÄ:\n" |
1098 |
"~/GNUstep/Library/WindowMaker/menu\n" |
1099 |
"ÞÉ\n" |
1100 |
"/usr/X11R6/bin ~/xbin" |
1101 |
|
1102 |
#: ../../WPrefs.app/Menu.c:696 |
1103 |
msgid "Command" |
1104 |
msgstr "ëÏÍÁÎÄÁ" |
1105 |
|
1106 |
#: ../../WPrefs.app/Menu.c:710 |
1107 |
msgid "" |
1108 |
"Enter a command that outputs a menu\n" |
1109 |
"definition to stdout when invoked." |
1110 |
msgstr "" |
1111 |
"÷×ÅĦÔØ ËÏÍÁÎÄÕ, ÑËÁ ÐÒÉ ÚÁÐÕÓËÕ ×ÉÄÁ¤\n" |
1112 |
"×ÉÚÎÁÞÅÎÎÑ ÍÅÎÀ × stdout." |
1113 |
|
1114 |
#: ../../WPrefs.app/Menu.c:721 |
1115 |
msgid "Command to Open Files" |
1116 |
msgstr "÷¦ÄËÒÉ×ÁÔÉ ÆÁÊÌÉ ÐÒÏÇÒÁÍÏÀ" |
1117 |
|
1118 |
#: ../../WPrefs.app/Menu.c:735 |
1119 |
msgid "" |
1120 |
"Enter the command you want to use to open the\n" |
1121 |
"files in the directories listed below." |
1122 |
msgstr "" |
1123 |
"÷×ÅĦÔØ ËÏÍÁÎÄÕ, ÑËÏÀ ÷É ÈÏÞÅÔŠצÄËÒÉ×ÁÔÉ ÆÁÊÌÉ\n" |
1124 |
"× ËÁÔÁÌÏÇÁÈ ×ËÁÚÁÎÉÈ ÎÉÖÞÅ." |
1125 |
|
1126 |
#: ../../WPrefs.app/Menu.c:744 |
1127 |
msgid "Directories with Files" |
1128 |
msgstr "ëÁÔÁÌÏÇÉ Ú ÆÁÊÌÁÍÉ" |
1129 |
|
1130 |
#: ../../WPrefs.app/Menu.c:757 |
1131 |
msgid "Strip extensions from file names" |
1132 |
msgstr "÷ÉÄÁÌÑÔÉ ÒÏÚÛÉÒÅÎÎÑ ¦ÍÅÎ ÆÁÊ̦×" |
1133 |
|
1134 |
#: ../../WPrefs.app/Menu.c:769 |
1135 |
msgid "Keyboard Shortcut" |
1136 |
msgstr "ëÌÁצÁÔÕÒÎÉÊ ÐÒÉÓËÏÒÀ×ÁÞ" |
1137 |
|
1138 |
#: ../../WPrefs.app/Menu.c:805 |
1139 |
msgid "Arrange Icons" |
1140 |
msgstr "÷ÉÒ¦×ÎÑÔÉ ¦ËÏÎËÉ" |
1141 |
|
1142 |
#: ../../WPrefs.app/Menu.c:806 |
1143 |
msgid "Hide All Windows Except For The Focused One" |
1144 |
msgstr "ðÒÉÈÏ×ÁÔÉ ×Ó¦ צËÎÁ ÚÁ ×ÉËÌÀÞÅÎÎÑÍ ÚÆÏËÕÓÏ×ÁÎÏÇÏ" |
1145 |
|
1146 |
#: ../../WPrefs.app/Menu.c:807 |
1147 |
msgid "Show All Windows" |
1148 |
msgstr "ðÏËÁÚÁÔÉ ×Ó¦ צËÎÁ" |
1149 |
|
1150 |
#: ../../WPrefs.app/Menu.c:810 |
1151 |
msgid "Exit X Session" |
1152 |
msgstr "úÁ×ÅÒÛÉÔÉ X ÓÅÁÎÓ" |
1153 |
|
1154 |
#: ../../WPrefs.app/Menu.c:811 |
1155 |
msgid "Restart Window Maker" |
1156 |
msgstr "ðÅÒÅÚÁÐÕÓÔÉÔÉ WindowMaker" |
1157 |
|
1158 |
#: ../../WPrefs.app/Menu.c:812 |
1159 |
msgid "Start Another Window Manager : (" |
1160 |
msgstr "úÁÐÕÓÔÉÔÉ ¦ÎÛÉÊ ÍÅÎÅÄÖÅÒ ×¦ËÏÎ : (" |
1161 |
|
1162 |
#: ../../WPrefs.app/Menu.c:814 |
1163 |
msgid "Save Current Session" |
1164 |
msgstr "úÂÅÒÅÇÔÉ ÐÏÔÏÞÎÉÊ ÓÅÁÎÓ" |
1165 |
|
1166 |
#: ../../WPrefs.app/Menu.c:815 |
1167 |
msgid "Clear Saved Session" |
1168 |
msgstr "ïÞÉÓÔÉÔÉ ÚÂÅÒÅÖÅÎÉÊ ÓÅÁÎÓ" |
1169 |
|
1170 |
#: ../../WPrefs.app/Menu.c:816 |
1171 |
msgid "Refresh Screen" |
1172 |
msgstr "ïÎÏ×ÉÔÉ ÅËÒÁÎ" |
1173 |
|
1174 |
#: ../../WPrefs.app/Menu.c:817 |
1175 |
msgid "Open Info Panel" |
1176 |
msgstr "÷¦ÄËÒÉÔÉ ÐÁÎÅÌØ ¶ÎÆÏÒÍÁæÑ" |
1177 |
|
1178 |
#: ../../WPrefs.app/Menu.c:818 |
1179 |
msgid "Open Copyright Panel" |
1180 |
msgstr "÷¦ÄËÒÉÔÉ ÐÁÎÅÌØ Copyright" |
1181 |
|
1182 |
#: ../../WPrefs.app/Menu.c:824 |
1183 |
msgid "Window Manager to Start" |
1184 |
msgstr "úÁÐÕÓËÁÔÉ ÍÅÎÅÄÖÅÒ ×¦ËÏÎ:" |
1185 |
|
1186 |
#: ../../WPrefs.app/Menu.c:840 |
1187 |
msgid "Do not confirm action." |
1188 |
msgstr "âÅÚ Ð¦ÄÔ×ÅÒÄÖÅÎÎÑ." |
1189 |
|
1190 |
#: ../../WPrefs.app/Menu.c:850 |
1191 |
msgid "" |
1192 |
"Instructions:\n" |
1193 |
"\n" |
1194 |
" - drag items from the left to the menu to add new items\n" |
1195 |
" - drag items out of the menu to remove items\n" |
1196 |
" - drag items in menu to change their position\n" |
1197 |
" - drag items with Control pressed to copy them\n" |
1198 |
" - double click in a menu item to change the label\n" |
1199 |
" - click on a menu item to change related information" |
1200 |
msgstr "" |
1201 |
"¶ÎÓÔÒÕËæ§:\n" |
1202 |
"\n" |
1203 |
" - ÄÏÄÁÔÉ ÎÏצ ÐÕÎËÔÉ - ÔÑÇΦÔØ §È Ú ÔÅËÓÔÕ Ì¦×ÏÒÕÞ ÄÏ ÍÅÎÀ\n" |
1204 |
" - ×ÉÔÑÇÎÅÎÎÑ ÐÕÎËÔ¦× Ú ÍÅÎÀ - ×ÉÄÁÌѤ æ ÐÕÎËÔÉ\n" |
1205 |
" - ÐÅÒÅͦÝÅÎÎÑ ÍÉÛÏÀ ÐÕÎËÔ¦× × ÍÅÎÀ - ÚͦÎÀ¤ §È ÐÏÚÉæÀ\n" |
1206 |
" - ÐÅÒÅͦÝÅÎÎÑ Ú ÎÁÔÉÓÎÕÔÏÀ Control - ÓÔ×ÏÒÀ¤ §È ËÏЦÀ\n" |
1207 |
" - ÐÏÄצÊÎÉÊ ËÌ¦Ë ÎÁ ÐÕÎËÔ¦ ÍÅÎÀ - ÚͦÎÉÔÉ ÊÏÇÏ ÎÁÚ×Õ\n" |
1208 |
" - ÏÄÉÎÏÞÎÉÊ ËÌ¦Ë - ÚͦÎÉÔÉ ÐÏ×'ÑÚÁΦ Ú ÃÉÍ ÐÕÎËÔÏÍ Ä¦§" |
1209 |
|
1210 |
#: ../../WPrefs.app/Menu.c:1068 |
1211 |
#, c-format |
1212 |
msgid "unknown command '%s' in menu" |
1213 |
msgstr "ÎÅצÄÏÍÁ ËÏÍÁÎÄÁ '%s' × ÍÅÎÀ" |
1214 |
|
1215 |
#: ../../WPrefs.app/Menu.c:1100 |
1216 |
msgid ": Execute Program" |
1217 |
msgstr ": úÁÐÕÓË ÐÒÏÇÒÁÍÉ" |
1218 |
|
1219 |
#: ../../WPrefs.app/Menu.c:1104 |
1220 |
msgid ": Perform Internal Command" |
1221 |
msgstr ": ÷ÉËÏÎÁÎÎÑ ×ÎÕÔÒ¦ÛÎØϧ ËÏÍÁÎÄÉ" |
1222 |
|
1223 |
#: ../../WPrefs.app/Menu.c:1108 |
1224 |
msgid ": Open a Submenu" |
1225 |
msgstr ": îÏ׊ЦÄÍÅÎÀ" |
1226 |
|
1227 |
#: ../../WPrefs.app/Menu.c:1112 |
1228 |
msgid ": Program Generated Submenu" |
1229 |
msgstr ": ðÒÏÇÒÁÍÎÏ ÐÏÂÕÄÏ×ÁΊЦÄÍÅÎÀ" |
1230 |
|
1231 |
#: ../../WPrefs.app/Menu.c:1116 |
1232 |
msgid ": Directory Contents Menu" |
1233 |
msgstr ": íÅÎÀ ×ͦÓÔÕ ËÁÔÁÌÏÇÁ" |
1234 |
|
1235 |
#: ../../WPrefs.app/Menu.c:1120 |
1236 |
msgid ": Open Workspaces Submenu" |
1237 |
msgstr ": ÷¦ÄËÒÉ×Á¤ ЦÄÍÅÎÀ ÒÏÂÏÞÉÈ ÓÔÏ̦×" |
1238 |
|
1239 |
#: ../../WPrefs.app/Menu.c:1124 |
1240 |
msgid ": Open Window List Submenu" |
1241 |
msgstr ": ÷¦ÄËÒÉ×Á¤ ЦÄÍÅÎÀ ÓÐÉÓËÕ ×¦ËÏÎ" |
1242 |
|
1243 |
#: ../../WPrefs.app/Menu.c:1344 |
1244 |
msgid "Remove Submenu" |
1245 |
msgstr "÷ÉÄÁÌÉÔÉ Ð¦ÄÍÅÎÀ" |
1246 |
|
1247 |
#: ../../WPrefs.app/Menu.c:1345 |
1248 |
msgid "" |
1249 |
"Removing this item will destroy all items inside\n" |
1250 |
"the submenu. Do you really want to do that?" |
1251 |
msgstr "" |
1252 |
"÷ÉÄÁÌÅÎÎÑ ÃØÏÇÏ ÐÕÎËÔÕ ÚÎÉÝÉÔØ ×Ó¦ ÐÕÎËÔÉ ×ÓÅÒÅÄÉΦ\n" |
1253 |
"ЦÄÍÅÎÀ. ÷É Ä¦ÊÓÎÏ ÃØÏÇÏ ÈÏÞÅÔÅ?" |
1254 |
|
1255 |
#: ../../WPrefs.app/Menu.c:1347 |
1256 |
msgid "Yes" |
1257 |
msgstr "ôÁË" |
1258 |
|
1259 |
#: ../../WPrefs.app/Menu.c:1347 |
1260 |
msgid "No" |
1261 |
msgstr "î¦" |
1262 |
|
1263 |
#: ../../WPrefs.app/Menu.c:1348 |
1264 |
msgid "Yes, don't ask again." |
1265 |
msgstr "ôÁË - ÚÁÒÁÚ ¦ ÎÁÄÁ̦." |
1266 |
|
1267 |
#. if there is a localized plmenu for the tongue put it's filename here |
1268 |
#: ../../WPrefs.app/Menu.c:1515 ../../WPrefs.app/Menu.c:1522 |
1269 |
#, c-format |
1270 |
msgid "%s/Library/WindowMaker/plmenu" |
1271 |
msgstr "%s/Library/WindowMaker/plmenu.uk" |
1272 |
|
1273 |
#: ../../WPrefs.app/Menu.c:1531 |
1274 |
#, c-format |
1275 |
msgid "Could not open default menu from '%s'" |
1276 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ×¦ÄËÒÉÔÉ ÓÔÁÎÄÁÒÔÎÅ ÍÅÎÀ '%s'" |
1277 |
|
1278 |
#: ../../WPrefs.app/Menu.c:1569 ../../WPrefs.app/WPrefs.c:807 |
1279 |
msgid "Warning" |
1280 |
msgstr "ðÏÐÅÒÅÄÖÅÎÎÑ" |
1281 |
|
1282 |
#: ../../WPrefs.app/Menu.c:1570 |
1283 |
msgid "" |
1284 |
"The menu file format currently in use is not supported\n" |
1285 |
"by this tool. Do you want to discard the current menu\n" |
1286 |
"to use this tool?" |
1287 |
msgstr "" |
1288 |
"The menu file format currently in use is not supported\n" |
1289 |
"by this tool. Do you want to discard the current menu\n" |
1290 |
"to use this tool?" |
1291 |
|
1292 |
#: ../../WPrefs.app/Menu.c:1573 |
1293 |
msgid "Yes, Discard and Update" |
1294 |
msgstr "" |
1295 |
|
1296 |
#: ../../WPrefs.app/Menu.c:1574 |
1297 |
msgid "No, Keep Current Menu" |
1298 |
msgstr "î¦, ÚÁÌÉÛÉÔÉ ÐÏÔÏÞÎÅ ÍÅÎÀ" |
1299 |
|
1300 |
#: ../../WPrefs.app/Menu.c:1834 |
1301 |
msgid "Applications Menu Definition" |
1302 |
msgstr "÷ÉÚÎÁÞÅÎÎÑ ÍÅÎÀ ÐÒÏÇÒÁÍ" |
1303 |
|
1304 |
#: ../../WPrefs.app/Menu.c:1836 |
1305 |
msgid "Edit the menu for launching applications." |
1306 |
msgstr "òÅÄÁÇÕ×ÁÎÎÑ ÍÅÎÀ ÚÁÐÕÓËÕ ÐÒÏÇÒÁÍ." |
1307 |
|
1308 |
#: ../../WPrefs.app/MenuPreferences.c:111 |
1309 |
msgid "Menu Scrolling Speed" |
1310 |
msgstr "û×ÉÄ˦ÓÔØ ÐÒÏËÒÕÔËÉ ÍÅÎÀ" |
1311 |
|
1312 |
#: ../../WPrefs.app/MenuPreferences.c:160 |
1313 |
msgid "Submenu Alignment" |
1314 |
msgstr "÷ÉÒ¦×ÎÀ×ÁÎÎÑ Ð¦ÄÍÅÎÀ" |
1315 |
|
1316 |
#: ../../WPrefs.app/MenuPreferences.c:204 |
1317 |
msgid "" |
1318 |
"Always open submenus inside the screen, instead of scrolling.\n" |
1319 |
"Note: this is annoying." |
1320 |
msgstr "" |
1321 |
"úÁ×ÖÄÉ ×¦ÄËÒÉ×ÁÔÉ Ð¦ÄÍÅÎÀ ×ÓÅÒÅÄÉΦ ÅËÒÁÎÕ, ÚÁͦÓÔØ ÐÒÏËÒÕÔËÉ.\n" |
1322 |
"úÁÕ×ÁÖÅÎÎÑ: × ÄÅÑËÉÈ ×ÉÐÁÄËÁÈ ÃÅ ÍÏÖÅ ÄÒÁÔÕ×ÁÔÉ." |
1323 |
|
1324 |
#: ../../WPrefs.app/MenuPreferences.c:209 |
1325 |
msgid "Scroll off-screen menus when pointer is moved over them." |
1326 |
msgstr "ðÏËÁÚÕ×ÁÔÉ ÓÈÏ×ÁΦ ÚÁ ÅËÒÁÎÏÍ ÍÅÎÀ, ËÏÌÉ ÕËÁÚËÁ ÍÉÛ¦ ÎÁÄ ÎÉÍÉ." |
1327 |
|
1328 |
#: ../../WPrefs.app/MenuPreferences.c:229 |
1329 |
msgid "Menu Preferences" |
1330 |
msgstr "ðÁÒÁÍÅÔÒÉ ÍÅÎÀ" |
1331 |
|
1332 |
#: ../../WPrefs.app/MenuPreferences.c:231 |
1333 |
msgid "" |
1334 |
"Menu usability related options. Scrolling speed,\n" |
1335 |
"alignment of submenus etc." |
1336 |
msgstr "" |
1337 |
"ïÐæ§, ÝÏ ÓÔÏÓÕÀÔØÓÑ ÍÅÎÀ. ý×ÉÄ˦ÓÔØ ÐÒÏËÒÕÔËÉ,\n" |
1338 |
"×ÉÒ¦×ÎÀ×ÁÎÎÑ Ð¦ÄÍÅÎÀ ¦ ÔÏÍÕ ÐÏĦÂÎÅ." |
1339 |
|
1340 |
#: ../../WPrefs.app/MouseSettings.c:141 |
1341 |
msgid "Invalid mouse acceleration value. Must be a positive real value." |
1342 |
msgstr "îÅÐÒÁ×ÉÌØÎÅ ÚÎÁÞÅÎÎÑ. íÁ¤ ÂÕÔÉ ÄÏÄÁÔÎ¦Í ÞÉÓÌÏÍ." |
1343 |
|
1344 |
#: ../../WPrefs.app/MouseSettings.c:161 |
1345 |
msgid "" |
1346 |
"Invalid mouse acceleration threshold value. Must be the number of pixels to " |
1347 |
"travel before accelerating." |
1348 |
msgstr "" |
1349 |
"îÅÐÒÁ×ÉÌØÎÅ ÚÎÁÞÅÎÎÑ. íÁ¤ ÂÕÔÉ ÞÉÓÌÏÍ ÐÒÏÊÄÅÎÉÈ Ð¦ËÓÅÌ¦× ÄÏ ÐÏÞÁÔËÕ " |
1350 |
"ÐÒÉÓËÏÒÅÎÎÑ." |
1351 |
|
1352 |
#: ../../WPrefs.app/MouseSettings.c:262 ../../WPrefs.app/MouseSettings.c:274 |
1353 |
#: ../../WPrefs.app/MouseSettings.c:286 ../../WPrefs.app/MouseSettings.c:298 |
1354 |
#, c-format |
1355 |
msgid "bad value %s for option %s" |
1356 |
msgstr "ÎÅÐÒÁ×ÉÌØÎÅ ÚÎÁÞÅÎÎÑ %s ÄÌÑ %s" |
1357 |
|
1358 |
#: ../../WPrefs.app/MouseSettings.c:357 |
1359 |
#, c-format |
1360 |
msgid "" |
1361 |
"modifier key %s for option ModifierKey was not recognized. Using %s as " |
1362 |
"default" |
1363 |
msgstr "ÍÏÄÉƦËÁÔÏÒ %s ÄÌÑ ÏÐæ§ ModifierKey ÎÅÒÏÚЦÚÎÁÎÉÊ. úÁ ÕÍÏ×ÞÁÎÎÑÍ - %s" |
1364 |
|
1365 |
#: ../../WPrefs.app/MouseSettings.c:382 |
1366 |
msgid "could not retrieve keyboard modifier mapping" |
1367 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÄÏÂÕÔÉ ËÁÒÔÕ ÍÏÄÉƦËÁÔÏÒ¦×" |
1368 |
|
1369 |
#: ../../WPrefs.app/MouseSettings.c:477 |
1370 |
msgid "Mouse Speed" |
1371 |
msgstr "û×ÉÄ˦ÓÔØ ÍÉÛ¦" |
1372 |
|
1373 |
#: ../../WPrefs.app/MouseSettings.c:507 |
1374 |
msgid "Acceler.:" |
1375 |
msgstr "ðÒÉÓËÏÒ.:" |
1376 |
|
1377 |
#: ../../WPrefs.app/MouseSettings.c:520 |
1378 |
msgid "Threshold:" |
1379 |
msgstr "ðÏÒ¦Ç:" |
1380 |
|
1381 |
#: ../../WPrefs.app/MouseSettings.c:535 |
1382 |
msgid "Double-Click Delay" |
1383 |
msgstr "ôÁÊÍÁÕÔ ÐÏÄצÊÎÏÇÏ Ë̦ËÕ" |
1384 |
|
1385 |
#: ../../WPrefs.app/MouseSettings.c:579 |
1386 |
msgid "Test" |
1387 |
msgstr "ôÅÓÔ" |
1388 |
|
1389 |
#: ../../WPrefs.app/MouseSettings.c:609 |
1390 |
msgid "Workspace Mouse Actions" |
1391 |
msgstr "䦧 ÍÉÛ¦ ÎÁ ÄÅÓËÔÏЦ" |
1392 |
|
1393 |
#: ../../WPrefs.app/MouseSettings.c:614 |
1394 |
msgid "Disable mouse actions" |
1395 |
msgstr "÷¦ÄͦÎÉÔÉ Ä¦§ ÍÉÛ¦" |
1396 |
|
1397 |
#: ../../WPrefs.app/MouseSettings.c:620 |
1398 |
msgid "Left Button" |
1399 |
msgstr "ì¦×Á ËÎÏÐËÁ" |
1400 |
|
1401 |
#: ../../WPrefs.app/MouseSettings.c:630 |
1402 |
msgid "Middle Button" |
1403 |
msgstr "óÅÒÅÄÎÑ ËÎÏÐËÁ" |
1404 |
|
1405 |
#: ../../WPrefs.app/MouseSettings.c:640 |
1406 |
msgid "Right Button" |
1407 |
msgstr "ðÒÁ×Á ËÎÏÐËÁ" |
1408 |
|
1409 |
#: ../../WPrefs.app/MouseSettings.c:650 |
1410 |
msgid "Mouse Wheel" |
1411 |
msgstr "ëÏ̦ÝÁÔËÏ" |
1412 |
|
1413 |
#: ../../WPrefs.app/MouseSettings.c:672 |
1414 |
msgid "Mouse Grab Modifier" |
1415 |
msgstr "íÏÄÉƦËÁÔÏÒ ÚÁÈ×ÁÔÕ ÍÉÛ¦" |
1416 |
|
1417 |
#: ../../WPrefs.app/MouseSettings.c:674 |
1418 |
msgid "" |
1419 |
"Keyboard modifier to use for actions that\n" |
1420 |
"involve dragging windows with the mouse,\n" |
1421 |
"clicking inside the window." |
1422 |
msgstr "" |
1423 |
"íÏÄÉƦËÁÔÏÒ ÄÌÑ ×ÉËÏÒÉÓÔÁÎÎÑ Ú Ä¦ÑÍÉ,\n" |
1424 |
"ÝÏ ×ËÌÀÞÁÀÔØ ÂÕËÓÕ×ÁÎÎÑ ×¦ËÏÎ ÍÉÛÏÀ,\n" |
1425 |
"Ë̦ËÉ ÍÉÛ¦ ×ÓÅÒÅÄÉΦ צËÎÁ." |
1426 |
|
1427 |
#: ../../WPrefs.app/MouseSettings.c:708 |
1428 |
#, c-format |
1429 |
msgid "could not create %s" |
1430 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÓÔ×ÏÒÉÔÉ %s" |
1431 |
|
1432 |
#: ../../WPrefs.app/MouseSettings.c:724 |
1433 |
#, c-format |
1434 |
msgid "could not create temporary file %s" |
1435 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ %s" |
1436 |
|
1437 |
#: ../../WPrefs.app/MouseSettings.c:756 |
1438 |
#, c-format |
1439 |
msgid "could not rename file %s to %s\n" |
1440 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÐÅÒÅÊÍÅÎÕ×ÁÔÉ %s × %s\n" |
1441 |
|
1442 |
#: ../../WPrefs.app/MouseSettings.c:829 |
1443 |
msgid "Shift" |
1444 |
msgstr "" |
1445 |
|
1446 |
#: ../../WPrefs.app/MouseSettings.c:830 |
1447 |
msgid "Lock" |
1448 |
msgstr "" |
1449 |
|
1450 |
#: ../../WPrefs.app/MouseSettings.c:831 |
1451 |
msgid "Control" |
1452 |
msgstr "" |
1453 |
|
1454 |
#: ../../WPrefs.app/MouseSettings.c:832 |
1455 |
msgid "Mod1" |
1456 |
msgstr "" |
1457 |
|
1458 |
#: ../../WPrefs.app/MouseSettings.c:833 |
1459 |
msgid "Mod2" |
1460 |
msgstr "" |
1461 |
|
1462 |
#: ../../WPrefs.app/MouseSettings.c:834 |
1463 |
msgid "Mod3" |
1464 |
msgstr "" |
1465 |
|
1466 |
#: ../../WPrefs.app/MouseSettings.c:835 |
1467 |
msgid "Mod4" |
1468 |
msgstr "" |
1469 |
|
1470 |
#: ../../WPrefs.app/MouseSettings.c:836 |
1471 |
msgid "Mod5" |
1472 |
msgstr "" |
1473 |
|
1474 |
#: ../../WPrefs.app/MouseSettings.c:839 |
1475 |
msgid "Applications Menu" |
1476 |
msgstr "íÅÎÀ ÐÒÏÇÒÁÍ" |
1477 |
|
1478 |
#: ../../WPrefs.app/MouseSettings.c:841 |
1479 |
msgid "Select Windows" |
1480 |
msgstr "÷ÉÂ¦Ò ×¦ËÏÎ" |
1481 |
|
1482 |
#: ../../WPrefs.app/MouseSettings.c:844 |
1483 |
msgid "Switch Workspaces" |
1484 |
msgstr "ðÅÒÅÈ¦Ä Í¦Ö ÓÔÏÌÁÍÉ" |
1485 |
|
1486 |
#: ../../WPrefs.app/MouseSettings.c:849 |
1487 |
msgid "Mouse Preferences" |
1488 |
msgstr "îÁÓÔÒÏÊËÉ ×ÐÏÄÏÂÁÎØ ÄÌÑ ÍÉÛ¦" |
1489 |
|
1490 |
#: ../../WPrefs.app/MouseSettings.c:851 |
1491 |
msgid "" |
1492 |
"Mouse speed/acceleration, double click delay,\n" |
1493 |
"mouse button bindings etc." |
1494 |
msgstr "" |
1495 |
"û×ÉÄ˦ÓÔØ/ÐÒÉÓËÏÒÅÎÎÑ ÍÉÛ¦, ÔÁÊÍÁÕÔ ÐÏÄצÊÎÏÇÏ Ë̦ËÕ,\n" |
1496 |
"ÐÒÉ×'ÑÚËÉ ËÎÏÐÏË ÍÉÛ¦ ¦ Ô.Ð." |
1497 |
|
1498 |
#: ../../WPrefs.app/Paths.c:84 |
1499 |
msgid "bad value in option IconPath. Using default path list" |
1500 |
msgstr "ÎÅÐÒÁ×ÉÌØÎÅ ÚÎÁÞÅÎÎÑ × IconPath. ÷ÉËÏÒÉÓÔÏ×Õ¤ÍÏ ÛÌÑÈÉ ÚÁ ÕÍÏ×ÞÁÎÎÑÍ" |
1501 |
|
1502 |
#: ../../WPrefs.app/Paths.c:101 |
1503 |
msgid "bad value in option PixmapPath. Using default path list" |
1504 |
msgstr "ÎÅÐÒÁ×ÉÌØÎÅ ÚÎÁÞÅÎÎÑ × PixmapPath. ÷ÉËÏÒÉÓÔÏ×Õ¤ÍÏ ÛÌÑÈÉ ÚÁ ÕÍÏ×ÞÁÎÎÑÍ" |
1505 |
|
1506 |
#: ../../WPrefs.app/Paths.c:149 |
1507 |
msgid "Select directory" |
1508 |
msgstr "÷ËÁÖ¦ÔØ ËÁÔÁÌÏÇ" |
1509 |
|
1510 |
#: ../../WPrefs.app/Paths.c:270 |
1511 |
msgid "Icon Search Paths" |
1512 |
msgstr "ûÌÑÈÉ ÐÏÛÕËÕ ¦ËÏÎÏË" |
1513 |
|
1514 |
#: ../../WPrefs.app/Paths.c:281 ../../WPrefs.app/Paths.c:312 |
1515 |
#: ../../WPrefs.app/TexturePanel.c:1310 |
1516 |
msgid "Add" |
1517 |
msgstr "äÏÄÁÔÉ" |
1518 |
|
1519 |
#: ../../WPrefs.app/Paths.c:301 |
1520 |
msgid "Pixmap Search Paths" |
1521 |
msgstr "ûÌÑÈÉ ÐÏÛÕËÕ Ð¦ËÔÏÇÒÁÍ" |
1522 |
|
1523 |
#: ../../WPrefs.app/Paths.c:341 |
1524 |
msgid "Search Path Configuration" |
1525 |
msgstr "ëÏÎƦÇÕÒÁÃ¦Ñ ÛÌÑÈ¦× ÐÏÛÕËÕ" |
1526 |
|
1527 |
#: ../../WPrefs.app/Paths.c:343 |
1528 |
msgid "" |
1529 |
"Search paths to use when looking for pixmaps\n" |
1530 |
"and icons." |
1531 |
msgstr "ûÌÑÈÉ ÐÏÛÕËÕ ÄÌÑ Ð¦ËÔÏÇÒÁÍ ÔÁ ¦ËÏÎÏË." |
1532 |
|
1533 |
#: ../../WPrefs.app/Preferences.c:75 |
1534 |
msgid "OFF" |
1535 |
msgstr "" |
1536 |
|
1537 |
#: ../../WPrefs.app/Preferences.c:77 |
1538 |
msgid "1 pixel" |
1539 |
msgstr "1 ЦËÓÅÌ" |
1540 |
|
1541 |
#. 2-4 |
1542 |
#: ../../WPrefs.app/Preferences.c:80 |
1543 |
#, c-format |
1544 |
msgid "%i pixels" |
1545 |
msgstr "%i ЦËÓÅÌÉ" |
1546 |
|
1547 |
#. >4 |
1548 |
#: ../../WPrefs.app/Preferences.c:83 |
1549 |
#, c-format |
1550 |
msgid "%i pixels " |
1551 |
msgstr "%i ЦËÓÅÌ¦× " |
1552 |
|
1553 |
#: ../../WPrefs.app/Preferences.c:229 |
1554 |
msgid "Size Display" |
1555 |
msgstr "ðÏËÁÚ ÒÏÚͦÒÕ" |
1556 |
|
1557 |
#: ../../WPrefs.app/Preferences.c:231 |
1558 |
msgid "" |
1559 |
"The position or style of the window size\n" |
1560 |
"display that's shown when a window is resized." |
1561 |
msgstr "" |
1562 |
"ðÏÚÉÃ¦Ñ ÞÉ ÓÔÉÌØ ÐÏËÁÚÕ ÒÏÚͦÒÕ ×¦ËÎÁ\n" |
1563 |
"× ÐÒÏÃÅÓ¦ ÚͦÎÉ ÊÏÇÏ ÒÏÚͦÒÕ." |
1564 |
|
1565 |
#: ../../WPrefs.app/Preferences.c:238 ../../WPrefs.app/Preferences.c:259 |
1566 |
msgid "Corner of screen" |
1567 |
msgstr "ëÕÔ ÅËÒÁÎÕ" |
1568 |
|
1569 |
#: ../../WPrefs.app/Preferences.c:239 ../../WPrefs.app/Preferences.c:260 |
1570 |
msgid "Center of screen" |
1571 |
msgstr "ãÅÎÔÒ ÅËÒÁÎÕ" |
1572 |
|
1573 |
#: ../../WPrefs.app/Preferences.c:240 ../../WPrefs.app/Preferences.c:261 |
1574 |
msgid "Center of resized window" |
1575 |
msgstr "ãÅÎÔÒ ×¦ËÎÁ" |
1576 |
|
1577 |
#: ../../WPrefs.app/Preferences.c:241 |
1578 |
msgid "Technical drawing-like" |
1579 |
msgstr "ñË ÎÁ ËÒÅÓÌÅÎÎÑÈ" |
1580 |
|
1581 |
#: ../../WPrefs.app/Preferences.c:242 ../../WPrefs.app/Preferences.c:262 |
1582 |
msgid "Disabled" |
1583 |
msgstr "îÅ ÐÏËÁÚÕ×ÁÔÉ" |
1584 |
|
1585 |
#: ../../WPrefs.app/Preferences.c:250 |
1586 |
msgid "Position Display" |
1587 |
msgstr "ðÏËÁÚ ÐÏÚÉæ§" |
1588 |
|
1589 |
#: ../../WPrefs.app/Preferences.c:252 |
1590 |
msgid "" |
1591 |
"The position or style of the window position\n" |
1592 |
"display that's shown when a window is moved." |
1593 |
msgstr "" |
1594 |
"ðÏÚÉÃ¦Ñ ÞÉ ÓÔÉÌØ ÐÏËÁÚÕ ÐÏÚÉæ§ צËÎÁ\n" |
1595 |
"× ÐÒÏÃÅÓ¦ ÊÏÇÏ ÐÅÒÅͦÝÅÎÎÑ." |
1596 |
|
1597 |
#: ../../WPrefs.app/Preferences.c:270 |
1598 |
msgid "Show balloon text for..." |
1599 |
msgstr "ðÏËÁÚÕ×ÁÔÉ Ð¦ÄËÁÚËÕ ÄÌÑ..." |
1600 |
|
1601 |
#: ../../WPrefs.app/Preferences.c:277 |
1602 |
msgid "incomplete window titles" |
1603 |
msgstr "ÎÅÐÏ×ÎÉÈ ÚÁÇÏÌÏ×Ë¦× ×¦ËÏÎ" |
1604 |
|
1605 |
#: ../../WPrefs.app/Preferences.c:278 |
1606 |
msgid "miniwindow titles" |
1607 |
msgstr "ÚÁÇÏÌÏ×Ë¦× Í¦Î¦×¦ËÏÎ" |
1608 |
|
1609 |
#: ../../WPrefs.app/Preferences.c:279 |
1610 |
msgid "application/dock icons" |
1611 |
msgstr "¦ËÏÎÏË ÐÒÏÇÒÁÍ/äÏËÕ" |
1612 |
|
1613 |
#: ../../WPrefs.app/Preferences.c:280 |
1614 |
msgid "internal help" |
1615 |
msgstr "×ÎÕÔÒ¦ÛÎØϧ ÄÏÐÏÍÏÇÉ" |
1616 |
|
1617 |
#: ../../WPrefs.app/Preferences.c:292 |
1618 |
msgid "" |
1619 |
"Raise window when switching\n" |
1620 |
"focus with keyboard." |
1621 |
msgstr "" |
1622 |
"÷¦ËÎÏ ÎÁ×ÅÒÈ ÐÒÉ ÐÅÒÅÍÉËÁÎΦ\n" |
1623 |
"ÆÏËÕÓÕ Ú ËÌÁצÁÔÕÒÉ." |
1624 |
|
1625 |
#: ../../WPrefs.app/Preferences.c:298 |
1626 |
msgid "" |
1627 |
"Enable keyboard language\n" |
1628 |
"switch button in window titlebars." |
1629 |
msgstr "" |
1630 |
"ëÎÏÐËÁ ÐÅÒÅÍÉËÁÎÎÑ ÍÏ×É\n" |
1631 |
"ËÌÁצÁÔÕÒÉ × ÛÁÐËÁÈ ×¦ËÏÎ." |
1632 |
|
1633 |
#: ../../WPrefs.app/Preferences.c:307 |
1634 |
msgid "Workspace border" |
1635 |
msgstr "âÏÒÄÀÒ ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ" |
1636 |
|
1637 |
#: ../../WPrefs.app/Preferences.c:323 |
1638 |
msgid "Left/Right" |
1639 |
msgstr "ì¦×ÉÊ/ðÒÁ×ÉÊ" |
1640 |
|
1641 |
#: ../../WPrefs.app/Preferences.c:328 |
1642 |
msgid "Top/Bottom" |
1643 |
msgstr "ú×ÅÒÈÕ/úÎÉÚÕ" |
1644 |
|
1645 |
#: ../../WPrefs.app/Preferences.c:349 |
1646 |
msgid "Miscellaneous Ergonomic Preferences" |
1647 |
msgstr "ò¦ÚΦ ÎÁÓÔÒÏÊËÉ ÅÒÇÏÎÏͦËÉ" |
1648 |
|
1649 |
#: ../../WPrefs.app/Preferences.c:350 |
1650 |
msgid "" |
1651 |
"Various settings like balloon text, geometry\n" |
1652 |
"displays etc." |
1653 |
msgstr "" |
1654 |
"ò¦ÚΦ ÎÁÓÔÒÏÊËÉ ÔÉÐÕ ×ÍÉËÁÎÎÑ `ËÕÌØÏË' Ú Ð¦ÄËÁÚËÁÍÉ,\n" |
1655 |
"ÐÏËÁÚÕ ÇÅÏÍÅÔÒ¦§ ¦ Ô.Ð." |
1656 |
|
1657 |
#: ../../WPrefs.app/TexturePanel.c:323 |
1658 |
msgid "Saturation" |
1659 |
msgstr "îÁÓÉÞÅΦÓÔØ" |
1660 |
|
1661 |
#: ../../WPrefs.app/TexturePanel.c:325 |
1662 |
msgid "Brightness" |
1663 |
msgstr "ñÓËÒÁצÓÔØ" |
1664 |
|
1665 |
#: ../../WPrefs.app/TexturePanel.c:373 ../../WPrefs.app/TexturePanel.c:380 |
1666 |
msgid "Hue" |
1667 |
msgstr "÷¦ÄÔ¦ÎÏË" |
1668 |
|
1669 |
#: ../../WPrefs.app/TexturePanel.c:610 |
1670 |
msgid "Could not load the selected file: " |
1671 |
msgstr "îÅ ×ÄÁ¤ÔØÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ ÆÁÊÌ:" |
1672 |
|
1673 |
#: ../../WPrefs.app/TexturePanel.c:664 |
1674 |
msgid "Open Image" |
1675 |
msgstr "÷¦ÄËÒÉÔÉ ÚÏÂÒÁÖÅÎÎÑ" |
1676 |
|
1677 |
#: ../../WPrefs.app/TexturePanel.c:694 |
1678 |
msgid "The selected file does not contain a supported image." |
1679 |
msgstr "ãÅÊ ÆÁÊÌ ÎŠͦÓÔÉÔØ ÚÏÂÒÁÖÅÎÎÑ × Ð¦ÄÔÒÉÍÕ×ÁÎÏÍÕ ÆÏÒÍÁÔ¦." |
1680 |
|
1681 |
#: ../../WPrefs.app/TexturePanel.c:945 |
1682 |
#, c-format |
1683 |
msgid "could not load file '%s': %s" |
1684 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ ÆÁÊÌ '%s': %s" |
1685 |
|
1686 |
#: ../../WPrefs.app/TexturePanel.c:1064 |
1687 |
#, c-format |
1688 |
msgid "error creating texture %s" |
1689 |
msgstr "ÐÏÍÉÌËÁ ÓÔ×ÏÒÅÎÎÑ ÔÅËÓÔÕÒÉ %s" |
1690 |
|
1691 |
#: ../../WPrefs.app/TexturePanel.c:1254 |
1692 |
msgid "Texture Panel" |
1693 |
msgstr "ðÁÎÅÌØ ÓÔ×ÏÒÅÎÎÑ ÔÅËÓÔÕÒÉ" |
1694 |
|
1695 |
#: ../../WPrefs.app/TexturePanel.c:1262 |
1696 |
msgid "Texture Name" |
1697 |
msgstr "îÁÚ×Á ÔÅËÓÔÕÒÉ" |
1698 |
|
1699 |
#: ../../WPrefs.app/TexturePanel.c:1274 |
1700 |
msgid "Solid Color" |
1701 |
msgstr "óÕæÌØÎÉÊ ËÏ̦Ò" |
1702 |
|
1703 |
#: ../../WPrefs.app/TexturePanel.c:1275 |
1704 |
msgid "Gradient Texture" |
1705 |
msgstr "çÒÁĦ¤ÎÔ" |
1706 |
|
1707 |
#: ../../WPrefs.app/TexturePanel.c:1276 |
1708 |
msgid "Simple Gradient Texture" |
1709 |
msgstr "ðÒÏÓÔÉÊ ÇÒÁĦ¤ÎÔ" |
1710 |
|
1711 |
#: ../../WPrefs.app/TexturePanel.c:1277 |
1712 |
msgid "Textured Gradient" |
1713 |
msgstr "ôÅËÓÔÕÒÏ×ÁÎÉÊ ÇÒÁĦ¤ÎÔ" |
1714 |
|
1715 |
#: ../../WPrefs.app/TexturePanel.c:1278 |
1716 |
msgid "Image Texture" |
1717 |
msgstr "ôÅËÓÔÕÒÁ-ÚÏÂÒÁÖÅÎÎÑ" |
1718 |
|
1719 |
#: ../../WPrefs.app/TexturePanel.c:1286 |
1720 |
msgid "Default Color" |
1721 |
msgstr "õÍÏ×ÞÁÎÎÑ" |
1722 |
|
1723 |
#: ../../WPrefs.app/TexturePanel.c:1298 |
1724 |
msgid "Gradient Colors" |
1725 |
msgstr "ëÏÌØÏÒÉ ÇÒÁĦ¤ÎÔÕ" |
1726 |
|
1727 |
#: ../../WPrefs.app/TexturePanel.c:1394 |
1728 |
msgid "Direction" |
1729 |
msgstr "îÁÐÒÑÍÏË" |
1730 |
|
1731 |
#: ../../WPrefs.app/TexturePanel.c:1422 |
1732 |
msgid "Gradient" |
1733 |
msgstr "çÒÁĦ¤ÎÔ" |
1734 |
|
1735 |
#: ../../WPrefs.app/TexturePanel.c:1440 |
1736 |
msgid "Gradient Opacity" |
1737 |
msgstr "ðÒÏÚÏÒ¦ÓÔØ ÇÒÁĦ¤ÎÔÕ" |
1738 |
|
1739 |
#: ../../WPrefs.app/TexturePanel.c:1483 |
1740 |
msgid "Image" |
1741 |
msgstr "úÏÂÒÁÖÅÎÎÑ" |
1742 |
|
1743 |
#: ../../WPrefs.app/TexturePanel.c:1515 |
1744 |
msgid "Tile" |
1745 |
msgstr "þÅÒÅÐÉÃÅÀ" |
1746 |
|
1747 |
#: ../../WPrefs.app/TexturePanel.c:1516 |
1748 |
msgid "Scale" |
1749 |
msgstr "òÏÚÔÑÖËÁ" |
1750 |
|
1751 |
#: ../../WPrefs.app/TexturePanel.c:1518 |
1752 |
msgid "Maximize" |
1753 |
msgstr "íÁËÓÉͦÚÁæÑ" |
1754 |
|
1755 |
#: ../../WPrefs.app/Themes.c:71 ../../WPrefs.app/Themes.c:82 |
1756 |
msgid "Set" |
1757 |
msgstr "" |
1758 |
|
1759 |
#: ../../WPrefs.app/Themes.c:132 |
1760 |
msgid "Stop" |
1761 |
msgstr "" |
1762 |
|
1763 |
#: ../../WPrefs.app/Themes.c:143 ../../WPrefs.app/Themes.c:203 |
1764 |
#: ../../WPrefs.app/Themes.c:223 |
1765 |
msgid "Download" |
1766 |
msgstr "" |
1767 |
|
1768 |
#: ../../WPrefs.app/Themes.c:171 |
1769 |
msgid "Save Current Theme" |
1770 |
msgstr "" |
1771 |
|
1772 |
#: ../../WPrefs.app/Themes.c:180 |
1773 |
msgid "Load" |
1774 |
msgstr "" |
1775 |
|
1776 |
#: ../../WPrefs.app/Themes.c:185 |
1777 |
msgid "Install" |
1778 |
msgstr "" |
1779 |
|
1780 |
#: ../../WPrefs.app/Themes.c:193 |
1781 |
msgid "Tile of The Day" |
1782 |
msgstr "" |
1783 |
|
1784 |
#: ../../WPrefs.app/Themes.c:213 |
1785 |
msgid "Bar of The Day" |
1786 |
msgstr "" |
1787 |
|
1788 |
#: ../../WPrefs.app/WPrefs.c:260 |
1789 |
msgid "Window Maker Preferences" |
1790 |
msgstr "îÁÓÔÒÏÊËÉ ×ÐÏÄÏÂÁÎØ ÄÌÑ Window Maker" |
1791 |
|
1792 |
#: ../../WPrefs.app/WPrefs.c:284 |
1793 |
msgid "Revert Page" |
1794 |
msgstr "ðÏ×ÅÒÎÕÔÉ ÓÔÏÒ¦ÎËÕ" |
1795 |
|
1796 |
#: ../../WPrefs.app/WPrefs.c:290 |
1797 |
msgid "Revert All" |
1798 |
msgstr "ðÏ×ÅÒÎÕÔÉ ×ÓÅ" |
1799 |
|
1800 |
#: ../../WPrefs.app/WPrefs.c:296 |
1801 |
msgid "Save" |
1802 |
msgstr "úÂÅÒÅÇÔÉ" |
1803 |
|
1804 |
#: ../../WPrefs.app/WPrefs.c:309 |
1805 |
msgid "Balloon Help" |
1806 |
msgstr "ð¦ÄËÁÚËÁ × ËÕÌØæ" |
1807 |
|
1808 |
#: ../../WPrefs.app/WPrefs.c:334 |
1809 |
msgid "Window Maker Preferences Utility" |
1810 |
msgstr "õÔÉ̦ÔÁ ÎÁÓÔÒÏÊËÉ Window Maker" |
1811 |
|
1812 |
#: ../../WPrefs.app/WPrefs.c:341 |
1813 |
#, c-format |
1814 |
msgid "Version %s for Window Maker %s or newer" |
1815 |
msgstr "÷ÅÒÓ¦Ñ %s ÄÌÑ Window Maker %s ÞÉ ÎÏצÛÏÇÏ" |
1816 |
|
1817 |
#: ../../WPrefs.app/WPrefs.c:349 |
1818 |
msgid "Starting..." |
1819 |
msgstr "óÔÁÒÔÕÀ..." |
1820 |
|
1821 |
#: ../../WPrefs.app/WPrefs.c:355 |
1822 |
msgid "" |
1823 |
"Programming/Design: Alfredo K. Kojima\n" |
1824 |
"Artwork: Marco van Hylckama Vlieg, Largo et al\n" |
1825 |
"More Programming: James Thompson et al" |
1826 |
msgstr "" |
1827 |
"ðÒÏÇÒÁÍÕ×ÁÎÎÑ/ÄÉÚÁÊÎ: Alfredo K. Kojima\n" |
1828 |
"ïÆÏÒÍÌÅÎÎÑ: Marco van Hylckama Vlieg, Largo ÔÁ ¦ÎÛ¦\n" |
1829 |
"ðÒÏÇÒÁÍÕ×ÁÎÎÑ ÔÁËÏÖ: James Thomson ÔÁ ¦ÎÛ¦" |
1830 |
|
1831 |
#: ../../WPrefs.app/WPrefs.c:455 |
1832 |
#, c-format |
1833 |
msgid "could not locate image file %s\n" |
1834 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÚÎÁÊÔÉ ÆÁÊÌ ¦Ú ÚÏÂÒÁÖÅÎÎÑÍ %s\n" |
1835 |
|
1836 |
#: ../../WPrefs.app/WPrefs.c:670 |
1837 |
#, c-format |
1838 |
msgid "could not load image file %s:%s" |
1839 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ ÆÁÊÌ ÚÏÂÒÁÖÅÎÎÑ %s:%s" |
1840 |
|
1841 |
#: ../../WPrefs.app/WPrefs.c:689 |
1842 |
msgid "Loading Window Maker configuration files..." |
1843 |
msgstr "úÁ×ÁÎÔÁÖÕÀ ÆÁÊÌÉ ËÏÎƦÇÕÒÁæ§ Window Maker..." |
1844 |
|
1845 |
#: ../../WPrefs.app/WPrefs.c:693 |
1846 |
msgid "Initializing configuration panels..." |
1847 |
msgstr "¶Î¦Ã¦Á̦ÚÕÀ ËÏÎƦÇÕÒÁæÊΦ ÐÁÎÅ̦..." |
1848 |
|
1849 |
#: ../../WPrefs.app/WPrefs.c:727 |
1850 |
msgid "" |
1851 |
"WPrefs is free software and is distributed WITHOUT ANY\n" |
1852 |
"WARRANTY under the terms of the GNU General Public License." |
1853 |
msgstr "" |
1854 |
"WPrefs ¤ צÌØÎÉÍ ÐÒÏÇÒÁÍÎÉÍ ÚÁÂÅÚÐÅÞÅÎÎÑÍ ¦ ÒÏÚÐÏ×ÓÀÄÖÕ¤ÔØÓÑ\n" |
1855 |
"âåú âõäø-ñëï· çáòáîô¶· ÚÁ ÕÍÏ×ÁÍÉ GNU General Public License." |
1856 |
|
1857 |
#: ../../WPrefs.app/WPrefs.c:757 ../../WPrefs.app/WPrefs.c:837 |
1858 |
#, c-format |
1859 |
msgid "Window Maker domain (%s) is corrupted!" |
1860 |
msgstr "äÏÍÅÎ Window Maker (%s) Ú¦ÐÓÏ×ÁÎÉÊ!" |
1861 |
|
1862 |
#: ../../WPrefs.app/WPrefs.c:761 |
1863 |
#, c-format |
1864 |
msgid "Could not load Window Maker domain (%s) from defaults database." |
1865 |
msgstr "îÅ ×ÄÁ¤ÔØÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ ÄÏÍÅÎ Window Maker (%s) Ú ÂÁÚÉ ÄÁÎÉÈ ÕÍÏ×ÞÁÎØ." |
1866 |
|
1867 |
#: ../../WPrefs.app/WPrefs.c:777 |
1868 |
msgid "could not extract version information from Window Maker" |
1869 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÏÔÒÉÍÁÔÉ ÎÏÍÅÒ ×ÅÒÓ¦§ Window Maker" |
1870 |
|
1871 |
#: ../../WPrefs.app/WPrefs.c:778 |
1872 |
msgid "Make sure wmaker is in your search path." |
1873 |
msgstr "÷ÐÅ×ΦÔØÓÑ, ÝÏ wmaker ¤ × ÛÌÑÈÕ ÐÏÛÕËÕ." |
1874 |
|
1875 |
#: ../../WPrefs.app/WPrefs.c:781 |
1876 |
msgid "" |
1877 |
"Could not extract version from Window Maker. Make sure it is correctly " |
1878 |
"installed and is in your PATH environment variable." |
1879 |
msgstr "" |
1880 |
"îÅ ×ÄÁ¤ÔØÓÑ ÏÔÒÉÍÁÔÉ ×ÅÒÓ¦À Window Maker. ÷ÐÅ×ΦÔØÓÑ, ÝÏ ×¦Î ×ÓÔÁÎÏ×ÌÅÎÉÊ " |
1881 |
"ËÏÒÅËÔÎÏ ¦ ÚͦÎÎÁ ÓÅÒÅÄÏ×ÉÝÁ PATH ͦÓÔÉÔØ ÛÌÑÈ ÄÏ ÎØÏÇÏ." |
1882 |
|
1883 |
#: ../../WPrefs.app/WPrefs.c:791 |
1884 |
msgid "" |
1885 |
"Could not extract version from Window Maker. Make sure it is correctly " |
1886 |
"installed and the path where it installed is in the PATH environment " |
1887 |
"variable." |
1888 |
msgstr "" |
1889 |
"îÅ ÍÏÖÕ ÏÔÒÉÍÁÔÉ ×ÅÒÓ¦À Window Maker. ÷ÐÅ×ΦÔØÓÑ, ÝÏ ×¦Î ×ÓÔÁÎÏ×ÌÅÎÉÊ " |
1890 |
"ËÏÒÅËÔÎÏ ¦ ÛÌÑÈ ÄÏ ÊÏÇÏ ×ÉËÏÎÕ×ÁÎÏÇÏ ÆÁÊÌÕ ¤ × PATH." |
1891 |
|
1892 |
#: ../../WPrefs.app/WPrefs.c:798 |
1893 |
#, c-format |
1894 |
msgid "" |
1895 |
"WPrefs only supports Window Maker 0.18.0 or newer.\n" |
1896 |
"The version installed is %i.%i.%i\n" |
1897 |
msgstr "" |
1898 |
"WPrefs ÐÒÁÃÀ¤ Ô¦ÌØËÉ Ú Window Maker 0.18.0 ÔÁ ÎÏצÛÉÍÉ.\n" |
1899 |
"÷ÓÔÁÎÏ×ÌÅÎÁ ×ÅÒÓ¦Ñ %i.%i.%i\n" |
1900 |
|
1901 |
#: ../../WPrefs.app/WPrefs.c:805 |
1902 |
#, c-format |
1903 |
msgid "" |
1904 |
"Window Maker %i.%i.%i, which is installed in your system, is not fully " |
1905 |
"supported by this version of WPrefs." |
1906 |
msgstr "" |
1907 |
"Window Maker %i.%i.%i, ×ÓÔÁÎÏ×ÌÅÎÉÊ Õ ÷ÁÛ¦Ê ÓÉÓÔÅͦ, ÎÅ ÐÏ×ΦÓÔÀ " |
1908 |
"ЦÄÔÒÉÍÕ¤ÔØÓÑ Ã¦¤À ×ÅÒÓ¦¤À WPrefs." |
1909 |
|
1910 |
#: ../../WPrefs.app/WPrefs.c:818 |
1911 |
#, c-format |
1912 |
msgid "could not run \"%s --global_defaults_path\"." |
1913 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÚÁÐÕÓÔÉÔÉ \"%s --global_defaults_path\"." |
1914 |
|
1915 |
#: ../../WPrefs.app/WPrefs.c:841 |
1916 |
#, c-format |
1917 |
msgid "Could not load global Window Maker domain (%s)." |
1918 |
msgstr "îÅ ×ÄÁ¤ÔØÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ ÇÌÏÂÁÌØÎÉÊ ÄÏÍÅÎ Window Maker (%s)." |
1919 |
|
1920 |
#: ../../WPrefs.app/WPrefs.c:1090 |
1921 |
#, c-format |
1922 |
msgid "" |
1923 |
"bad speed value for option %s\n" |
1924 |
". Using default Medium" |
1925 |
msgstr "" |
1926 |
"ÎÅÐÒÁ×ÉÌØÎÅ ÚÎÁÞÅÎÎÑ Û×ÉÄËÏÓÔ¦ ÄÌÑ %s\n" |
1927 |
". ÷ÉËÏÒÉÓÔÏ×Õ¤Í ÚÁ ÕÍÏ×ÞÁÎÎÑÍ óÅÒÅÄÎÑ" |
1928 |
|
1929 |
#: ../../WPrefs.app/WindowHandling.c:141 |
1930 |
#, c-format |
1931 |
msgid "bad option value %s in WindowPlacement. Using default value" |
1932 |
msgstr "" |
1933 |
"ÎÅÐÒÁ×ÉÌØÎÅ ÚÎÁÞÅÎÎÑ %s × ÏÐæ§ WindowPlacement. ÷ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÕÍÏ×ÞÁÎÎÑ" |
1934 |
|
1935 |
#: ../../WPrefs.app/WindowHandling.c:163 |
1936 |
msgid "invalid data in option WindowPlaceOrigin. Using default (0,0)" |
1937 |
msgstr "" |
1938 |
"ÎÅÐÒÁ×ÉÌØΦ ÄÁΦ × ÏÐæ§ WindowPlaceOrigin. ÷ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÕÍÏ×ÞÁÎÎÑ (0,0)" |
1939 |
|
1940 |
#: ../../WPrefs.app/WindowHandling.c:243 |
1941 |
msgid "Window Placement" |
1942 |
msgstr "òÏÚͦÝÅÎÎÑ ×¦ËÏÎ" |
1943 |
|
1944 |
#: ../../WPrefs.app/WindowHandling.c:244 |
1945 |
msgid "" |
1946 |
"How to place windows when they are first put\n" |
1947 |
"on screen." |
1948 |
msgstr "ñË ÒÏÚͦÝÕ×ÁÔÉ ×¦ËÎÁ ÐÒÉ §È ÐÏÞÁÔËÏ×¦Ê ÐÏÑצ ÎÁ ÅËÒÁΦ." |
1949 |
|
1950 |
#: ../../WPrefs.app/WindowHandling.c:250 |
1951 |
msgid "Automatic" |
1952 |
msgstr "á×ÔÏÍÁÔÉÞÎÅ" |
1953 |
|
1954 |
#: ../../WPrefs.app/WindowHandling.c:251 |
1955 |
msgid "Random" |
1956 |
msgstr "÷ÉÐÁÄËÏ×Å" |
1957 |
|
1958 |
#: ../../WPrefs.app/WindowHandling.c:252 |
1959 |
msgid "Manual" |
1960 |
msgstr "÷ÒÕÞÎÕ" |
1961 |
|
1962 |
#: ../../WPrefs.app/WindowHandling.c:253 |
1963 |
msgid "Cascade" |
1964 |
msgstr "ëÁÓËÁÄÏÍ" |
1965 |
|
1966 |
#: ../../WPrefs.app/WindowHandling.c:254 |
1967 |
msgid "Smart" |
1968 |
msgstr "\"òÏÚÕÍÎÅ\"" |
1969 |
|
1970 |
#: ../../WPrefs.app/WindowHandling.c:260 |
1971 |
msgid "Placement Origin" |
1972 |
msgstr "ðÏÞÁÔËÏ×Å ÐÏÌÏÖÅÎÎÑ" |
1973 |
|
1974 |
#: ../../WPrefs.app/WindowHandling.c:321 |
1975 |
msgid "Opaque Move" |
1976 |
msgstr "ðÒÏÚÏÒ¦ÓÔØ ÒÕÈÕ" |
1977 |
|
1978 |
#: ../../WPrefs.app/WindowHandling.c:322 |
1979 |
msgid "" |
1980 |
"Whether the window contents should be moved\n" |
1981 |
"when dragging windows aroung or if only a\n" |
1982 |
"frame should be displayed.\n" |
1983 |
msgstr "" |
1984 |
"ðÅÒÅͦÝÁÔÉ ×ͦÓÔ ×¦ËÎÁ ÐÒÉ ÂÕËÓÕ×ÁÎΦ\n" |
1985 |
"צËÏÎ ÞÉ ÐÏËÁÚÕ×ÁÔÉ Ô¦ÌØËÉ ÒÁÍËÕ.\n" |
1986 |
|
1987 |
#: ../../WPrefs.app/WindowHandling.c:361 |
1988 |
msgid "When maximizing..." |
1989 |
msgstr "ðÒÉ ÍÁËÓÉͦÚÁæ§..." |
1990 |
|
1991 |
#: ../../WPrefs.app/WindowHandling.c:366 |
1992 |
msgid "...do not cover icons" |
1993 |
msgstr "...ÎÅ ÐÏËÒÉ×ÁÔÉ ¦ËÏÎËÉ" |
1994 |
|
1995 |
#: ../../WPrefs.app/WindowHandling.c:372 |
1996 |
msgid "...do not cover dock" |
1997 |
msgstr "...ÎÅ ÐÏËÒÉ×ÁÔÉ äÏË" |
1998 |
|
1999 |
#: ../../WPrefs.app/WindowHandling.c:381 |
2000 |
msgid "Edge Resistance" |
2001 |
msgstr "ïÐ¦Ò ËÒÁ§×" |
2002 |
|
2003 |
#: ../../WPrefs.app/WindowHandling.c:383 |
2004 |
msgid "" |
2005 |
"Edge resistance will make windows `resist'\n" |
2006 |
"being moved further for the defined threshold\n" |
2007 |
"when moved against other windows or the edges\n" |
2008 |
"of the screen." |
2009 |
msgstr "" |
2010 |
"ãÅ ×ËÌÀÞÁ¤ `ÏЦÒ' צËÏÎ ÐÅÒÅͦÝÅÎÎÀ\n" |
2011 |
"ÚÁ ÐÅ×ÎÉÊ ÐÏÒ¦Ç ÐÒÉ ÐÅÒÅͦÝÅÎΦ ÐÏ×ÅÒÈ\n" |
2012 |
"¦ÎÛÉÈ ×¦ËÏÎ ÞÉ ÚÁ ÍÅÖ¦ ÅËÒÁÎÕ." |
2013 |
|
2014 |
#: ../../WPrefs.app/WindowHandling.c:402 |
2015 |
msgid "Resist" |
2016 |
msgstr "ïЦÒ" |
2017 |
|
2018 |
#: ../../WPrefs.app/WindowHandling.c:407 |
2019 |
msgid "Attract" |
2020 |
msgstr "ðÒÉÔÑÇ" |
2021 |
|
2022 |
#: ../../WPrefs.app/WindowHandling.c:423 |
2023 |
msgid "" |
2024 |
"Open dialogs in same workspace\n" |
2025 |
"as their owners" |
2026 |
msgstr "" |
2027 |
"÷¦ÄËÒÉ×ÁÔÉ Ä¦ÁÌÏÇÉ ÎÁ ÏÄÎÏÍÕ ÒÏÂÏÞÏÍÕ ÓÔÏ̦ Ú §È \"ÂÁÔØ˦×ÓØËÉÍ\" צËÎÏÍ" |
2028 |
|
2029 |
#: ../../WPrefs.app/WindowHandling.c:450 |
2030 |
msgid "Window Handling Preferences" |
2031 |
msgstr "îÁÓÔÒÏÊËÉ ×ÐÏÄÏÂÁÎØ ÒÏÂÏÔÉ Ú ×¦ËÎÁÍÉ" |
2032 |
|
2033 |
#: ../../WPrefs.app/WindowHandling.c:452 |
2034 |
msgid "" |
2035 |
"Window handling options. Initial placement style\n" |
2036 |
"edge resistance, opaque move etc." |
2037 |
msgstr "" |
2038 |
"ïÐæ§ ÒÏÂÏÔÉ Ú ×¦ËÎÁÍÉ. óÔÉÌØ ÐÏÞÁÔËÏ×ÏÇÏ ÒÏÚͦÝÅÎÎÑ,\n" |
2039 |
"ÏÐ¦Ò ËÒÁ§×, ÐÒÏÚÏÒ¦ÓÔØ ÐÅÒÅͦÝÅÎÎÑ ¦ ÔÏÍÕ ÐÏĦÂÎÅ." |
2040 |
|
2041 |
#: ../../WPrefs.app/Workspace.c:176 |
2042 |
msgid "Workspace Navigation" |
2043 |
msgstr "îÁצÇÁÃ¦Ñ ÐÏ ÒÏÂÏÞÉÍ ÓÔÏÌÁÍ" |
2044 |
|
2045 |
#: ../../WPrefs.app/Workspace.c:183 |
2046 |
msgid "" |
2047 |
"wrap to the first workspace after the\n" |
2048 |
"last workspace." |
2049 |
msgstr "" |
2050 |
"ÐÅÒÅÈÏÄÉÔÉ ÎÁ ÐÅÒÛÉÊ ÒÏÂÏÞÉÊ ÓÔ¦Ì ÐÒÉ\nÐÅÒÅÍÉËÁÎΦ ÚÁ ÏÓÔÁÎΦÊ." |
2051 |
|
2052 |
#: ../../WPrefs.app/Workspace.c:205 |
2053 |
msgid "switch workspaces while dragging windows." |
2054 |
msgstr "ÐÅÒÅÍÉËÁÔÉ ÒÏÂÏÞ¦ ÓÔÏÌÉ ÐÒÉ ÐÅÒÅÔÑÇÕ×ÁÎΦ\nÍ¦Ö ÎÉÍÉ ×¦ËÏÎ." |
2055 |
|
2056 |
#: ../../WPrefs.app/Workspace.c:227 |
2057 |
msgid "automatically create new workspaces." |
2058 |
msgstr "Á×ÔÏÍÁÔÉÞÎÏ ÓÔ×ÏÒÀ×ÁÔÉ ÎÏצ ÒÏÂÏÞ¦ ÓÔÏÌÉ." |
2059 |
|
2060 |
#: ../../WPrefs.app/Workspace.c:250 |
2061 |
msgid "" |
2062 |
"Position of workspace\n" |
2063 |
"name display" |
2064 |
msgstr "" |
2065 |
"ðÏÚÉÃ¦Ñ ÐÏËÁÚÕ ÎÁÚ×É\n" |
2066 |
"ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ" |
2067 |
|
2068 |
#: ../../WPrefs.app/Workspace.c:269 |
2069 |
msgid "Disable" |
2070 |
msgstr "îÅ ÐÏËÁÚÕ×ÁÔÉ" |
2071 |
|
2072 |
#: ../../WPrefs.app/Workspace.c:271 |
2073 |
msgid "Top" |
2074 |
msgstr "ú×ÅÒÈÕ" |
2075 |
|
2076 |
#: ../../WPrefs.app/Workspace.c:272 |
2077 |
msgid "Bottom" |
2078 |
msgstr "úÎÉÚÕ" |
2079 |
|
2080 |
#: ../../WPrefs.app/Workspace.c:273 |
2081 |
msgid "Top/Left" |
2082 |
msgstr "ú×ÅÒÈÕ/ì¦×ÏÒÕÞ" |
2083 |
|
2084 |
#: ../../WPrefs.app/Workspace.c:274 |
2085 |
msgid "Top/Right" |
2086 |
msgstr "ú×ÅÒÈÕ/ðÒÁ×ÏÒÕÞ" |
2087 |
|
2088 |
#: ../../WPrefs.app/Workspace.c:275 |
2089 |
msgid "Bottom/Left" |
2090 |
msgstr "úÎÉÚÕ/ì¦×ÏÒÕÞ" |
2091 |
|
2092 |
#: ../../WPrefs.app/Workspace.c:276 |
2093 |
msgid "Bottom/Right" |
2094 |
msgstr "úÎÉÚ/ÕðÒÁ×ÏÒÕÞ" |
2095 |
|
2096 |
#: ../../WPrefs.app/Workspace.c:284 |
2097 |
msgid "Dock/Clip" |
2098 |
msgstr "äÏË/óËÒ¦ÐËÁ" |
2099 |
|
2100 |
#: ../../WPrefs.app/Workspace.c:303 |
2101 |
msgid "" |
2102 |
"Disable/enable the application Dock (the\n" |
2103 |
"vertical icon bar in the side of the screen)." |
2104 |
msgstr "" |
2105 |
"úÁÂÏÒÏÎÉÔÉ/ÄÏÚ×ÏÌÉÔÉ äÏË ÄÌÑ ÐÒÏÇÒÁÍ\n" |
2106 |
"(×ÅÒÔÉËÁÌØÎÁ ÓÍÕÖËÁ ¦ËÏÎÏË ÚÂÏËÕ ÅËÒÁÎÕ)." |
2107 |
|
2108 |
#: ../../WPrefs.app/Workspace.c:324 |
2109 |
msgid "" |
2110 |
"Disable/enable the Clip (that thing with\n" |
2111 |
"a paper clip icon)." |
2112 |
msgstr "" |
2113 |
"úÁÂÏÒÏÎÉÔÉ/ÄÏÚ×ÏÌÉÔÉ óËÒ¦ÐËÕ (Ë×ÁÄÒÁÔÉË Ú ¦ËÏÎËÏÀ\n" |
2114 |
"ÓËÒ¦ÐËÉ ÄÌÑ ÐÁÐÅÒ¦× ;)." |
2115 |
|
2116 |
#: ../../WPrefs.app/Workspace.c:364 |
2117 |
msgid "Workspace Preferences" |
2118 |
msgstr "îÁÓÔÒÏÊËÉ ×ÐÏÄÏÂÁÎØ ÄÌÑ ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ" |
2119 |
|
2120 |
#: ../../WPrefs.app/Workspace.c:366 |
2121 |
msgid "" |
2122 |
"Workspace navigation features.\n" |
2123 |
"You can also enable/disable the Dock and Clip here." |
2124 |
msgstr "" |
2125 |
"îÁצÇÁÃ¦Ñ ÐÏ ÒÏÂÏÞÉÍ ÓÔÏÌÁÍ.\n" |
2126 |
"ôÕÔ ÔÁËÏÖ ÍÏÖÎÁ ÄÏÚ×ÏÌÉÔÉ/ÚÁÂÏÒÏÎÉÔÉ äÏË ÔÁ óËÒ¦ÐËÕ." |
2127 |
|
2128 |
#: ../../WPrefs.app/imagebrowser.c:95 |
2129 |
msgid "View" |
2130 |
msgstr "" |
2131 |
|
2132 |
#: ../../WPrefs.app/main.c:59 |
2133 |
#, c-format |
2134 |
msgid "usage: %s [options]\n" |
2135 |
msgstr "úÁÐÕÓË: %s [ÐÁÒÁÍÅÔÒÉ]\n" |
2136 |
|
2137 |
#: ../../WPrefs.app/main.c:60 |
2138 |
msgid "options:" |
2139 |
msgstr "ÐÁÒÁÍÅÔÒÉ:" |
2140 |
|
2141 |
#: ../../WPrefs.app/main.c:61 |
2142 |
msgid " -display <display>\tdisplay to be used" |
2143 |
msgstr " -display <ÄÉÓÐÌÅÊ>\tX ÄÉÓÐÌÅÊ ÄÌÑ ×ÉËÏÒÉÓÔÁÎÎÑ" |
2144 |
|
2145 |
#: ../../WPrefs.app/main.c:62 |
2146 |
msgid " --version\t\tprint version number and exit" |
2147 |
msgstr " --version\t\tÐÏËÁÚÁÔÉ ÎÏÍÅÒ ×ÅÒÓ¦§ ÔÁ ×ÉÊÔÉ" |
2148 |
|
2149 |
#: ../../WPrefs.app/main.c:63 |
2150 |
msgid " --help\t\tprint this message and exit" |
2151 |
msgstr " --help\t\tÐÏËÁÚÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ ÔÁ ×ÉÊÔÉ" |
2152 |
|
2153 |
#: ../../WPrefs.app/main.c:122 |
2154 |
#, c-format |
2155 |
msgid "too few arguments for %s" |
2156 |
msgstr "ÎÁÄÔÏ ÍÁÌÏ ÁÒÇÕÍÅÎÔ¦× ÄÌÑ %s" |
2157 |
|
2158 |
#: ../../WPrefs.app/main.c:141 |
2159 |
msgid "X server does not support locale" |
2160 |
msgstr "X ÓÅÒ×ÅÒ ÎŠЦÄÔÒÉÍÕ¤ locale" |
2161 |
|
2162 |
#: ../../WPrefs.app/main.c:144 |
2163 |
msgid "cannot set locale modifiers" |
2164 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÍÏÄÉƦËÁÔÏÒÉ ÌÏËÁ̦ÚÁæ§" |
2165 |
|
2166 |
#: ../../WPrefs.app/main.c:150 |
2167 |
#, c-format |
2168 |
msgid "could not open display %s" |
2169 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ×¦ÄËÒÉÔÉ ÄÉÓÐÌÅÊ %s" |
2170 |
|
2171 |
#: ../../WPrefs.app/main.c:158 |
2172 |
msgid "could not initialize application" |
2173 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÐÒÏÇÒÁÍÕ" |
2174 |
|
2175 |
|
2176 |
|
2177 |
|
2178 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.80.2-cvs-alt-textfield.patch |
2179 |
|
2180 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.80.2-cvs-alt-textfield.patch?rev=1.1&view=markup |
2181 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.80.2-cvs-alt-textfield.patch?rev=1.1&content-type=text/plain |
2182 |
|
2183 |
Index: WindowMaker-0.80.2-cvs-alt-textfield.patch |
2184 |
=================================================================== |
2185 |
--- WindowMaker-0.80.2/WINGs/WINGs/WINGs.h.textfield 2003-10-20 23:57:14 +0400 |
2186 |
+++ WindowMaker-0.80.2/WINGs/WINGs/WINGs.h 2003-10-22 09:21:11 +0400 |
2187 |
@@ -1154,6 +1154,8 @@ |
2188 |
|
2189 |
void WMSetTextFieldCursorPosition(WMTextField *tPtr, unsigned int position); |
2190 |
|
2191 |
+unsigned WMGetTextFieldCursorPosition(WMTextField *tPtr); |
2192 |
+ |
2193 |
void WMSetTextFieldNextTextField(WMTextField *tPtr, WMTextField *next); |
2194 |
|
2195 |
void WMSetTextFieldPrevTextField(WMTextField *tPtr, WMTextField *prev); |
2196 |
--- WindowMaker-0.80.2/WINGs/wtextfield.c.textfield 2003-10-20 23:57:14 +0400 |
2197 |
+++ WindowMaker-0.80.2/WINGs/wtextfield.c 2003-10-22 09:20:31 +0400 |
2198 |
@@ -617,6 +617,14 @@ |
2199 |
} |
2200 |
} |
2201 |
|
2202 |
+unsigned |
2203 |
+WMGetTextFieldCursorPosition(WMTextField *tPtr) |
2204 |
+{ |
2205 |
+ CHECK_CLASS(tPtr, WC_TextField); |
2206 |
+ |
2207 |
+ return tPtr->cursorPosition; |
2208 |
+} |
2209 |
+ |
2210 |
|
2211 |
void |
2212 |
WMSetTextFieldNextTextField(WMTextField *tPtr, WMTextField *next) |
2213 |
|
2214 |
|
2215 |
|
2216 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-adialog.patch |
2217 |
|
2218 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-adialog.patch?rev=1.1&view=markup |
2219 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-adialog.patch?rev=1.1&content-type=text/plain |
2220 |
|
2221 |
Index: WindowMaker-0.91.0-alt-adialog.patch |
2222 |
=================================================================== |
2223 |
--- WindowMaker-0.91.0/src/misc.c.vns 2005-05-18 18:08:11 +0400 |
2224 |
+++ WindowMaker-0.91.0/src/misc.c 2005-05-18 18:11:20 +0400 |
2225 |
@@ -607,96 +607,59 @@ |
2226 |
|
2227 |
|
2228 |
static char* |
2229 |
-getuserinput(WScreen *scr, char *line, int *ptr) |
2230 |
+parseuserinputpart(char *line, int *ptr, char *endchars) |
2231 |
{ |
2232 |
- char *ret; |
2233 |
- char *title; |
2234 |
- char *prompt; |
2235 |
- int j, state; |
2236 |
- int begin = 0; |
2237 |
-#define BUFSIZE 512 |
2238 |
- char tbuffer[BUFSIZE], pbuffer[BUFSIZE]; |
2239 |
- |
2240 |
- |
2241 |
- title = _("Program Arguments"); |
2242 |
- prompt = _("Enter command arguments:"); |
2243 |
- ret = NULL; |
2244 |
- |
2245 |
-#define _STARTING 0 |
2246 |
-#define _TITLE 1 |
2247 |
-#define _PROMPT 2 |
2248 |
-#define _DONE 3 |
2249 |
- |
2250 |
- state = _STARTING; |
2251 |
- j = 0; |
2252 |
- for (; line[*ptr]!=0 && state!=_DONE; (*ptr)++) { |
2253 |
- switch (state) { |
2254 |
- case _STARTING: |
2255 |
- if (line[*ptr]=='(') { |
2256 |
- state = _TITLE; |
2257 |
- begin = *ptr+1; |
2258 |
- } else { |
2259 |
- state = _DONE; |
2260 |
- } |
2261 |
- break; |
2262 |
- |
2263 |
- case _TITLE: |
2264 |
- if (j <= 0 && line[*ptr]==',') { |
2265 |
- |
2266 |
- j = 0; |
2267 |
- if (*ptr > begin) { |
2268 |
- strncpy(tbuffer, &line[begin], WMIN(*ptr-begin, BUFSIZE)); |
2269 |
- tbuffer[WMIN(*ptr-begin, BUFSIZE)] = 0; |
2270 |
- title = (char*)tbuffer; |
2271 |
- } |
2272 |
- begin = *ptr+1; |
2273 |
- state = _PROMPT; |
2274 |
- |
2275 |
- } else if (j <= 0 && line[*ptr]==')') { |
2276 |
- |
2277 |
- if (*ptr > begin) { |
2278 |
- strncpy(tbuffer, &line[begin], WMIN(*ptr-begin, BUFSIZE)); |
2279 |
- tbuffer[WMIN(*ptr-begin, BUFSIZE)] = 0; |
2280 |
- title = (char*)tbuffer; |
2281 |
- } |
2282 |
- state = _DONE; |
2283 |
- |
2284 |
- } else if (line[*ptr]=='(') { |
2285 |
- j++; |
2286 |
- } else if (line[*ptr]==')') { |
2287 |
- j--; |
2288 |
- } |
2289 |
- |
2290 |
- break; |
2291 |
+ int depth = 0, begin; |
2292 |
+ char *value = NULL; |
2293 |
+ begin = ++*ptr; |
2294 |
+ |
2295 |
+ while(line[*ptr] != '\0') { |
2296 |
+ if(line[*ptr] == '(') { |
2297 |
+ ++depth; |
2298 |
+ } else if(depth > 0 && line[*ptr] == ')') { |
2299 |
+ --depth; |
2300 |
+ } else if(depth == 0 && strchr(endchars, line[*ptr]) != NULL) { |
2301 |
+ value = wmalloc(*ptr - begin + 1); |
2302 |
+ strncpy(value, line + begin, *ptr - begin); |
2303 |
+ value[*ptr - begin] = '\0'; |
2304 |
+ break; |
2305 |
+ } |
2306 |
+ ++*ptr; |
2307 |
+ } |
2308 |
|
2309 |
- case _PROMPT: |
2310 |
- if (line[*ptr]==')' && j==0) { |
2311 |
+ return value; |
2312 |
+} |
2313 |
|
2314 |
- if (*ptr-begin > 1) { |
2315 |
- strncpy(pbuffer, &line[begin], WMIN(*ptr-begin, BUFSIZE)); |
2316 |
- pbuffer[WMIN(*ptr-begin, BUFSIZE)] = 0; |
2317 |
- prompt = (char*)pbuffer; |
2318 |
- } |
2319 |
- state = _DONE; |
2320 |
- } else if (line[*ptr]=='(') |
2321 |
- j++; |
2322 |
- else if (line[*ptr]==')') |
2323 |
- j--; |
2324 |
- break; |
2325 |
- } |
2326 |
- } |
2327 |
- (*ptr)--; |
2328 |
-#undef _STARTING |
2329 |
-#undef _TITLE |
2330 |
-#undef _PROMPT |
2331 |
-#undef _DONE |
2332 |
+static char* |
2333 |
+getuserinput(WScreen *scr, char *line, int *ptr, Bool advanced) |
2334 |
+{ |
2335 |
+ char *ret = NULL, *title = NULL, *prompt = NULL, *name = NULL; |
2336 |
+ int rv; |
2337 |
|
2338 |
- if (!wInputDialog(scr, title, prompt, &ret)) |
2339 |
- return NULL; |
2340 |
+ if(line[*ptr] == '(') |
2341 |
+ title = parseuserinputpart(line, ptr, ",)"); |
2342 |
+ if(title != NULL && line[*ptr] == ',') |
2343 |
+ prompt = parseuserinputpart(line, ptr, ",)"); |
2344 |
+ if(prompt != NULL && line[*ptr] == ',') |
2345 |
+ name = parseuserinputpart(line, ptr, ")"); |
2346 |
+ |
2347 |
+ if(advanced) |
2348 |
+ rv = wAdvancedInputDialog(scr, |
2349 |
+ title ? gettext(title):_("Program Arguments"), |
2350 |
+ prompt ? gettext(prompt):_("Enter command arguments:"), |
2351 |
+ name, &ret); |
2352 |
else |
2353 |
- return ret; |
2354 |
-} |
2355 |
+ rv = wInputDialog(scr, |
2356 |
+ title ? gettext(title):_("Program Arguments"), |
2357 |
+ prompt ? gettext(prompt):_("Enter command arguments:"), |
2358 |
+ &ret); |
2359 |
+ |
2360 |
+ if(title) wfree(title); |
2361 |
+ if(prompt) wfree(prompt); |
2362 |
+ if(name) wfree(name); |
2363 |
|
2364 |
+ return rv ? ret : NULL; |
2365 |
+} |
2366 |
|
2367 |
#define S_NORMAL 0 |
2368 |
#define S_ESCAPE 1 |
2369 |
@@ -814,8 +777,9 @@ |
2370 |
break; |
2371 |
|
2372 |
case 'a': |
2373 |
+ case 'A': |
2374 |
ptr++; |
2375 |
- user_input = getuserinput(scr, cmdline, &ptr); |
2376 |
+ user_input = getuserinput(scr, cmdline, &ptr, cmdline[ptr-1] == 'A'); |
2377 |
if (user_input) { |
2378 |
slen = strlen(user_input); |
2379 |
olen += slen; |
2380 |
--- WindowMaker-0.91.0/src/dialog.c.vns 2005-05-18 18:08:11 +0400 |
2381 |
+++ WindowMaker-0.91.0/src/dialog.c 2005-05-18 18:08:11 +0400 |
2382 |
@@ -178,6 +178,328 @@ |
2383 |
return result; |
2384 |
} |
2385 |
|
2386 |
+typedef struct _WMInputPanelWithHistory |
2387 |
+{ |
2388 |
+ WMInputPanel *panel; |
2389 |
+ WMArray *history; |
2390 |
+ int histpos; |
2391 |
+ char *prefix; |
2392 |
+ char *suffix; |
2393 |
+ char *rest; |
2394 |
+ WMArray *variants; |
2395 |
+ int varpos; |
2396 |
+} WMInputPanelWithHistory; |
2397 |
+ |
2398 |
+static char * |
2399 |
+HistoryFileName(char *name) |
2400 |
+{ |
2401 |
+ char *filename = NULL; |
2402 |
+ |
2403 |
+ filename = wstrdup(wusergnusteppath()); |
2404 |
+ filename = wstrappend(filename, "/.AppInfo/WindowMaker/History"); |
2405 |
+ if(name && strlen(name)) { |
2406 |
+ filename = wstrappend(filename, "."); |
2407 |
+ filename = wstrappend(filename, name); |
2408 |
+ } |
2409 |
+ return filename; |
2410 |
+} |
2411 |
+ |
2412 |
+static int |
2413 |
+matchString(void *str1, void *str2) |
2414 |
+{ |
2415 |
+ return (strcmp((char*)str1, (char*)str2)==0 ? 1 : 0); |
2416 |
+} |
2417 |
+ |
2418 |
+static WMArray * |
2419 |
+LoadHistory(char *filename, int max) |
2420 |
+{ |
2421 |
+ WMPropList *plhistory; |
2422 |
+ WMPropList *plitem; |
2423 |
+ WMArray *history; |
2424 |
+ int i, num; |
2425 |
+ |
2426 |
+ history = WMCreateArrayWithDestructor(1, wfree); |
2427 |
+ WMAddToArray(history, wstrdup("")); |
2428 |
+ |
2429 |
+ plhistory = WMReadPropListFromFile((char*)filename); |
2430 |
+ |
2431 |
+ if(plhistory && WMIsPLArray(plhistory)) { |
2432 |
+ num = WMGetPropListItemCount(plhistory); |
2433 |
+ if(num > max) num = max; |
2434 |
+ |
2435 |
+ for(i = 0; i < num; ++i) { |
2436 |
+ plitem = WMGetFromPLArray(plhistory, i); |
2437 |
+ if(WMIsPLString(plitem) && WMFindInArray(history, matchString, |
2438 |
+ WMGetFromPLString(plitem)) == WANotFound) |
2439 |
+ WMAddToArray(history, WMGetFromPLString(plitem)); |
2440 |
+ } |
2441 |
+ } |
2442 |
+ |
2443 |
+ return history; |
2444 |
+} |
2445 |
+ |
2446 |
+static void |
2447 |
+SaveHistory(WMArray *history, char *filename) |
2448 |
+{ |
2449 |
+ int i; |
2450 |
+ WMPropList *plhistory; |
2451 |
+ |
2452 |
+ plhistory = WMCreatePLArray(NULL); |
2453 |
+ |
2454 |
+ for(i = 0; i < WMGetArrayItemCount(history); ++i) |
2455 |
+ WMAddToPLArray(plhistory, |
2456 |
+ WMCreatePLString(WMGetFromArray(history, i))); |
2457 |
+ |
2458 |
+ WMWritePropListToFile(plhistory, (char*)filename, False); |
2459 |
+ WMReleasePropList(plhistory); |
2460 |
+} |
2461 |
+ |
2462 |
+static int |
2463 |
+strmatch(const char *str1, const char *str2) |
2464 |
+{ |
2465 |
+ return !strcmp(str1, str2); |
2466 |
+} |
2467 |
+ |
2468 |
+static int |
2469 |
+pstrcmp(const char **str1, const char **str2) |
2470 |
+{ |
2471 |
+ return strcmp(*str1, *str2); |
2472 |
+} |
2473 |
+ |
2474 |
+static void |
2475 |
+ScanFiles(const char *dir, const char *prefix, unsigned acceptmask, |
2476 |
+ unsigned declinemask, WMArray *result) |
2477 |
+{ |
2478 |
+ int prefixlen; |
2479 |
+ DIR *d; |
2480 |
+ struct dirent *de; |
2481 |
+ struct stat sb; |
2482 |
+ char *fullfilename, *suffix; |
2483 |
+ |
2484 |
+ prefixlen = strlen(prefix); |
2485 |
+ if((d = opendir(dir)) != NULL) { |
2486 |
+ while((de = readdir(d)) != NULL) { |
2487 |
+ if(strlen(de->d_name) > prefixlen && |
2488 |
+ !strncmp(prefix, de->d_name, prefixlen) && |
2489 |
+ strcmp(de->d_name, ".") != 0 && |
2490 |
+ strcmp(de->d_name, "..")) { |
2491 |
+ fullfilename = wstrconcat((char*)dir, "/"); |
2492 |
+ fullfilename = wstrappend(fullfilename, de->d_name); |
2493 |
+ |
2494 |
+ if(stat(fullfilename, &sb) == 0 && |
2495 |
+ (sb.st_mode & acceptmask) && |
2496 |
+ !(sb.st_mode & declinemask) && |
2497 |
+ WMFindInArray(result, (WMMatchDataProc*)strmatch, |
2498 |
+ de->d_name + prefixlen) == WANotFound) { |
2499 |
+ suffix = wstrdup(de->d_name + prefixlen); |
2500 |
+ WMAddToArray(result, suffix); |
2501 |
+ } |
2502 |
+ wfree(fullfilename); |
2503 |
+ } |
2504 |
+ } |
2505 |
+ closedir(d); |
2506 |
+ } |
2507 |
+} |
2508 |
+ |
2509 |
+static WMArray * |
2510 |
+GenerateVariants(const char * complete) |
2511 |
+{ |
2512 |
+ Bool firstWord = True; |
2513 |
+ WMArray *variants = NULL; |
2514 |
+ char *pos = NULL, *path = NULL, *tmp = NULL, *dir = NULL, *prefix = NULL; |
2515 |
+ |
2516 |
+ variants = WMCreateArrayWithDestructor(0, wfree); |
2517 |
+ |
2518 |
+ while(*complete == ' ') ++complete; |
2519 |
+ |
2520 |
+ if((pos = strrchr(complete, ' ')) != NULL) { |
2521 |
+ complete = pos + 1; |
2522 |
+ firstWord = False; |
2523 |
+ } |
2524 |
+ |
2525 |
+ if((pos = strrchr(complete, '/')) != NULL) { |
2526 |
+ tmp = wstrndup((char*)complete, pos - complete + 1); |
2527 |
+ if(*tmp == '~' && *(tmp+1) == '/' && getenv("HOME")) { |
2528 |
+ dir = wstrdup(getenv("HOME")); |
2529 |
+ dir = wstrappend(dir, tmp + 1); |
2530 |
+ wfree(tmp); |
2531 |
+ } else { |
2532 |
+ dir = tmp; |
2533 |
+ } |
2534 |
+ prefix = wstrdup(pos + 1); |
2535 |
+ ScanFiles(dir, prefix, (unsigned)-1, 0, variants); |
2536 |
+ wfree(dir); |
2537 |
+ wfree(prefix); |
2538 |
+ } else if(*complete == '~') { |
2539 |
+ WMAddToArray(variants, wstrdup("/")); |
2540 |
+ } else if(firstWord) { |
2541 |
+ path = getenv("PATH"); |
2542 |
+ while(path) { |
2543 |
+ pos = strchr(path, ':'); |
2544 |
+ if(pos) { |
2545 |
+ tmp = wstrndup(path, pos - path); |
2546 |
+ path = pos + 1; |
2547 |
+ } else if(*path != '\0') { |
2548 |
+ tmp = wstrdup(path); |
2549 |
+ path = NULL; |
2550 |
+ } else break; |
2551 |
+ ScanFiles(tmp, complete, |
2552 |
+ S_IXOTH | S_IXGRP | S_IXUSR, S_IFDIR, variants); |
2553 |
+ wfree(tmp); |
2554 |
+ } |
2555 |
+ } |
2556 |
+ |
2557 |
+ WMSortArray(variants, (WMCompareDataProc*)pstrcmp); |
2558 |
+ return variants; |
2559 |
+} |
2560 |
+ |
2561 |
+static void |
2562 |
+handleHistoryKeyPress(XEvent *event, void *clientData) |
2563 |
+{ |
2564 |
+ char *text; |
2565 |
+ unsigned pos; |
2566 |
+ WMInputPanelWithHistory *p = (WMInputPanelWithHistory*)clientData; |
2567 |
+ KeySym ksym; |
2568 |
+ |
2569 |
+ ksym = XLookupKeysym(&event->xkey, 0); |
2570 |
+ |
2571 |
+ switch(ksym) |
2572 |
+ { |
2573 |
+ case XK_Up: |
2574 |
+ if(p->histpos < WMGetArrayItemCount(p->history) - 1) { |
2575 |
+ if(p->histpos == 0) |
2576 |
+ wfree(WMReplaceInArray(p->history, |
2577 |
+ 0, WMGetTextFieldText(p->panel->text))); |
2578 |
+ p->histpos++; |
2579 |
+ WMSetTextFieldText(p->panel->text, |
2580 |
+ WMGetFromArray(p->history, p->histpos)); |
2581 |
+ } |
2582 |
+ break; |
2583 |
+ case XK_Down: |
2584 |
+ if(p->histpos > 0) { |
2585 |
+ p->histpos--; |
2586 |
+ WMSetTextFieldText(p->panel->text, |
2587 |
+ WMGetFromArray(p->history, p->histpos)); |
2588 |
+ } |
2589 |
+ break; |
2590 |
+ case XK_Tab: |
2591 |
+ if(!p->variants) { |
2592 |
+ text = WMGetTextFieldText(p->panel->text); |
2593 |
+ pos = WMGetTextFieldCursorPosition(p->panel->text); |
2594 |
+ p->prefix = wstrndup(text, pos); |
2595 |
+ p->suffix = wstrdup(text + pos); |
2596 |
+ wfree(text); |
2597 |
+ p->variants = GenerateVariants(p->prefix); |
2598 |
+ p->varpos = 0; |
2599 |
+ if(!p->variants) { |
2600 |
+ wfree(p->prefix); |
2601 |
+ wfree(p->suffix); |
2602 |
+ p->prefix = NULL; |
2603 |
+ p->suffix = NULL; |
2604 |
+ } |
2605 |
+ } |
2606 |
+ if(p->variants && p->prefix && p->suffix) { |
2607 |
+ p->varpos++; |
2608 |
+ if(p->varpos > WMGetArrayItemCount(p->variants)) |
2609 |
+ p->varpos = 0; |
2610 |
+ if(p->varpos > 0) |
2611 |
+ text = wstrconcat(p->prefix, |
2612 |
+ WMGetFromArray(p->variants, p->varpos - 1)); |
2613 |
+ else |
2614 |
+ text = wstrdup(p->prefix); |
2615 |
+ pos = strlen(text); |
2616 |
+ text = wstrappend(text, p->suffix); |
2617 |
+ WMSetTextFieldText(p->panel->text, text); |
2618 |
+ WMSetTextFieldCursorPosition(p->panel->text, pos); |
2619 |
+ wfree(text); |
2620 |
+ } |
2621 |
+ break; |
2622 |
+ } |
2623 |
+ if(ksym != XK_Tab) { |
2624 |
+ if(p->prefix) { |
2625 |
+ wfree(p->prefix); |
2626 |
+ p->prefix = NULL; |
2627 |
+ } |
2628 |
+ if(p->suffix) { |
2629 |
+ wfree(p->suffix); |
2630 |
+ p->suffix = NULL; |
2631 |
+ } |
2632 |
+ if(p->variants) { |
2633 |
+ WMFreeArray(p->variants); |
2634 |
+ p->variants = NULL; |
2635 |
+ } |
2636 |
+ } |
2637 |
+} |
2638 |
+ |
2639 |
+int |
2640 |
+wAdvancedInputDialog(WScreen *scr, char *title, char *message, |
2641 |
+ char *name, char **text) |
2642 |
+{ |
2643 |
+ WWindow *wwin; |
2644 |
+ Window parent; |
2645 |
+ char *result; |
2646 |
+ WMPoint center; |
2647 |
+ WMInputPanelWithHistory *p; |
2648 |
+ char *filename; |
2649 |
+ |
2650 |
+ filename = HistoryFileName(name); |
2651 |
+ p = wmalloc(sizeof(WMInputPanelWithHistory)); |
2652 |
+ p->panel = WMCreateInputPanel(scr->wmscreen, NULL, title, message, *text, |
2653 |
+ _("OK"), _("Cancel")); |
2654 |
+ p->history = LoadHistory(filename, wPreferences.history_lines); |
2655 |
+ p->histpos = 0; |
2656 |
+ p->prefix = NULL; |
2657 |
+ p->suffix = NULL; |
2658 |
+ p->rest = NULL; |
2659 |
+ p->variants = NULL; |
2660 |
+ p->varpos = 0; |
2661 |
+ WMCreateEventHandler(WMWidgetView(p->panel->text), KeyPressMask, |
2662 |
+ handleHistoryKeyPress, p); |
2663 |
+ |
2664 |
+ parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, 320, 160, 0, 0, 0); |
2665 |
+ XSelectInput(dpy, parent, KeyPressMask|KeyReleaseMask); |
2666 |
+ |
2667 |
+ XReparentWindow(dpy, WMWidgetXID(p->panel->win), parent, 0, 0); |
2668 |
+ |
2669 |
+ center = getCenter(scr, 320, 160); |
2670 |
+ wwin = wManageInternalWindow(scr, parent, None, NULL, center.x, center.y, |
2671 |
+ 320, 160); |
2672 |
+ |
2673 |
+ wwin->client_leader = WMWidgetXID(p->panel->win); |
2674 |
+ |
2675 |
+ WMMapWidget(p->panel->win); |
2676 |
+ |
2677 |
+ wWindowMap(wwin); |
2678 |
+ |
2679 |
+ WMRunModalLoop(WMWidgetScreen(p->panel->win), WMWidgetView(p->panel->win)); |
2680 |
+ |
2681 |
+ if (p->panel->result == WAPRDefault) { |
2682 |
+ result = WMGetTextFieldText(p->panel->text); |
2683 |
+ wfree(WMReplaceInArray(p->history, 0, wstrdup(result))); |
2684 |
+ SaveHistory(p->history, filename); |
2685 |
+ } |
2686 |
+ else |
2687 |
+ result = NULL; |
2688 |
+ |
2689 |
+ wUnmanageWindow(wwin, False, False); |
2690 |
+ |
2691 |
+ WMDestroyInputPanel(p->panel); |
2692 |
+ WMFreeArray(p->history); |
2693 |
+ wfree(p); |
2694 |
+ wfree(filename); |
2695 |
+ |
2696 |
+ XDestroyWindow(dpy, parent); |
2697 |
+ |
2698 |
+ if (result==NULL) |
2699 |
+ return False; |
2700 |
+ else { |
2701 |
+ if (*text) |
2702 |
+ wfree(*text); |
2703 |
+ *text = result; |
2704 |
+ |
2705 |
+ return True; |
2706 |
+ } |
2707 |
+} |
2708 |
|
2709 |
int |
2710 |
wInputDialog(WScreen *scr, char *title, char *message, char **text) |
2711 |
--- WindowMaker-0.91.0/src/dialog.h.vns 2004-10-12 21:54:37 +0400 |
2712 |
+++ WindowMaker-0.91.0/src/dialog.h 2005-05-18 18:11:54 +0400 |
2713 |
@@ -33,6 +33,7 @@ |
2714 |
|
2715 |
int wMessageDialog(WScreen *scr, char *title, char *message, |
2716 |
char *defBtn, char *altBtn, char *othBtn); |
2717 |
+int wAdvancedInputDialog(WScreen *scr, char *title, char *message, char *name, char **text); |
2718 |
int wInputDialog(WScreen *scr, char *title, char *message, char **text); |
2719 |
|
2720 |
int wExitDialog(WScreen *scr, char *title, char *message, char *defBtn, |
2721 |
--- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 18:08:11 +0400 |
2722 |
+++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 18:08:11 +0400 |
2723 |
@@ -894,6 +894,9 @@ |
2724 |
}, |
2725 |
{"SelectCursor", "(builtin, cross)", (void*)WCUR_SELECT, |
2726 |
NULL, getCursor, setCursor |
2727 |
+ }, |
2728 |
+ {"DialogHistoryLines", "500", NULL, |
2729 |
+ &wPreferences.history_lines, getInt, NULL |
2730 |
} |
2731 |
}; |
2732 |
|
2733 |
--- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 18:08:11 +0400 |
2734 |
+++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 18:08:11 +0400 |
2735 |
@@ -491,6 +491,7 @@ |
2736 |
char single_click; |
2737 |
|
2738 |
int show_clip_title; |
2739 |
+ int history_lines; |
2740 |
|
2741 |
struct { |
2742 |
unsigned int nodock:1; /* don't display the dock */ |
2743 |
|
2744 |
|
2745 |
|
2746 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-clipnotext.patch |
2747 |
|
2748 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-clipnotext.patch?rev=1.1&view=markup |
2749 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-clipnotext.patch?rev=1.1&content-type=text/plain |
2750 |
|
2751 |
Index: WindowMaker-0.91.0-alt-clipnotext.patch |
2752 |
=================================================================== |
2753 |
--- WindowMaker-0.91.0/src/dock.c.vns 2005-05-18 16:29:46 +0400 |
2754 |
+++ WindowMaker-0.91.0/src/dock.c 2005-05-18 16:31:23 +0400 |
2755 |
@@ -1295,8 +1295,9 @@ |
2756 |
|
2757 |
tx = CLIP_BUTTON_SIZE*ICON_SIZE/64; |
2758 |
|
2759 |
- WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, tx, |
2760 |
- ty, ws_name, length); |
2761 |
+ if(wPreferences.show_clip_title) |
2762 |
+ WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, tx, |
2763 |
+ ty, ws_name, length); |
2764 |
/*WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, 4, |
2765 |
2, ws_name, length);*/ |
2766 |
|
2767 |
--- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 16:29:46 +0400 |
2768 |
+++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 16:29:46 +0400 |
2769 |
@@ -633,6 +633,9 @@ |
2770 |
{"ClipTitleFont", DEF_CLIP_TITLE_FONT, NULL, |
2771 |
NULL, getFont, setClipTitleFont |
2772 |
}, |
2773 |
+ {"ShowClipTitle", "YES", NULL, |
2774 |
+ &wPreferences.show_clip_title, getBool, NULL |
2775 |
+ }, |
2776 |
{"LargeDisplayFont",DEF_WORKSPACE_NAME_FONT, NULL, |
2777 |
NULL, getFont, setLargeDisplayFont |
2778 |
}, |
2779 |
--- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 16:29:46 +0400 |
2780 |
+++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 16:29:46 +0400 |
2781 |
@@ -490,6 +490,8 @@ |
2782 |
/* single click to lauch applications */ |
2783 |
char single_click; |
2784 |
|
2785 |
+ int show_clip_title; |
2786 |
+ |
2787 |
struct { |
2788 |
unsigned int nodock:1; /* don't display the dock */ |
2789 |
unsigned int noclip:1; /* don't display the clip */ |
2790 |
|
2791 |
|
2792 |
|
2793 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-dockhotkeys.patch |
2794 |
|
2795 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-dockhotkeys.patch?rev=1.1&view=markup |
2796 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-dockhotkeys.patch?rev=1.1&content-type=text/plain |
2797 |
|
2798 |
Index: WindowMaker-0.91.0-alt-dockhotkeys.patch |
2799 |
=================================================================== |
2800 |
--- WindowMaker-0.91.0/src/dock.c.vns 2005-05-18 11:49:00 +0400 |
2801 |
+++ WindowMaker-0.91.0/src/dock.c 2005-05-18 12:01:06 +0400 |
2802 |
@@ -96,6 +96,7 @@ |
2803 |
#ifdef XDND /* XXX was OFFIX */ |
2804 |
static WMPropList *dDropCommand=NULL; |
2805 |
#endif |
2806 |
+static WMPropList *dKeyboardShortcut=NULL; |
2807 |
static WMPropList *dAutoLaunch, *dLock; |
2808 |
static WMPropList *dName, *dForced, *dBuggyApplication, *dYes, *dNo; |
2809 |
static WMPropList *dHost, *dDock, *dClip; |
2810 |
@@ -151,6 +152,7 @@ |
2811 |
#ifdef XDND |
2812 |
dDropCommand = WMRetainPropList(WMCreatePLString("DropCommand")); |
2813 |
#endif |
2814 |
+ dKeyboardShortcut = WMRetainPropList(WMCreatePLString("Shortcut")); |
2815 |
dLock = WMRetainPropList(WMCreatePLString("Lock")); |
2816 |
dAutoLaunch = WMRetainPropList(WMCreatePLString("AutoLaunch")); |
2817 |
dName = WMRetainPropList(WMCreatePLString("Name")); |
2818 |
@@ -1398,6 +1400,12 @@ |
2819 |
WMReleasePropList(command); |
2820 |
} |
2821 |
|
2822 |
+ if (btn->keyboard_shortcut) { |
2823 |
+ command = WMCreatePLString(btn->keyboard_shortcut); |
2824 |
+ WMPutInPLDictionary(node, dKeyboardShortcut, command); |
2825 |
+ WMReleasePropList(command); |
2826 |
+ } |
2827 |
+ |
2828 |
if (btn->client_machine && btn->remote_start) { |
2829 |
host = WMCreatePLString(btn->client_machine); |
2830 |
WMPutInPLDictionary(node, dHost, host); |
2831 |
@@ -1613,6 +1621,12 @@ |
2832 |
aicon->dnd_command = wstrdup(WMGetFromPLString(cmd)); |
2833 |
#endif |
2834 |
|
2835 |
+ cmd = WMGetFromPLDictionary(info, dKeyboardShortcut); |
2836 |
+ if (cmd) { |
2837 |
+ if(addDockShortcut(WMGetFromPLString(cmd), aicon)) |
2838 |
+ aicon->keyboard_shortcut = wstrdup(WMGetFromPLString(cmd)); |
2839 |
+ } |
2840 |
+ |
2841 |
cmd = WMGetFromPLDictionary(info, dPasteCommand); |
2842 |
if (cmd) |
2843 |
aicon->paste_command = wstrdup(WMGetFromPLString(cmd)); |
2844 |
@@ -1918,6 +1932,8 @@ |
2845 |
if (type == WM_DOCK) |
2846 |
dock->icon_count = 0; |
2847 |
|
2848 |
+ dock->screen_ptr->flags.dock_changed_shortcuts = 0; |
2849 |
+ |
2850 |
for (i=0; i<count; i++) { |
2851 |
if (dock->icon_count >= dock->max_icons) { |
2852 |
wwarning(_("there are too many icons stored in dock. Ignoring what doesn't fit")); |
2853 |
@@ -1950,6 +1966,11 @@ |
2854 |
} else if (dock->icon_count==0 && type==WM_DOCK) |
2855 |
dock->icon_count++; |
2856 |
} |
2857 |
+ if(dock->screen_ptr->flags.dock_changed_shortcuts) |
2858 |
+ { |
2859 |
+ rebindKeygrabs(dock->screen_ptr); |
2860 |
+ dock->screen_ptr->flags.dock_changed_shortcuts = 0; |
2861 |
+ } |
2862 |
|
2863 |
/* if the first icon is not defined, use the default */ |
2864 |
if (dock->icon_array[0]==NULL) { |
2865 |
@@ -4479,3 +4500,125 @@ |
2866 |
return status; |
2867 |
} |
2868 |
|
2869 |
+Bool |
2870 |
+addDockShortcut(char *shortcutDefinition, WAppIcon *icon) |
2871 |
+{ |
2872 |
+ int modifier = 0; |
2873 |
+ KeyCode keycode; |
2874 |
+ KeySym ksym; |
2875 |
+ char *k; |
2876 |
+ char buf[128], *b; |
2877 |
+ |
2878 |
+ strcpy(buf, shortcutDefinition); |
2879 |
+ b = (char*)buf; |
2880 |
+ |
2881 |
+ /* get modifiers */ |
2882 |
+ while((k = strchr(b, '+'))!=NULL) { |
2883 |
+ int mod; |
2884 |
+ |
2885 |
+ *k = 0; |
2886 |
+ mod = wXModifierFromKey(b); |
2887 |
+ if(mod < 0) { |
2888 |
+ wwarning(_("invalid key modifier \"%s\""), b); |
2889 |
+ return False; |
2890 |
+ } |
2891 |
+ modifier |= mod; |
2892 |
+ |
2893 |
+ b = k+1; |
2894 |
+ } |
2895 |
+ |
2896 |
+ /* get key */ |
2897 |
+ ksym = XStringToKeysym(b); |
2898 |
+ |
2899 |
+ if (ksym==NoSymbol) { |
2900 |
+ wwarning(_("invalid kbd shortcut specification \"%s\""), shortcutDefinition); |
2901 |
+ return False; |
2902 |
+ } |
2903 |
+ |
2904 |
+ keycode = XKeysymToKeycode(dpy, ksym); |
2905 |
+ if (keycode==0) { |
2906 |
+ wwarning(_("invalid key in shortcut \"%s\""), shortcutDefinition); |
2907 |
+ return False; |
2908 |
+ } |
2909 |
+ icon->modifier = modifier; |
2910 |
+ icon->keycode = keycode; |
2911 |
+ if(icon->dock && icon->dock->screen_ptr) |
2912 |
+ icon->dock->screen_ptr->flags.dock_changed_shortcuts = 1; |
2913 |
+ return True; |
2914 |
+} |
2915 |
+ |
2916 |
+static Bool |
2917 |
+wDockPerformShortcut(WDock *dock, XEvent *event) |
2918 |
+{ |
2919 |
+ int i; |
2920 |
+ int modifiers; |
2921 |
+ int done = 0; |
2922 |
+ |
2923 |
+ if(!dock) return done; |
2924 |
+ modifiers = event->xkey.state & ValidModMask; |
2925 |
+ for(i=(dock->type==WM_DOCK ? 0 : 1); i<dock->max_icons; i++) { |
2926 |
+ WAppIcon *btn = dock->icon_array[i]; |
2927 |
+ |
2928 |
+ if(!btn || btn->attracted) |
2929 |
+ continue; |
2930 |
+ |
2931 |
+ if(btn->keycode==event->xkey.keycode && (btn->modifier==modifiers)) { |
2932 |
+ launchDockedApplication(btn, False); |
2933 |
+ done = True; |
2934 |
+ break; |
2935 |
+ } |
2936 |
+ |
2937 |
+ } |
2938 |
+ return done; |
2939 |
+} |
2940 |
+ |
2941 |
+Bool |
2942 |
+wDockAndClipPerformShortcut(WScreen *scr, XEvent *event) |
2943 |
+{ |
2944 |
+ int done = 0; |
2945 |
+ int i; |
2946 |
+ if(!(done = wDockPerformShortcut(scr->dock, event))) { |
2947 |
+ for(i=0; i < scr->workspace_count; i++) { |
2948 |
+ if(done = wDockPerformShortcut(scr->workspaces[i]->clip, event)) break; |
2949 |
+ } |
2950 |
+ } |
2951 |
+ return done; |
2952 |
+} |
2953 |
+ |
2954 |
+static void |
2955 |
+wDockBindShortcuts(Window window, WDock* dock) |
2956 |
+{ |
2957 |
+ int i; |
2958 |
+ if(!dock) return; |
2959 |
+ for(i=(dock->type==WM_DOCK ? 0 : 1); i<dock->max_icons; i++) { |
2960 |
+ WAppIcon *btn = dock->icon_array[i]; |
2961 |
+ |
2962 |
+ if(!btn || btn->attracted) |
2963 |
+ continue; |
2964 |
+ |
2965 |
+ if(btn->keyboard_shortcut) |
2966 |
+ { |
2967 |
+ if(btn->keyboard_shortcut && btn->modifier!=AnyModifier) { |
2968 |
+ XGrabKey(dpy, btn->keycode, btn->modifier|LockMask, |
2969 |
+ window, True, GrabModeAsync, GrabModeAsync); |
2970 |
+#ifdef NUMLOCK_HACK |
2971 |
+ wHackedGrabKey(btn->keycode, btn->modifier, |
2972 |
+ window, True, GrabModeAsync, GrabModeAsync); |
2973 |
+#endif |
2974 |
+ } |
2975 |
+ XGrabKey(dpy, btn->keycode, btn->modifier, window, True, |
2976 |
+ GrabModeAsync, GrabModeAsync); |
2977 |
+ } |
2978 |
+ } |
2979 |
+} |
2980 |
+ |
2981 |
+void |
2982 |
+wDockAndClipBindShortcuts(Window window, WScreen *scr) |
2983 |
+{ |
2984 |
+ int i; |
2985 |
+ wDockBindShortcuts(window, scr->dock); |
2986 |
+ for(i=0; i < scr->workspace_count; i++ ) { |
2987 |
+ wDockBindShortcuts(window, scr->workspaces[i]->clip); |
2988 |
+ } |
2989 |
+} |
2990 |
+ |
2991 |
--- WindowMaker-0.91.0/src/appicon.c.vns 2005-05-18 11:49:00 +0400 |
2992 |
+++ WindowMaker-0.91.0/src/appicon.c 2005-05-18 11:49:00 +0400 |
2993 |
@@ -197,6 +197,8 @@ |
2994 |
if (aicon->dnd_command) |
2995 |
wfree(aicon->dnd_command); |
2996 |
#endif |
2997 |
+ if (aicon->keyboard_shortcut) |
2998 |
+ wfree(aicon->keyboard_shortcut); |
2999 |
if (aicon->wm_instance) |
3000 |
wfree(aicon->wm_instance); |
3001 |
if (aicon->wm_class) |
3002 |
--- WindowMaker-0.91.0/src/appicon.h.vns 2004-10-14 21:31:49 +0400 |
3003 |
+++ WindowMaker-0.91.0/src/appicon.h 2005-05-18 11:50:01 +0400 |
3004 |
@@ -52,6 +52,10 @@ |
3005 |
|
3006 |
char *paste_command; /* command to run when something is pasted */ |
3007 |
|
3008 |
+ char *keyboard_shortcut; /* keyboard shortcut to launch app */ |
3009 |
+ int modifier; |
3010 |
+ KeyCode keycode; |
3011 |
+ |
3012 |
char *wm_class; |
3013 |
char *wm_instance; |
3014 |
pid_t pid; /* for apps launched from the dock */ |
3015 |
--- WindowMaker-0.91.0/src/dockedapp.c.vns 2004-10-14 21:31:49 +0400 |
3016 |
+++ WindowMaker-0.91.0/src/dockedapp.c 2005-05-18 11:56:22 +0400 |
3017 |
@@ -25,6 +25,7 @@ |
3018 |
|
3019 |
#include <X11/Xlib.h> |
3020 |
#include <X11/Xutil.h> |
3021 |
+#include <X11/keysym.h> |
3022 |
#include <stdlib.h> |
3023 |
#include <string.h> |
3024 |
|
3025 |
@@ -66,6 +67,10 @@ |
3026 |
WMTextField *pasteCommandField; |
3027 |
WMLabel *pasteCommandLabel; |
3028 |
|
3029 |
+ WMFrame *keyboardShortcutFrame; |
3030 |
+ WMTextField *keyboardShortcutField; |
3031 |
+ WMButton *keyboardShortcutCaptureBtn; |
3032 |
+ |
3033 |
WMFrame *iconFrame; |
3034 |
WMTextField *iconField; |
3035 |
WMButton *browseBtn; |
3036 |
@@ -81,6 +86,7 @@ |
3037 |
/* kluge */ |
3038 |
unsigned int destroyed:1; |
3039 |
unsigned int choosingIcon:1; |
3040 |
+ unsigned int capturing:1; |
3041 |
} AppSettingsPanel; |
3042 |
|
3043 |
|
3044 |
@@ -117,6 +123,43 @@ |
3045 |
icon->paste_command = command; |
3046 |
} |
3047 |
|
3048 |
+static char* |
3049 |
+trimstr(char *str) |
3050 |
+{ |
3051 |
+ char *p = str; |
3052 |
+ int i; |
3053 |
+ |
3054 |
+ while (isspace(*p)) p++; |
3055 |
+ p = wstrdup(p); |
3056 |
+ i = strlen(p); |
3057 |
+ while (isspace(p[i]) && i>0) { |
3058 |
+ p[i]=0; |
3059 |
+ i--; |
3060 |
+ } |
3061 |
+ |
3062 |
+ return p; |
3063 |
+} |
3064 |
+ |
3065 |
+static void |
3066 |
+updateKeyboardShortcut(WAppIcon *icon, char *shortcut) |
3067 |
+{ |
3068 |
+ char *str = NULL; |
3069 |
+ if(icon->keyboard_shortcut) |
3070 |
+ wfree(icon->keyboard_shortcut); |
3071 |
+ if(shortcut) { |
3072 |
+ str = trimstr(shortcut); |
3073 |
+ if(!strlen(str)) { |
3074 |
+ wfree(str); |
3075 |
+ str = NULL; |
3076 |
+ } |
3077 |
+ } |
3078 |
+ icon->keyboard_shortcut = str; |
3079 |
+ icon->modifier = 0; |
3080 |
+ icon->keycode = 0; |
3081 |
+ if(str) addDockShortcut(str, icon); |
3082 |
+ rebindKeygrabs(icon->dock->screen_ptr); |
3083 |
+} |
3084 |
+ |
3085 |
|
3086 |
|
3087 |
#ifdef XDND |
3088 |
@@ -267,6 +310,8 @@ |
3089 |
text = WMGetTextFieldText(panel->pasteCommandField); |
3090 |
updatePasteCommand(panel->editedIcon, text); |
3091 |
|
3092 |
+ text = WMGetTextFieldText(panel->keyboardShortcutField); |
3093 |
+ updateKeyboardShortcut(panel->editedIcon, text); |
3094 |
|
3095 |
panel->editedIcon->auto_launch = |
3096 |
WMGetButtonSelected(panel->autoLaunchBtn); |
3097 |
@@ -279,9 +324,83 @@ |
3098 |
DestroyDockAppSettingsPanel(panel); |
3099 |
} |
3100 |
|
3101 |
+static char* |
3102 |
+captureShortcut(Display *dpy, AppSettingsPanel *panel) |
3103 |
+{ |
3104 |
+ XEvent ev; |
3105 |
+ KeySym ksym, lksym, uksym; |
3106 |
+ char buffer[64]; |
3107 |
+ char *key = NULL; |
3108 |
+ |
3109 |
+ while (panel->capturing) { |
3110 |
+ XAllowEvents(dpy, AsyncKeyboard, CurrentTime); |
3111 |
+ WMNextEvent(dpy, &ev); |
3112 |
+ if (ev.type==KeyPress && ev.xkey.keycode!=0) { |
3113 |
+ ksym = XKeycodeToKeysym(dpy, ev.xkey.keycode, 0); |
3114 |
+ if (!IsModifierKey(ksym)) { |
3115 |
+ XConvertCase(ksym, &lksym, &uksym); |
3116 |
+ key=XKeysymToString(uksym); |
3117 |
+ panel->capturing = 0; |
3118 |
+ break; |
3119 |
+ } |
3120 |
+ } |
3121 |
+ WMHandleEvent(&ev); |
3122 |
+ } |
3123 |
+ if (!key) |
3124 |
+ return NULL; |
3125 |
+ |
3126 |
+ buffer[0] = 0; |
3127 |
+ if (ev.xkey.state & ControlMask) { |
3128 |
+ strcat(buffer, "Control+"); |
3129 |
+ } |
3130 |
+ if (ev.xkey.state & ShiftMask) { |
3131 |
+ strcat(buffer, "Shift+"); |
3132 |
+ } |
3133 |
+ if (ev.xkey.state & Mod1Mask) { |
3134 |
+ strcat(buffer, "Mod1+"); |
3135 |
+ } |
3136 |
+ if (ev.xkey.state & Mod2Mask) { |
3137 |
+ strcat(buffer, "Mod2+"); |
3138 |
+ } |
3139 |
+ if (ev.xkey.state & Mod3Mask) { |
3140 |
+ strcat(buffer, "Mod3+"); |
3141 |
+ } |
3142 |
+ if (ev.xkey.state & Mod4Mask) { |
3143 |
+ strcat(buffer, "Mod4+"); |
3144 |
+ } |
3145 |
+ if (ev.xkey.state & Mod5Mask) { |
3146 |
+ strcat(buffer, "Mod5+"); |
3147 |
+ } |
3148 |
+ strcat(buffer, key); |
3149 |
+ |
3150 |
+ return wstrdup(buffer); |
3151 |
+} |
3152 |
+ |
3153 |
+static void |
3154 |
+captureClick(WMWidget *w, void *data) |
3155 |
+{ |
3156 |
+ AppSettingsPanel *panel = (AppSettingsPanel*)data; |
3157 |
+ char *shortcut; |
3158 |
+ |
3159 |
+ if(!panel->capturing) { |
3160 |
+ panel->capturing = 1; |
3161 |
+ WMSetButtonText(w, _("Cancel")); |
3162 |
+ XGrabKeyboard(dpy, WMWidgetXID(panel->win), True, GrabModeAsync, |
3163 |
+ GrabModeAsync, CurrentTime); |
3164 |
+ shortcut = captureShortcut(dpy, panel); |
3165 |
+ if (shortcut) { |
3166 |
+ WMSetTextFieldText(panel->keyboardShortcutField, shortcut); |
3167 |
+ wfree(shortcut); |
3168 |
+ } |
3169 |
+ } |
3170 |
+ panel->capturing = 0; |
3171 |
+ WMSetButtonText(w, _("Capture")); |
3172 |
+ XUngrabKeyboard(dpy, CurrentTime); |
3173 |
+} |
3174 |
+ |
3175 |
|
3176 |
#define PWIDTH 295 |
3177 |
-#define PHEIGHT 430 |
3178 |
+#define PHEIGHT 490 |
3179 |
|
3180 |
|
3181 |
void |
3182 |
@@ -396,6 +515,21 @@ |
3183 |
#endif |
3184 |
WMMapSubwidgets(panel->dndCommandFrame); |
3185 |
|
3186 |
+ panel->keyboardShortcutFrame = WMCreateFrame(vbox); |
3187 |
+ WMSetFrameTitle(panel->keyboardShortcutFrame, _("Keyboard shortcut")); |
3188 |
+ WMAddBoxSubview(vbox, WMWidgetView(panel->keyboardShortcutFrame), False, True, |
3189 |
+ 50, 50, 10); |
3190 |
+ panel->keyboardShortcutField = WMCreateTextField(panel->keyboardShortcutFrame); |
3191 |
+ WMResizeWidget(panel->keyboardShortcutField, 176, 20); |
3192 |
+ WMMoveWidget(panel->keyboardShortcutField, 10, 20); |
3193 |
+ WMSetTextFieldText(panel->keyboardShortcutField, aicon->keyboard_shortcut); |
3194 |
+ panel->keyboardShortcutCaptureBtn = WMCreateCommandButton(panel->keyboardShortcutFrame); |
3195 |
+ WMSetButtonText(panel->keyboardShortcutCaptureBtn, _("Capture")); |
3196 |
+ WMResizeWidget(panel->keyboardShortcutCaptureBtn, 70, 24); |
3197 |
+ WMMoveWidget(panel->keyboardShortcutCaptureBtn, 195, 18); |
3198 |
+ WMSetButtonAction(panel->keyboardShortcutCaptureBtn, captureClick, panel); |
3199 |
+ WMMapSubwidgets(panel->keyboardShortcutFrame); |
3200 |
+ |
3201 |
panel->iconFrame = WMCreateFrame(vbox); |
3202 |
WMSetFrameTitle(panel->iconFrame, _("Icon Image")); |
3203 |
WMAddBoxSubview(vbox, WMWidgetView(panel->iconFrame), False, True, |
3204 |
--- WindowMaker-0.91.0/src/event.c.vns 2004-10-24 23:19:50 +0400 |
3205 |
+++ WindowMaker-0.91.0/src/event.c 2005-05-18 11:57:21 +0400 |
3206 |
@@ -1364,7 +1364,7 @@ |
3207 |
} |
3208 |
#endif |
3209 |
#else |
3210 |
- if (!wRootMenuPerformShortcut(event)) { |
3211 |
+ if (!wRootMenuPerformShortcut(event) && !wDockAndClipPerformShortcut(scr, event)) { |
3212 |
#endif |
3213 |
static int dontLoop = 0; |
3214 |
|
3215 |
--- WindowMaker-0.91.0/src/rootmenu.c.vns 2005-05-18 11:49:00 +0400 |
3216 |
+++ WindowMaker-0.91.0/src/rootmenu.c 2005-05-18 11:49:00 +0400 |
3217 |
@@ -466,7 +466,7 @@ |
3218 |
} |
3219 |
|
3220 |
|
3221 |
-static void |
3222 |
+void |
3223 |
rebindKeygrabs(WScreen *scr) |
3224 |
{ |
3225 |
WWindow *wwin; |
3226 |
--- WindowMaker-0.91.0/src/screen.h.vns 2004-10-23 03:58:59 +0400 |
3227 |
+++ WindowMaker-0.91.0/src/screen.h 2005-05-18 11:58:11 +0400 |
3228 |
@@ -307,6 +307,7 @@ |
3229 |
unsigned int regenerate_icon_textures:1; |
3230 |
unsigned int dnd_data_convertion_status:1; |
3231 |
unsigned int root_menu_changed_shortcuts:1; |
3232 |
+ unsigned int dock_changed_shortcuts:1; |
3233 |
unsigned int added_workspace_menu:1; |
3234 |
unsigned int added_windows_menu:1; |
3235 |
unsigned int startup2:1; /* startup phase 2 */ |
3236 |
--- WindowMaker-0.91.0/src/window.c.vns 2005-05-18 11:49:00 +0400 |
3237 |
+++ WindowMaker-0.91.0/src/window.c 2005-05-18 11:49:00 +0400 |
3238 |
@@ -2820,6 +2820,7 @@ |
3239 |
|
3240 |
#ifndef LITE |
3241 |
wRootMenuBindShortcuts(wwin->frame->core->window); |
3242 |
+ wDockAndClipBindShortcuts(wwin->frame->core->window, wwin->screen_ptr); |
3243 |
#endif |
3244 |
} |
3245 |
|
3246 |
|
3247 |
|
3248 |
|
3249 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-focus.patch |
3250 |
|
3251 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-focus.patch?rev=1.1&view=markup |
3252 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-focus.patch?rev=1.1&content-type=text/plain |
3253 |
|
3254 |
Index: WindowMaker-0.91.0-alt-focus.patch |
3255 |
=================================================================== |
3256 |
--- WindowMaker-0.91.0/src/actions.c.vns 2005-05-18 22:16:13 +0400 |
3257 |
+++ WindowMaker-0.91.0/src/actions.c 2005-05-18 22:17:23 +0400 |
3258 |
@@ -1251,6 +1251,9 @@ |
3259 |
/* In case we were shaded and iconified, also unshade */ |
3260 |
if (!netwm_hidden) |
3261 |
wUnshadeWindow(wwin); |
3262 |
+ |
3263 |
+ if (wwin->flags.focused) |
3264 |
+ wSetFocusTo(wwin->screen_ptr, wwin); |
3265 |
} |
3266 |
|
3267 |
|
3268 |
|
3269 |
|
3270 |
|
3271 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-menutrans.patch |
3272 |
|
3273 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-menutrans.patch?rev=1.1&view=markup |
3274 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-menutrans.patch?rev=1.1&content-type=text/plain |
3275 |
|
3276 |
Index: WindowMaker-0.91.0-alt-menutrans.patch |
3277 |
=================================================================== |
3278 |
--- WindowMaker-0.91.0/src/rootmenu.c.vns 2005-05-18 14:12:23 +0400 |
3279 |
+++ WindowMaker-0.91.0/src/rootmenu.c 2005-05-18 14:12:23 +0400 |
3280 |
@@ -355,6 +355,17 @@ |
3281 |
wShowLegalPanel(menu->frame->screen_ptr); |
3282 |
} |
3283 |
|
3284 |
+/************ translate menu item on the fly *************/ |
3285 |
+#define NOTRANSLATE_PREFIX "notranslate " |
3286 |
+static char* |
3287 |
+translateMenuTitle(char* title) |
3288 |
+{ |
3289 |
+ if(!strncmp(NOTRANSLATE_PREFIX, title, strlen(NOTRANSLATE_PREFIX))) |
3290 |
+ return title + strlen(NOTRANSLATE_PREFIX); |
3291 |
+ if(wPreferences.translate_menu) |
3292 |
+ return dgettext("menu-messages", title); |
3293 |
+ return title; |
3294 |
+} |
3295 |
|
3296 |
/********************************************************************/ |
3297 |
|
3298 |
@@ -1146,13 +1157,13 @@ |
3299 |
|
3300 |
/* start submenu */ |
3301 |
|
3302 |
- cascade = wMenuCreate(scr, title, False); |
3303 |
+ cascade = wMenuCreate(scr, translateMenuTitle(title), False); |
3304 |
cascade->on_destroy = removeShortcutsForMenu; |
3305 |
if (parseCascade(scr, cascade, file, file_name)==NULL) { |
3306 |
wMenuDestroy(cascade, True); |
3307 |
} else { |
3308 |
wMenuEntrySetCascade(menu, |
3309 |
- wMenuAddCallback(menu, title, NULL, NULL), |
3310 |
+ wMenuAddCallback(menu, translateMenuTitle(title), NULL, NULL), |
3311 |
cascade); |
3312 |
} |
3313 |
} else if (strcasecmp(command, "END")==0) { |
3314 |
@@ -1161,7 +1172,7 @@ |
3315 |
|
3316 |
} else { |
3317 |
/* normal items */ |
3318 |
- addMenuEntry(menu, title, shortcut[0] ? shortcut : NULL, command, |
3319 |
+ addMenuEntry(menu, translateMenuTitle(title), shortcut[0] ? shortcut : NULL, command, |
3320 |
params[0] ? params : NULL, file_name); |
3321 |
} |
3322 |
} |
3323 |
@@ -1534,7 +1545,7 @@ |
3324 |
strcat(buffer, command); |
3325 |
} |
3326 |
|
3327 |
- addMenuEntry(menu, data->name, NULL, "OPEN_MENU", buffer, path[data->index]); |
3328 |
+ addMenuEntry(menu, translateMenuTitle(data->name), NULL, "OPEN_MENU", buffer, path[data->index]); |
3329 |
|
3330 |
wfree(buffer); |
3331 |
if (data->name) |
3332 |
@@ -1582,7 +1593,7 @@ |
3333 |
if (ptr && ptr!=data->name) |
3334 |
*ptr = 0; |
3335 |
} |
3336 |
- addMenuEntry(menu, data->name, NULL, "SHEXEC", buffer, path[data->index]); |
3337 |
+ addMenuEntry(menu, translateMenuTitle(data->name), NULL, "SHEXEC", buffer, path[data->index]); |
3338 |
|
3339 |
wfree(buffer); |
3340 |
if (data->name) |
3341 |
@@ -1701,7 +1712,7 @@ |
3342 |
} |
3343 |
mtitle = WMGetFromPLString(elem); |
3344 |
|
3345 |
- menu = wMenuCreate(scr, mtitle, False); |
3346 |
+ menu = wMenuCreate(scr, translateMenuTitle(mtitle), False); |
3347 |
menu->on_destroy = removeShortcutsForMenu; |
3348 |
|
3349 |
#ifdef GLOBAL_SUBMENU_FILE |
3350 |
@@ -1738,7 +1749,7 @@ |
3351 |
/* submenu */ |
3352 |
submenu = configureMenu(scr, elem); |
3353 |
if (submenu) { |
3354 |
- mentry = wMenuAddCallback(menu, submenu->frame->title, NULL, |
3355 |
+ mentry = wMenuAddCallback(menu, translateMenuTitle(submenu->frame->title), NULL, |
3356 |
NULL); |
3357 |
wMenuEntrySetCascade(menu, mentry, submenu); |
3358 |
} |
3359 |
@@ -1761,7 +1772,7 @@ |
3360 |
if (!title || !command) |
3361 |
goto error; |
3362 |
|
3363 |
- addMenuEntry(menu, WMGetFromPLString(title), |
3364 |
+ addMenuEntry(menu, translateMenuTitle(WMGetFromPLString(title)), |
3365 |
shortcut ? WMGetFromPLString(shortcut) : NULL, |
3366 |
WMGetFromPLString(command), |
3367 |
params ? WMGetFromPLString(params) : NULL, "WMRootMenu"); |
3368 |
--- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 14:12:23 +0400 |
3369 |
+++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 14:12:23 +0400 |
3370 |
@@ -556,6 +556,9 @@ |
3371 |
{"SingleClickLaunch", "NO", NULL, |
3372 |
&wPreferences.single_click, getBool, NULL |
3373 |
}, |
3374 |
+ {"TranslateMenu", "YES", NULL, |
3375 |
+ &wPreferences.translate_menu, getBool, NULL |
3376 |
+ }, |
3377 |
/* style options */ |
3378 |
{"MenuStyle", "normal", seMenuStyles, |
3379 |
&wPreferences.menu_style, getEnum, setMenuStyle |
3380 |
--- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 14:12:23 +0400 |
3381 |
+++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 14:12:23 +0400 |
3382 |
@@ -466,6 +466,8 @@ |
3383 |
/* shading animation */ |
3384 |
signed char shade_speed; |
3385 |
|
3386 |
+ int translate_menu; |
3387 |
+ |
3388 |
int edge_resistance; |
3389 |
char attract; |
3390 |
|
3391 |
--- WindowMaker-0.91.0/src/workspace.c.vns 2004-10-26 07:17:12 +0400 |
3392 |
+++ WindowMaker-0.91.0/src/workspace.c 2005-05-18 14:12:23 +0400 |
3393 |
@@ -1349,7 +1349,10 @@ |
3394 |
{ |
3395 |
WMenu *wsmenu; |
3396 |
|
3397 |
- wsmenu = wMenuCreate(scr, titled ? _("Workspaces") : NULL, False); |
3398 |
+ if(wPreferences.translate_menu) |
3399 |
+ wsmenu = wMenuCreate(scr, titled ? _("Workspaces") : NULL, False); |
3400 |
+ else |
3401 |
+ wsmenu = wMenuCreate(scr, titled ? "Workspaces" : NULL, False); |
3402 |
if (!wsmenu) { |
3403 |
wwarning(_("could not create Workspace menu")); |
3404 |
return NULL; |
3405 |
@@ -1358,8 +1361,17 @@ |
3406 |
/* callback to be called when an entry is edited */ |
3407 |
wsmenu->on_edit = onMenuEntryEdited; |
3408 |
|
3409 |
- wMenuAddCallback(wsmenu, _("New"), newWSCommand, NULL); |
3410 |
- wMenuAddCallback(wsmenu, _("Destroy Last"), deleteWSCommand, NULL); |
3411 |
+ |
3412 |
+ if(wPreferences.translate_menu) |
3413 |
+ { |
3414 |
+ wMenuAddCallback(wsmenu, _("New"), newWSCommand, NULL); |
3415 |
+ wMenuAddCallback(wsmenu, _("Destroy Last"), deleteWSCommand, NULL); |
3416 |
+ } |
3417 |
+ else |
3418 |
+ { |
3419 |
+ wMenuAddCallback(wsmenu, "New", newWSCommand, NULL); |
3420 |
+ wMenuAddCallback(wsmenu, "Destroy Last", deleteWSCommand, NULL); |
3421 |
+ } |
3422 |
|
3423 |
return wsmenu; |
3424 |
} |
3425 |
--- WindowMaker-0.91.0/src/main.c.vns 2004-10-25 05:32:51 +0400 |
3426 |
+++ WindowMaker-0.91.0/src/main.c 2005-05-18 14:14:26 +0400 |
3427 |
@@ -791,11 +791,15 @@ |
3428 |
if (!Locale || strcmp(Locale, "C")==0 || strcmp(Locale, "POSIX")==0) |
3429 |
Locale = NULL; |
3430 |
#ifdef I18N |
3431 |
- if (getenv("NLSPATH")) |
3432 |
+ if (getenv("NLSPATH")) { |
3433 |
bindtextdomain("WindowMaker", getenv("NLSPATH")); |
3434 |
- else |
3435 |
+ bindtextdomain("menu-messages", getenv("NLSPATH")); |
3436 |
+ } else { |
3437 |
bindtextdomain("WindowMaker", LOCALEDIR); |
3438 |
+ bindtextdomain("menu-messages", LOCALEDIR); |
3439 |
+ } |
3440 |
bind_textdomain_codeset("WindowMaker", "UTF-8"); |
3441 |
+ bind_textdomain_codeset("menu-messages", "UTF-8"); |
3442 |
textdomain("WindowMaker"); |
3443 |
|
3444 |
if (!XSupportsLocale()) { |
3445 |
|
3446 |
|
3447 |
|
3448 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-mmx.patch |
3449 |
|
3450 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-mmx.patch?rev=1.1&view=markup |
3451 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-mmx.patch?rev=1.1&content-type=text/plain |
3452 |
|
3453 |
Index: WindowMaker-0.91.0-alt-mmx.patch |
3454 |
=================================================================== |
3455 |
--- WindowMaker-0.91.0/configure.ac.vns 2005-05-18 17:38:01 +0400 |
3456 |
+++ WindowMaker-0.91.0/configure.ac 2005-05-18 17:47:55 +0400 |
3457 |
@@ -190,7 +190,15 @@ |
3458 |
# until we fix it, leave it disabled |
3459 |
asm_support=no |
3460 |
mmx_support=no |
3461 |
-if test "$ac_cv_prog_gcc" = yes; then |
3462 |
+ |
3463 |
+check_for_mmx_support=yes |
3464 |
+AC_ARG_ENABLE(mmx, |
3465 |
+ [ --disable-mmx disable compilation of MMX inline assembly ], |
3466 |
+ [if test x$enableval != xyes; then |
3467 |
+ check_for_mmx_support=no |
3468 |
+ fi]) |
3469 |
+ |
3470 |
+if test "$ac_cv_prog_gcc" = yes -a "$check_for_mmx_support" = yes; then |
3471 |
|
3472 |
# gcc-3.3 or newer complains about some of our stuff without this |
3473 |
NOSTRICTALIASING="-fno-strict-aliasing" |
3474 |
|
3475 |
|
3476 |
|
3477 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-restartscrpt.patch |
3478 |
|
3479 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-restartscrpt.patch?rev=1.1&view=markup |
3480 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-restartscrpt.patch?rev=1.1&content-type=text/plain |
3481 |
|
3482 |
Index: WindowMaker-0.91.0-alt-restartscrpt.patch |
3483 |
=================================================================== |
3484 |
--- WindowMaker-0.91.0/src/shutdown.c.vns 2005-05-18 12:49:09 +0400 |
3485 |
+++ WindowMaker-0.91.0/src/shutdown.c 2005-05-18 12:50:35 +0400 |
3486 |
@@ -123,6 +123,7 @@ |
3487 |
RestoreDesktop(scr); |
3488 |
} |
3489 |
} |
3490 |
+ ExecExitScript(); |
3491 |
break; |
3492 |
} |
3493 |
} |
3494 |
|
3495 |
|
3496 |
|
3497 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-session.patch |
3498 |
|
3499 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-session.patch?rev=1.1&view=markup |
3500 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-session.patch?rev=1.1&content-type=text/plain |
3501 |
|
3502 |
Index: WindowMaker-0.91.0-alt-session.patch |
3503 |
=================================================================== |
3504 |
--- WindowMaker-0.91.0/src/session.c.vns 2005-05-18 12:44:44 +0400 |
3505 |
+++ WindowMaker-0.91.0/src/session.c 2005-05-18 12:46:21 +0400 |
3506 |
@@ -331,7 +331,8 @@ |
3507 |
|
3508 |
if ((wwin->transient_for==None |
3509 |
|| wwin->transient_for==wwin->screen_ptr->root_win) |
3510 |
- && WMGetFirstInArray(wapp_list, (void*)appId)==WANotFound |
3511 |
+ && (WMGetFirstInArray(wapp_list, (void*)appId)==WANotFound |
3512 |
+ || WFLAGP(wwin, shared_appicon)) |
3513 |
&& !WFLAGP(wwin, dont_save_session)) { |
3514 |
/* A entry for this application was not yet saved. Save one. */ |
3515 |
if ((win_info = makeWindowState(wwin, wapp))!=NULL) { |
3516 |
|
3517 |
|
3518 |
|
3519 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-sowings.patch |
3520 |
|
3521 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-sowings.patch?rev=1.1&view=markup |
3522 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-sowings.patch?rev=1.1&content-type=text/plain |
3523 |
|
3524 |
Index: WindowMaker-0.91.0-alt-sowings.patch |
3525 |
=================================================================== |
3526 |
--- WindowMaker-0.91.0/WINGs/Examples/Makefile.am.vns 2004-08-25 00:56:43 +0400 |
3527 |
+++ WindowMaker-0.91.0/WINGs/Examples/Makefile.am 2005-05-18 17:04:02 +0400 |
3528 |
@@ -6,23 +6,24 @@ |
3529 |
noinst_PROGRAMS = connect server fontl puzzle colorpick |
3530 |
|
3531 |
|
3532 |
-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ |
3533 |
+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ |
3534 |
+ $(top_builddir)/WINGs/libWUtil.la \ |
3535 |
@XFTLIBS@ @INTLIBS@ |
3536 |
|
3537 |
-colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a |
3538 |
+colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la |
3539 |
|
3540 |
-fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a |
3541 |
+fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la |
3542 |
|
3543 |
-puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a |
3544 |
+puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la |
3545 |
|
3546 |
-connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a |
3547 |
+connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la |
3548 |
|
3549 |
-connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ |
3550 |
+connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \ |
3551 |
@NETLIBS@ @INTLIBS@ |
3552 |
|
3553 |
-server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a |
3554 |
+server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la |
3555 |
|
3556 |
-server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ |
3557 |
+server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \ |
3558 |
@NETLIBS@ @INTLIBS@ |
3559 |
|
3560 |
|
3561 |
--- WindowMaker-0.91.0/WINGs/Extras/Makefile.am.vns 2004-10-12 06:31:26 +0400 |
3562 |
+++ WindowMaker-0.91.0/WINGs/Extras/Makefile.am 2005-05-18 17:04:02 +0400 |
3563 |
@@ -10,13 +10,13 @@ |
3564 |
include_HEADERS = wtableview.h wtabledelegates.h |
3565 |
|
3566 |
|
3567 |
-lib_LIBRARIES = libExtraWINGs.a |
3568 |
+lib_LTLIBRARIES = libExtraWINGs.la |
3569 |
|
3570 |
noinst_PROGRAMS = test |
3571 |
|
3572 |
EXTRA_DIST = |
3573 |
|
3574 |
-libExtraWINGs_a_SOURCES = \ |
3575 |
+libExtraWINGs_la_SOURCES = \ |
3576 |
wtableview.c \ |
3577 |
wtabledelegates.c \ |
3578 |
wtableview.h \ |
3579 |
@@ -27,7 +27,8 @@ |
3580 |
INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \ |
3581 |
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG |
3582 |
|
3583 |
-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ |
3584 |
+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ |
3585 |
+ $(top_builddir)/WINGs/libWUtil.la \ |
3586 |
@XFTLIBS@ @INTLIBS@ |
3587 |
|
3588 |
test_LDADD = wtableview.o wtabledelegates.o $(LDADD) |
3589 |
--- WindowMaker-0.91.0/WINGs/Tests/Makefile.am.vns 2004-04-07 03:55:21 +0400 |
3590 |
+++ WindowMaker-0.91.0/WINGs/Tests/Makefile.am 2005-05-18 17:04:02 +0400 |
3591 |
@@ -4,13 +4,14 @@ |
3592 |
|
3593 |
noinst_PROGRAMS = wtest wmquery wmfile testmywidget |
3594 |
|
3595 |
-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ |
3596 |
+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ |
3597 |
+ $(top_builddir)/WINGs/libWUtil.la \ |
3598 |
@XFTLIBS@ @INTLIBS@ |
3599 |
|
3600 |
|
3601 |
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h |
3602 |
|
3603 |
-wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a |
3604 |
+wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la |
3605 |
|
3606 |
|
3607 |
EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png |
3608 |
--- WindowMaker-0.91.0/WINGs/Makefile.am.vns 2004-10-12 06:31:26 +0400 |
3609 |
+++ WindowMaker-0.91.0/WINGs/Makefile.am 2005-05-18 17:08:21 +0400 |
3610 |
@@ -6,14 +6,15 @@ |
3611 |
|
3612 |
|
3613 |
|
3614 |
-#libWINGs_la_LDFLAGS = -version-info 1:1:0 |
3615 |
+libWINGs_la_LDFLAGS = -version-info 2:1:0 |
3616 |
+libWUtil_la_LDFLAGS = -version-info 1:2:0 |
3617 |
|
3618 |
bin_SCRIPTS = get-wings-flags get-wutil-flags |
3619 |
|
3620 |
-lib_LIBRARIES = libWINGs.a libWUtil.a |
3621 |
+lib_LTLIBRARIES = libWINGs.la libWUtil.la |
3622 |
|
3623 |
|
3624 |
-LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@ |
3625 |
+LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@ |
3626 |
|
3627 |
|
3628 |
EXTRA_DIST = BUGS python/Makefile python/README python/WINGs.i \ |
3629 |
@@ -21,32 +22,12 @@ |
3630 |
|
3631 |
|
3632 |
# wbutton.c |
3633 |
-libWINGs_a_SOURCES = \ |
3634 |
- array.c \ |
3635 |
- bagtree.c \ |
3636 |
+libWINGs_la_SOURCES = \ |
3637 |
configuration.c \ |
3638 |
- connection.c \ |
3639 |
- data.c \ |
3640 |
dragcommon.c \ |
3641 |
dragdestination.c \ |
3642 |
dragsource.c \ |
3643 |
- error.c \ |
3644 |
- findfile.c \ |
3645 |
- handlers.c \ |
3646 |
- hashtable.c \ |
3647 |
- host.c \ |
3648 |
- international.c \ |
3649 |
- memory.c \ |
3650 |
- misc.c \ |
3651 |
- notification.c \ |
3652 |
- proplist.c \ |
3653 |
selection.c \ |
3654 |
- snprintf.c \ |
3655 |
- string.c \ |
3656 |
- tree.c \ |
3657 |
- userdefaults.c \ |
3658 |
- usleep.c \ |
3659 |
- wapplication.c \ |
3660 |
wappresource.c \ |
3661 |
wballoon.c \ |
3662 |
wbox.c \ |
3663 |
@@ -82,8 +63,7 @@ |
3664 |
wview.c \ |
3665 |
wwindow.c |
3666 |
|
3667 |
- |
3668 |
-libWUtil_a_SOURCES = \ |
3669 |
+libWUtil_la_SOURCES = \ |
3670 |
array.c \ |
3671 |
bagtree.c \ |
3672 |
connection.c \ |
3673 |
--- WindowMaker-0.91.0/src/Makefile.am.vns 2005-05-18 17:04:02 +0400 |
3674 |
+++ WindowMaker-0.91.0/src/Makefile.am 2005-05-18 17:04:02 +0400 |
3675 |
@@ -117,7 +117,8 @@ |
3676 |
|
3677 |
|
3678 |
wmaker_LDADD = \ |
3679 |
- $(top_builddir)/WINGs/libWINGs.a\ |
3680 |
+ $(top_builddir)/WINGs/libWINGs.la\ |
3681 |
+ $(top_builddir)/WINGs/libWUtil.la\ |
3682 |
$(top_builddir)/wrlib/libwraster.la\ |
3683 |
@XFTLIBS@ \ |
3684 |
@XLIBS@ \ |
3685 |
--- WindowMaker-0.91.0/util/Makefile.am.vns 2004-10-24 01:27:48 +0400 |
3686 |
+++ WindowMaker-0.91.0/util/Makefile.am 2005-05-18 17:08:49 +0400 |
3687 |
@@ -16,44 +16,47 @@ |
3688 |
|
3689 |
liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@ |
3690 |
|
3691 |
-wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) |
3692 |
+wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) |
3693 |
|
3694 |
-wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) |
3695 |
+wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) |
3696 |
|
3697 |
wxcopy_LDADD = @XLFLAGS@ @XLIBS@ |
3698 |
|
3699 |
wxpaste_LDADD = @XLFLAGS@ @XLIBS@ |
3700 |
|
3701 |
-getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) |
3702 |
+getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) |
3703 |
|
3704 |
getstyle_SOURCES = getstyle.c fontconv.c |
3705 |
|
3706 |
setstyle_LDADD = \ |
3707 |
- $(top_builddir)/WINGs/libWUtil.a \ |
3708 |
+ $(top_builddir)/WINGs/libWUtil.la \ |
3709 |
@XLFLAGS@ @XLIBS@ $(liblist) |
3710 |
|
3711 |
setstyle_SOURCES = setstyle.c fontconv.c |
3712 |
|
3713 |
-convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) |
3714 |
+convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) |
3715 |
|
3716 |
convertfonts_SOURCES = convertfonts.c fontconv.c |
3717 |
|
3718 |
-seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist) |
3719 |
+seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist) |
3720 |
|
3721 |
-geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist) |
3722 |
+geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist) |
3723 |
|
3724 |
wmagnify_LDADD = \ |
3725 |
- $(top_builddir)/WINGs/libWINGs.a \ |
3726 |
+ $(top_builddir)/WINGs/libWINGs.la \ |
3727 |
+ $(top_builddir)/WINGs/libWUtil.la \ |
3728 |
$(top_builddir)/wrlib/libwraster.la \ |
3729 |
@XFTLIBS@ @INTLIBS@ @DLLIBS@ |
3730 |
|
3731 |
wmsetup_LDADD = \ |
3732 |
- $(top_builddir)/WINGs/libWINGs.a \ |
3733 |
+ $(top_builddir)/WINGs/libWINGs.la \ |
3734 |
+ $(top_builddir)/WINGs/libWUtil.la \ |
3735 |
$(top_builddir)/wrlib/libwraster.la \ |
3736 |
@XFTLIBS@ @INTLIBS@ @DLLIBS@ |
3737 |
|
3738 |
wmsetbg_LDADD = \ |
3739 |
- $(top_builddir)/WINGs/libWINGs.a \ |
3740 |
+ $(top_builddir)/WINGs/libWINGs.la \ |
3741 |
+ $(top_builddir)/WINGs/libWUtil.la \ |
3742 |
$(top_builddir)/wrlib/libwraster.la \ |
3743 |
@XLIBS@ @XFTLIBS@ @INTLIBS@ @DLLIBS@ |
3744 |
|
3745 |
--- WindowMaker-0.91.0/wmlib/Makefile.am.vns 2003-04-18 04:53:39 +0400 |
3746 |
+++ WindowMaker-0.91.0/wmlib/Makefile.am 2005-05-18 17:04:02 +0400 |
3747 |
@@ -1,13 +1,14 @@ |
3748 |
|
3749 |
AUTOMAKE_OPTIONS = no-dependencies |
3750 |
|
3751 |
-lib_LIBRARIES = libWMaker.a |
3752 |
+libWMaker_la_LDFLAGS = -version-info 1:1:0 |
3753 |
+lib_LTLIBRARIES = libWMaker.la |
3754 |
|
3755 |
include_HEADERS = WMaker.h |
3756 |
|
3757 |
INCLUDES = $(DFLAGS) @XCFLAGS@ |
3758 |
|
3759 |
-libWMaker_a_SOURCES = \ |
3760 |
+libWMaker_la_SOURCES = \ |
3761 |
menu.c \ |
3762 |
app.c \ |
3763 |
event.c \ |
3764 |
--- WindowMaker-0.91.0/test/Makefile.am.vns 1999-10-03 01:16:11 +0400 |
3765 |
+++ WindowMaker-0.91.0/test/Makefile.am 2005-05-18 17:04:02 +0400 |
3766 |
@@ -8,7 +8,7 @@ |
3767 |
|
3768 |
wtest_SOURCES = wtest.c |
3769 |
|
3770 |
-wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@ |
3771 |
+wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@ |
3772 |
|
3773 |
|
3774 |
INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib |
3775 |
--- WindowMaker-0.91.0/WPrefs.app/Makefile.am.vns 2005-05-18 17:04:02 +0400 |
3776 |
+++ WindowMaker-0.91.0/WPrefs.app/Makefile.am 2005-05-18 17:04:02 +0400 |
3777 |
@@ -48,10 +48,11 @@ |
3778 |
|
3779 |
INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ |
3780 |
|
3781 |
-WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a |
3782 |
+WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la |
3783 |
|
3784 |
WPrefs_LDADD = \ |
3785 |
- $(top_builddir)/WINGs/libWINGs.a\ |
3786 |
+ $(top_builddir)/WINGs/libWINGs.la\ |
3787 |
+ $(top_builddir)/WINGs/libWUtil.la\ |
3788 |
$(top_builddir)/wrlib/libwraster.la \ |
3789 |
@XFTLIBS@ \ |
3790 |
@INTLIBS@ |
3791 |
--- WindowMaker-0.91.0/configure.ac.vns 2005-05-18 17:04:01 +0400 |
3792 |
+++ WindowMaker-0.91.0/configure.ac 2005-05-18 17:04:02 +0400 |
3793 |
@@ -969,7 +969,7 @@ |
3794 |
|
3795 |
WCFLAGS="$inc_search_path" |
3796 |
WLFLAGS="$lib_search_path" |
3797 |
-WLIBS="-lWINGs -lwraster $GFXLIBS $XFTLIBS $XLIBS -lm $NETLIBS $INTLIBS" |
3798 |
+WLIBS="-lWINGs -lWUtil -lwraster $GFXLIBS $XFTLIBS $XLIBS -lm $NETLIBS $INTLIBS" |
3799 |
|
3800 |
usage="Usage: get-wings-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" |
3801 |
|
3802 |
|
3803 |
|
3804 |
|
3805 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-titlebar.patch |
3806 |
|
3807 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-titlebar.patch?rev=1.1&view=markup |
3808 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-titlebar.patch?rev=1.1&content-type=text/plain |
3809 |
|
3810 |
Index: WindowMaker-0.91.0-alt-titlebar.patch |
3811 |
=================================================================== |
3812 |
--- WindowMaker-0.91.0/src/window.c.vns 2005-05-18 15:51:45 +0400 |
3813 |
+++ WindowMaker-0.91.0/src/window.c 2005-05-18 15:55:55 +0400 |
3814 |
@@ -1293,7 +1293,10 @@ |
3815 |
|
3816 |
wwin->frame = wFrameWindowCreate(scr, window_level, |
3817 |
x, y, width, height, |
3818 |
- &wPreferences.window_title_clearance, foo, |
3819 |
+ &wPreferences.window_title_clearance, |
3820 |
+ &wPreferences.window_title_min_height, |
3821 |
+ &wPreferences.window_title_max_height, |
3822 |
+ foo, |
3823 |
scr->window_title_texture, |
3824 |
scr->resizebar_texture, |
3825 |
scr->window_title_color, |
3826 |
@@ -1630,7 +1633,10 @@ |
3827 |
wwin->frame = wFrameWindowCreate(scr, WMFloatingLevel, |
3828 |
wwin->frame_x, wwin->frame_y, |
3829 |
width, height, |
3830 |
- &wPreferences.window_title_clearance, foo, |
3831 |
+ &wPreferences.window_title_clearance, |
3832 |
+ &wPreferences.window_title_min_height, |
3833 |
+ &wPreferences.window_title_max_height, |
3834 |
+ foo, |
3835 |
scr->window_title_texture, |
3836 |
scr->resizebar_texture, |
3837 |
scr->window_title_color, |
3838 |
--- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 15:51:45 +0400 |
3839 |
+++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 15:51:45 +0400 |
3840 |
@@ -376,6 +376,8 @@ |
3841 |
}; |
3842 |
|
3843 |
|
3844 |
+#define NUM2STRING_(x) #x |
3845 |
+#define NUM2STRING(x) NUM2STRING_(x) |
3846 |
|
3847 |
WDefaultEntry optionList[] = { |
3848 |
/* dynamic options */ |
3849 |
@@ -601,9 +603,21 @@ |
3850 |
{"WindowTitleExtendSpace", DEF_WINDOW_TITLE_EXTEND_SPACE, NULL, |
3851 |
&wPreferences.window_title_clearance, getInt, setClearance |
3852 |
}, |
3853 |
+ {"WindowTitleMinHeight", "0", NULL, |
3854 |
+ &wPreferences.window_title_min_height, getInt, setClearance |
3855 |
+ }, |
3856 |
+ {"WindowTitleMaxHeight", NUM2STRING(INT_MAX), NULL, |
3857 |
+ &wPreferences.window_title_max_height, getInt, setClearance |
3858 |
+ }, |
3859 |
{"MenuTitleExtendSpace", DEF_MENU_TITLE_EXTEND_SPACE, NULL, |
3860 |
&wPreferences.menu_title_clearance, getInt, setClearance |
3861 |
}, |
3862 |
+ {"MenuTitleMinHeight", "0", NULL, |
3863 |
+ &wPreferences.menu_title_min_height, getInt, setClearance |
3864 |
+ }, |
3865 |
+ {"MenuTitleMaxHeight", NUM2STRING(INT_MAX), NULL, |
3866 |
+ &wPreferences.menu_title_max_height, getInt, setClearance |
3867 |
+ }, |
3868 |
{"MenuTextExtendSpace", DEF_MENU_TEXT_EXTEND_SPACE, NULL, |
3869 |
&wPreferences.menu_text_clearance, getInt, setClearance |
3870 |
}, |
3871 |
--- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 15:51:45 +0400 |
3872 |
+++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 15:51:45 +0400 |
3873 |
@@ -371,7 +371,11 @@ |
3874 |
signed char title_justification; /* titlebar text alignment */ |
3875 |
|
3876 |
int window_title_clearance; |
3877 |
+ int window_title_min_height; |
3878 |
+ int window_title_max_height; |
3879 |
int menu_title_clearance; |
3880 |
+ int menu_title_min_height; |
3881 |
+ int menu_title_max_height; |
3882 |
int menu_text_clearance; |
3883 |
|
3884 |
char multi_byte_text; |
3885 |
--- WindowMaker-0.91.0/src/framewin.c.vns 2005-05-18 15:51:45 +0400 |
3886 |
+++ WindowMaker-0.91.0/src/framewin.c 2005-05-18 15:54:16 +0400 |
3887 |
@@ -63,7 +63,8 @@ |
3888 |
|
3889 |
WFrameWindow* |
3890 |
wFrameWindowCreate(WScreen *scr, int wlevel, int x, int y, |
3891 |
- int width, int height, int *clearance, int flags, |
3892 |
+ int width, int height, int *clearance, |
3893 |
+ int *title_min, int *title_max, int flags, |
3894 |
WTexture **title_texture, WTexture **resize_texture, |
3895 |
WMColor **color, WMFont **font) |
3896 |
{ |
3897 |
@@ -80,6 +81,8 @@ |
3898 |
fwin->resizebar_texture = resize_texture; |
3899 |
fwin->title_color = color; |
3900 |
fwin->title_clearance = clearance; |
3901 |
+ fwin->title_min_height = title_min; |
3902 |
+ fwin->title_max_height = title_max; |
3903 |
fwin->font = font; |
3904 |
#ifdef KEEP_XKB_LOCK_STATUS |
3905 |
fwin->languagemode = XkbGroup1Index; |
3906 |
@@ -130,7 +133,11 @@ |
3907 |
height = fwin->core->height - fwin->top_width - fwin->bottom_width; |
3908 |
|
3909 |
if (flags & WFF_TITLEBAR) |
3910 |
- theight = WMFontHeight(*fwin->font) + (*fwin->title_clearance + TITLEBAR_EXTEND_SPACE) * 2; |
3911 |
+ { |
3912 |
+ theight = WMFontHeight(*fwin->font) + (*fwin->title_clearance + TITLEBAR_EXTEND_SPACE) * 2; |
3913 |
+ if(theight > *fwin->title_max_height) theight = *fwin->title_max_height; |
3914 |
+ if(theight < *fwin->title_min_height) theight = *fwin->title_min_height; |
3915 |
+ } |
3916 |
else |
3917 |
theight = 0; |
3918 |
|
3919 |
@@ -490,6 +497,8 @@ |
3920 |
int theight; |
3921 |
|
3922 |
theight = WMFontHeight(*fwin->font) + (*fwin->title_clearance + TITLEBAR_EXTEND_SPACE) * 2; |
3923 |
+ if(theight > *fwin->title_max_height) theight = *fwin->title_max_height; |
3924 |
+ if(theight < *fwin->title_min_height) theight = *fwin->title_min_height; |
3925 |
|
3926 |
x = 0; |
3927 |
w = fwin->core->width + 1; |
3928 |
@@ -1097,8 +1106,11 @@ |
3929 |
break; |
3930 |
} |
3931 |
|
3932 |
+ |
3933 |
y = *fwin->title_clearance + TITLEBAR_EXTEND_SPACE; |
3934 |
h = WMFontHeight(*fwin->font); |
3935 |
+ if(y*2 + h > *fwin->title_max_height) y = (*fwin->title_max_height - h)/2; |
3936 |
+ if(y*2 + h < *fwin->title_min_height) y = (*fwin->title_min_height - h)/2; |
3937 |
|
3938 |
/* We use a w+2 buffer to have an extra pixel on the left and |
3939 |
* another one on the right. This is because for some odd reason, |
3940 |
--- WindowMaker-0.91.0/src/menu.c.vns 2005-05-18 15:51:45 +0400 |
3941 |
+++ WindowMaker-0.91.0/src/menu.c 2005-05-18 15:51:45 +0400 |
3942 |
@@ -180,7 +180,10 @@ |
3943 |
menu->flags.titled = 1; |
3944 |
} |
3945 |
menu->frame = |
3946 |
- wFrameWindowCreate(screen, tmp, 8, 2, 1, 1, &wPreferences.menu_title_clearance, flags, |
3947 |
+ wFrameWindowCreate(screen, tmp, 8, 2, 1, 1, &wPreferences.menu_title_clearance, |
3948 |
+ &wPreferences.menu_title_min_height, |
3949 |
+ &wPreferences.menu_title_max_height, |
3950 |
+ flags, |
3951 |
screen->menu_title_texture, NULL, |
3952 |
screen->menu_title_color, |
3953 |
&screen->menu_title_font); |
3954 |
--- WindowMaker-0.91.0/src/framewin.h.vns 2004-10-15 01:24:06 +0400 |
3955 |
+++ WindowMaker-0.91.0/src/framewin.h 2005-05-18 15:56:27 +0400 |
3956 |
@@ -59,6 +59,8 @@ |
3957 |
|
3958 |
short top_width; |
3959 |
int *title_clearance; |
3960 |
+ int *title_min_height; |
3961 |
+ int *title_max_height; |
3962 |
short bottom_width; |
3963 |
|
3964 |
short resizebar_corner_width; |
3965 |
@@ -149,7 +151,8 @@ |
3966 |
|
3967 |
WFrameWindow* |
3968 |
wFrameWindowCreate(WScreen *scr, int wlevel, int x, int y, |
3969 |
- int width, int height, int *clearance, int flags, |
3970 |
+ int width, int height, int *clearance, |
3971 |
+ int *title_min, int *title_max, int flags, |
3972 |
union WTexture **title_texture, |
3973 |
union WTexture **resize_texture, |
3974 |
WMColor **color, WMFont **font); |
3975 |
--- WindowMaker-0.91.0/src/moveres.c.vns 2004-10-24 23:36:09 +0400 |
3976 |
+++ WindowMaker-0.91.0/src/moveres.c 2005-05-18 15:51:45 +0400 |
3977 |
@@ -497,6 +497,8 @@ |
3978 |
|
3979 |
if (HAS_TITLEBAR(wwin) && !wwin->flags.shaded) { |
3980 |
h = WMFontHeight(wwin->screen_ptr->title_font) + (wPreferences.window_title_clearance + TITLEBAR_EXTEND_SPACE) * 2; |
3981 |
+ if(h > wPreferences.window_title_max_height) h = wPreferences.window_title_max_height; |
3982 |
+ if(h < wPreferences.window_title_min_height) h = wPreferences.window_title_min_height; |
3983 |
} |
3984 |
if (HAS_RESIZEBAR(wwin) && !wwin->flags.shaded) { |
3985 |
/* Can't use wwin-frame->bottom_width because, in some cases |
3986 |
--- WindowMaker-0.91.0/src/placement.c.vns 2004-10-23 03:58:59 +0400 |
3987 |
+++ WindowMaker-0.91.0/src/placement.c 2005-05-18 15:57:35 +0400 |
3988 |
@@ -594,6 +594,9 @@ |
3989 |
{ |
3990 |
WScreen *scr = wwin->screen_ptr; |
3991 |
int h = WMFontHeight(scr->title_font) + (wPreferences.window_title_clearance + TITLEBAR_EXTEND_SPACE) * 2; |
3992 |
+ if(h > wPreferences.window_title_max_height) h = wPreferences.window_title_max_height; |
3993 |
+ if(h < wPreferences.window_title_min_height) h = wPreferences.window_title_min_height; |
3994 |
+ |
3995 |
WArea usableArea = wGetUsableAreaForHead(scr, |
3996 |
wGetHeadForPointerLocation(scr), |
3997 |
NULL, True); |
3998 |
|
3999 |
|
4000 |
|
4001 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-vlaad-newbuttons.patch |
4002 |
|
4003 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-vlaad-newbuttons.patch?rev=1.1&view=markup |
4004 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-vlaad-newbuttons.patch?rev=1.1&content-type=text/plain |
4005 |
|
4006 |
Index: WindowMaker-0.91.0-alt-vlaad-newbuttons.patch |
4007 |
=================================================================== |
4008 |
--- WindowMaker-0.91.0/src/screen.c.vns 2004-10-25 02:23:48 +0400 |
4009 |
+++ WindowMaker-0.91.0/src/screen.c 2005-05-18 15:08:52 +0400 |
4010 |
@@ -162,41 +162,73 @@ |
4011 |
WPixmap *pix; |
4012 |
|
4013 |
/* create predefined pixmaps */ |
4014 |
- pix = wPixmapCreateFromXPMData(scr, PRED_CLOSE_XPM); |
4015 |
+ if (wPreferences.new_style == TS_NEXT) { |
4016 |
+ pix = wPixmapCreateFromXPMData(scr, NEXT_CLOSE_XPM); |
4017 |
+ } else { |
4018 |
+ pix = wPixmapCreateFromXPMData(scr, PRED_CLOSE_XPM); |
4019 |
+ } |
4020 |
if (pix) |
4021 |
pix->shared = 1; |
4022 |
scr->b_pixmaps[WBUT_CLOSE] = pix; |
4023 |
|
4024 |
- pix = wPixmapCreateFromXPMData(scr, PRED_BROKEN_CLOSE_XPM); |
4025 |
+ if (wPreferences.new_style == TS_NEXT) { |
4026 |
+ pix = wPixmapCreateFromXPMData(scr, NEXT_BROKEN_CLOSE_XPM); |
4027 |
+ } else { |
4028 |
+ pix = wPixmapCreateFromXPMData(scr, PRED_BROKEN_CLOSE_XPM); |
4029 |
+ } |
4030 |
if (pix) |
4031 |
pix->shared = 1; |
4032 |
scr->b_pixmaps[WBUT_BROKENCLOSE] = pix; |
4033 |
|
4034 |
- pix = wPixmapCreateFromXPMData(scr, PRED_ICONIFY_XPM); |
4035 |
+ if (wPreferences.new_style == TS_NEXT) { |
4036 |
+ pix = wPixmapCreateFromXPMData(scr, NEXT_ICONIFY_XPM); |
4037 |
+ } else { |
4038 |
+ pix = wPixmapCreateFromXPMData(scr, PRED_ICONIFY_XPM); |
4039 |
+ } |
4040 |
if (pix) |
4041 |
pix->shared = 1; |
4042 |
scr->b_pixmaps[WBUT_ICONIFY] = pix; |
4043 |
#ifdef XKB_BUTTON_HINT |
4044 |
- pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP1_XPM); |
4045 |
+ if (wPreferences.new_style == TS_NEXT) { |
4046 |
+ pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP1_XPM); |
4047 |
+ } else { |
4048 |
+ pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP1_XPM); |
4049 |
+ } |
4050 |
if (pix) |
4051 |
pix->shared = 1; |
4052 |
scr->b_pixmaps[WBUT_XKBGROUP1] = pix; |
4053 |
- pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP2_XPM); |
4054 |
+ if (wPreferences.new_style == TS_NEXT) { |
4055 |
+ pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP2_XPM); |
4056 |
+ } else { |
4057 |
+ pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP2_XPM); |
4058 |
+ } |
4059 |
if (pix) |
4060 |
pix->shared = 1; |
4061 |
scr->b_pixmaps[WBUT_XKBGROUP2] = pix; |
4062 |
- pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP3_XPM); |
4063 |
+ if (wPreferences.new_style == TS_NEXT) { |
4064 |
+ pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP3_XPM); |
4065 |
+ } else { |
4066 |
+ pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP3_XPM); |
4067 |
+ } |
4068 |
if (pix) |
4069 |
pix->shared = 1; |
4070 |
scr->b_pixmaps[WBUT_XKBGROUP3] = pix; |
4071 |
- pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP4_XPM); |
4072 |
+ if (wPreferences.new_style == TS_NEXT) { |
4073 |
+ pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP4_XPM); |
4074 |
+ } else { |
4075 |
+ pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP4_XPM); |
4076 |
+ } |
4077 |
if (pix) |
4078 |
pix->shared = 1; |
4079 |
scr->b_pixmaps[WBUT_XKBGROUP4] = pix; |
4080 |
#endif |
4081 |
|
4082 |
|
4083 |
- pix = wPixmapCreateFromXPMData(scr, PRED_KILL_XPM); |
4084 |
+ if (wPreferences.new_style == TS_NEXT) { |
4085 |
+ pix = wPixmapCreateFromXPMData(scr, NEXT_KILL_XPM); |
4086 |
+ } else { |
4087 |
+ pix = wPixmapCreateFromXPMData(scr, PRED_KILL_XPM); |
4088 |
+ } |
4089 |
if (pix) |
4090 |
pix->shared = 1; |
4091 |
scr->b_pixmaps[WBUT_KILL] = pix; |
4092 |
--- WindowMaker-0.91.0/src/texture.c.vns 2004-10-12 21:47:39 +0400 |
4093 |
+++ WindowMaker-0.91.0/src/texture.c 2005-05-18 15:05:55 +0400 |
4094 |
@@ -707,20 +707,32 @@ |
4095 |
segs[1].y1 = 1; |
4096 |
segs[1].x2 = width - 2; |
4097 |
segs[1].y2 = height - 2; |
4098 |
- XDrawSegments(dpy, d, dim, segs, 2); |
4099 |
+ if (wPreferences.new_style == TS_NEXT) { |
4100 |
+ XDrawSegments(dpy, d, dark, segs, 2); |
4101 |
+ } else { |
4102 |
+ XDrawSegments(dpy, d, dim, segs, 2); |
4103 |
+ } |
4104 |
segs[0].x1 = 0; |
4105 |
segs[0].x2 = width - 1; |
4106 |
segs[0].y2 = segs[0].y1 = height - 1; |
4107 |
segs[1].x1 = segs[1].x2 = width - 1; |
4108 |
segs[1].y1 = 0; |
4109 |
segs[1].y2 = height - 1; |
4110 |
- XDrawSegments(dpy, d, dark, segs, 2); |
4111 |
+ if (wPreferences.new_style == TS_NEXT) { |
4112 |
+ XDrawSegments(dpy, d, light, segs, 2); |
4113 |
+ } else { |
4114 |
+ XDrawSegments(dpy, d, dark, segs, 2); |
4115 |
+ } |
4116 |
segs[0].x1 = segs[0].y1 = segs[0].y2 = 0; |
4117 |
segs[0].x2 = width - 2; |
4118 |
segs[1].x1 = segs[1].y1 = 0; |
4119 |
segs[1].x2 = 0; |
4120 |
segs[1].y2 = height - 2; |
4121 |
- XDrawSegments(dpy, d, light, segs, 2); |
4122 |
+ if (wPreferences.new_style == TS_NEXT) { |
4123 |
+ XDrawSegments(dpy, d, dark, segs, 2); |
4124 |
+ } else { |
4125 |
+ XDrawSegments(dpy, d, light, segs, 2); |
4126 |
+ } |
4127 |
if (relief==WREL_ICON) { |
4128 |
segs[0].x1 = segs[0].y1 = segs[0].y2 = 1; |
4129 |
segs[0].x2 = width - 2; |
4130 |
--- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 14:57:22 +0400 |
4131 |
+++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 14:57:22 +0400 |
4132 |
@@ -221,6 +221,11 @@ |
4133 |
{NULL, 0, 0} |
4134 |
}; |
4135 |
|
4136 |
+static WOptionEnumeration seTitlebarModes[] = { |
4137 |
+ {"new", TS_NEW, 0}, {"old", TS_OLD, 0}, |
4138 |
+ {"next", TS_NEXT, 0}, {NULL, 0, 0} |
4139 |
+}; |
4140 |
+ |
4141 |
static WOptionEnumeration seColormapModes[] = { |
4142 |
{"Manual", WCM_CLICK, 0}, {"ClickToFocus", WCM_CLICK, 1}, |
4143 |
{"Auto", WCM_POINTER, 0}, {"FocusFollowMouse", WCM_POINTER, 1}, |
4144 |
@@ -356,8 +361,8 @@ |
4145 |
{"FocusMode", "manual", seFocusModes, |
4146 |
&wPreferences.focus_mode, getEnum, NULL |
4147 |
}, /* have a problem when switching from manual to sloppy without restart */ |
4148 |
- {"NewStyle", "NO", NULL, |
4149 |
- &wPreferences.new_style, getBool, NULL |
4150 |
+ {"NewStyle", "new", seTitlebarModes, |
4151 |
+ &wPreferences.new_style, getEnum, NULL |
4152 |
}, |
4153 |
{"DisableDock", "NO", (void*) WM_DOCK, |
4154 |
NULL, getBool, setIfDockPresent |
4155 |
--- WindowMaker-0.91.0/src/extend_pixmaps.h.vns 2004-10-12 21:55:09 +0400 |
4156 |
+++ WindowMaker-0.91.0/src/extend_pixmaps.h 2005-05-18 14:57:22 +0400 |
4157 |
@@ -113,5 +113,79 @@ |
4158 |
}; |
4159 |
|
4160 |
|
4161 |
+static char *NEXT_XKBGROUP1_XPM[] = { |
4162 |
+"10 10 6 1", |
4163 |
+" c None", |
4164 |
+". c #E0E0E0", |
4165 |
+"+ c #7D7D7D", |
4166 |
+"@ c #363636", |
4167 |
+"# c #080808", |
4168 |
+"$ c #BDBDBD", |
4169 |
+".........+", |
4170 |
+"..@@@@@@++", |
4171 |
+"..@####+++", |
4172 |
+"..#+$$$$++", |
4173 |
+"..###+.$++", |
4174 |
+"..#++..$++", |
4175 |
+"..#$.$$$++", |
4176 |
+"..#@@@@+++", |
4177 |
+".$+#####@@", |
4178 |
+"+++++++@@@"}; |
4179 |
|
4180 |
+static char *NEXT_XKBGROUP2_XPM[] = { |
4181 |
+"10 10 6 1", |
4182 |
+" c None", |
4183 |
+". c #E0E0E0", |
4184 |
+"+ c #7D7D7D", |
4185 |
+"@ c #BDBDBD", |
4186 |
+"# c #080808", |
4187 |
+"$ c #363636", |
4188 |
+".........+", |
4189 |
+".@##@@$#++", |
4190 |
+".#.+#+###+", |
4191 |
+".#+######+", |
4192 |
+".########+", |
4193 |
+"..######++", |
4194 |
+"..@####+++", |
4195 |
+".@@@#$++++", |
4196 |
+".@++#$++$$", |
4197 |
+"+++++++$$$"}; |
4198 |
+ |
4199 |
+static char *NEXT_XKBGROUP3_XPM[] = { |
4200 |
+"10 10 6 1", |
4201 |
+" c None", |
4202 |
+". c #E0E0E0", |
4203 |
+"+ c #7D7D7D", |
4204 |
+"@ c #BDBDBD", |
4205 |
+"# c #080808", |
4206 |
+"$ c #363636", |
4207 |
+".........+", |
4208 |
+"..@####.++", |
4209 |
+".@######.+", |
4210 |
+".#.+##.+#+", |
4211 |
+".#++##++#+", |
4212 |
+".########+", |
4213 |
+".##@##@##+", |
4214 |
+".+##@@##$+", |
4215 |
+".@+####$$$", |
4216 |
+"+++++++$$$"}; |
4217 |
+ |
4218 |
+static char *NEXT_XKBGROUP4_XPM[] = { |
4219 |
+"10 10 6 1", |
4220 |
+" c None", |
4221 |
+". c #E0E0E0", |
4222 |
+"+ c #7D7D7D", |
4223 |
+"@ c #BDBDBD", |
4224 |
+"# c #080808", |
4225 |
+"$ c #363636", |
4226 |
+".........+", |
4227 |
+"..@####.++", |
4228 |
+".@#@@@@#.+", |
4229 |
+".##$@@#$#+", |
4230 |
+".#$$@@$$#+", |
4231 |
+".#@@@@++#+", |
4232 |
+".#+#++#.#+", |
4233 |
+".+#+##$#$+", |
4234 |
+".@+####$$$", |
4235 |
+"+++++++$$$"}; |
4236 |
|
4237 |
--- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 14:57:22 +0400 |
4238 |
+++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 14:57:22 +0400 |
4239 |
@@ -239,6 +239,10 @@ |
4240 |
#define WD_BOTTOMLEFT 6 |
4241 |
#define WD_BOTTOMRIGHT 7 |
4242 |
|
4243 |
+/* titlebar style */ |
4244 |
+#define TS_NEW 0 |
4245 |
+#define TS_OLD 1 |
4246 |
+#define TS_NEXT 2 |
4247 |
|
4248 |
/* workspace border position */ |
4249 |
#define WB_NONE 0 |
4250 |
--- WindowMaker-0.91.0/src/framewin.c.vns 2004-10-15 02:55:15 +0400 |
4251 |
+++ WindowMaker-0.91.0/src/framewin.c 2005-05-18 15:23:34 +0400 |
4252 |
@@ -134,10 +134,12 @@ |
4253 |
else |
4254 |
theight = 0; |
4255 |
|
4256 |
- if (wPreferences.new_style) { |
4257 |
- bsize = theight; |
4258 |
+ if (wPreferences.new_style == TS_NEW) { |
4259 |
+ bsize = theight; |
4260 |
+ } else if (wPreferences.new_style == TS_OLD) { |
4261 |
+ bsize = theight - 7; |
4262 |
} else { |
4263 |
- bsize = theight - 7; |
4264 |
+ bsize = theight - 8; |
4265 |
} |
4266 |
|
4267 |
if (fwin->titlebar) { |
4268 |
@@ -148,7 +150,7 @@ |
4269 |
|
4270 |
fwin->flags.need_texture_remake = 1; |
4271 |
|
4272 |
- if (wPreferences.new_style) { |
4273 |
+ if (wPreferences.new_style == TS_NEW) { |
4274 |
if (fwin->left_button) { |
4275 |
wCoreConfigure(fwin->left_button, 0, 0, bsize, bsize); |
4276 |
} |
4277 |
@@ -190,7 +192,7 @@ |
4278 |
/* we had a titlebar, but now we don't need it anymore */ |
4279 |
for (i=0; i < (fwin->flags.single_texture ? 1 : 3); i++) { |
4280 |
FREE_PIXMAP(fwin->title_back[i]); |
4281 |
- if (wPreferences.new_style) { |
4282 |
+ if (wPreferences.new_style == TS_NEW) { |
4283 |
FREE_PIXMAP(fwin->lbutton_back[i]); |
4284 |
FREE_PIXMAP(fwin->rbutton_back[i]); |
4285 |
#ifdef XKB_BUTTON_HINT |
4286 |
@@ -228,7 +230,7 @@ |
4287 |
|
4288 |
if (flags & WFF_LEFT_BUTTON) { |
4289 |
fwin->flags.left_button = 1; |
4290 |
- if (wPreferences.new_style) { |
4291 |
+ if (wPreferences.new_style == TS_NEW) { |
4292 |
fwin->left_button = wCoreCreate(fwin->core, 0, 0, |
4293 |
bsize, bsize); |
4294 |
if (width < theight*4) { |
4295 |
@@ -236,7 +238,7 @@ |
4296 |
} else { |
4297 |
XMapRaised(dpy, fwin->left_button->window); |
4298 |
} |
4299 |
- } else { |
4300 |
+ } else if (wPreferences.new_style == TS_OLD) { |
4301 |
fwin->left_button = |
4302 |
wCoreCreate(fwin->titlebar, 3, (theight-bsize)/2, |
4303 |
bsize, bsize); |
4304 |
@@ -249,13 +251,26 @@ |
4305 |
} else { |
4306 |
XMapRaised(dpy, fwin->left_button->window); |
4307 |
} |
4308 |
+ } else { |
4309 |
+ fwin->left_button = |
4310 |
+ wCoreCreate(fwin->titlebar, 3, (theight-bsize)/2, |
4311 |
+ bsize, bsize); |
4312 |
+ |
4313 |
+ XSetWindowBackground(dpy, fwin->left_button->window, |
4314 |
+ scr->widget_texture->dark.pixel); |
4315 |
+ |
4316 |
+ if (width < theight*3) { |
4317 |
+ fwin->flags.lbutton_dont_fit = 1; |
4318 |
+ } else { |
4319 |
+ XMapRaised(dpy, fwin->left_button->window); |
4320 |
+ } |
4321 |
} |
4322 |
} |
4323 |
|
4324 |
#ifdef XKB_BUTTON_HINT |
4325 |
if (flags & WFF_LANGUAGE_BUTTON) { |
4326 |
fwin->flags.language_button = 1; |
4327 |
- if (wPreferences.new_style) { |
4328 |
+ if (wPreferences.new_style == TS_NEW) { |
4329 |
fwin->language_button = wCoreCreate(fwin->core, |
4330 |
bsize, 0, bsize, bsize); |
4331 |
|
4332 |
@@ -283,17 +298,23 @@ |
4333 |
|
4334 |
if (flags & WFF_RIGHT_BUTTON) { |
4335 |
fwin->flags.right_button = 1; |
4336 |
- if (wPreferences.new_style) { |
4337 |
+ if (wPreferences.new_style == TS_NEW) { |
4338 |
fwin->right_button = |
4339 |
wCoreCreate(fwin->core, width-bsize+1, 0, |
4340 |
bsize, bsize); |
4341 |
- } else { |
4342 |
+ } else if (wPreferences.new_style == TS_OLD) { |
4343 |
fwin->right_button = |
4344 |
wCoreCreate(fwin->titlebar, width-bsize-3, |
4345 |
(theight-bsize)/2, bsize, bsize); |
4346 |
XSetWindowBackground(dpy, fwin->right_button->window, |
4347 |
scr->widget_texture->normal.pixel); |
4348 |
- } |
4349 |
+ } else { |
4350 |
+ fwin->right_button = |
4351 |
+ wCoreCreate(fwin->titlebar, width-bsize-3, |
4352 |
+ (theight-bsize)/2, bsize, bsize); |
4353 |
+ XSetWindowBackground(dpy, fwin->right_button->window, |
4354 |
+ scr->widget_texture->dark.pixel); |
4355 |
+ } |
4356 |
|
4357 |
if (width < theight*2) { |
4358 |
fwin->flags.rbutton_dont_fit = 1; |
4359 |
@@ -302,7 +323,7 @@ |
4360 |
} |
4361 |
} |
4362 |
|
4363 |
- if (wPreferences.new_style) |
4364 |
+ if (wPreferences.new_style == TS_NEW) |
4365 |
updateTitlebar(fwin); |
4366 |
|
4367 |
XMapRaised(dpy, fwin->titlebar->window); |
4368 |
@@ -436,7 +457,7 @@ |
4369 |
|
4370 |
for (i=0; i < (fwin->flags.single_texture ? 1 : 3); i++) { |
4371 |
FREE_PIXMAP(fwin->title_back[i]); |
4372 |
- if (wPreferences.new_style) { |
4373 |
+ if (wPreferences.new_style == TS_NEW) { |
4374 |
FREE_PIXMAP(fwin->lbutton_back[i]); |
4375 |
#ifdef XKB_BUTTON_HINT |
4376 |
FREE_PIXMAP(fwin->languagebutton_back[i]); |
4377 |
@@ -473,7 +494,7 @@ |
4378 |
x = 0; |
4379 |
w = fwin->core->width + 1; |
4380 |
|
4381 |
- if (wPreferences.new_style) { |
4382 |
+ if (wPreferences.new_style == TS_NEW) { |
4383 |
if (fwin->flags.hide_left_button || !fwin->left_button |
4384 |
|| fwin->flags.lbutton_dont_fit) { |
4385 |
x = 0; |
4386 |
@@ -522,14 +543,14 @@ |
4387 |
} |
4388 |
#endif |
4389 |
|
4390 |
- if (wPreferences.new_style) { |
4391 |
+ if (wPreferences.new_style == TS_NEW) { |
4392 |
if (!fwin->flags.hide_right_button && fwin->right_button |
4393 |
&& !fwin->flags.rbutton_dont_fit) { |
4394 |
w -= fwin->right_button->width; |
4395 |
} |
4396 |
} |
4397 |
|
4398 |
- if (wPreferences.new_style || fwin->titlebar->width!=w) |
4399 |
+ if (wPreferences.new_style == TS_NEW || fwin->titlebar->width!=w) |
4400 |
fwin->flags.need_texture_remake = 1; |
4401 |
|
4402 |
wCoreConfigure(fwin->titlebar, x, 0, w, theight); |
4403 |
@@ -557,7 +578,7 @@ |
4404 |
#endif |
4405 |
|
4406 |
if (fwin->titlebar) { |
4407 |
- if (wPreferences.new_style) { |
4408 |
+ if (wPreferences.new_style == TS_NEW) { |
4409 |
updateTitlebar(fwin); |
4410 |
} else { |
4411 |
#ifdef XKB_BUTTON_HINT |
4412 |
@@ -606,7 +627,7 @@ |
4413 |
|
4414 |
|
4415 |
if (fwin->titlebar) { |
4416 |
- if (wPreferences.new_style) { |
4417 |
+ if (wPreferences.new_style == TS_NEW) { |
4418 |
updateTitlebar(fwin); |
4419 |
} else { |
4420 |
XClearWindow(dpy, fwin->titlebar->window); |
4421 |
@@ -648,7 +669,7 @@ |
4422 |
return; |
4423 |
} |
4424 |
|
4425 |
- if (wPreferences.new_style) { |
4426 |
+ if (wPreferences.new_style == TS_NEW) { |
4427 |
if (left) { |
4428 |
limg = RGetSubImage(img, 0, 0, bwidth, bheight); |
4429 |
} else |
4430 |
@@ -791,7 +812,7 @@ |
4431 |
if (fwin->title_texture[i]->any.type!=WTEX_SOLID) { |
4432 |
XSetWindowBackgroundPixmap(dpy, fwin->titlebar->window, |
4433 |
fwin->title_back[i]); |
4434 |
- if (wPreferences.new_style) { |
4435 |
+ if (wPreferences.new_style == TS_NEW) { |
4436 |
if (fwin->left_button && fwin->lbutton_back[i]) |
4437 |
XSetWindowBackgroundPixmap(dpy, fwin->left_button->window, |
4438 |
fwin->lbutton_back[i]); |
4439 |
@@ -810,7 +831,7 @@ |
4440 |
} else { |
4441 |
pixel = fwin->title_texture[i]->solid.normal.pixel; |
4442 |
XSetWindowBackground(dpy, fwin->titlebar->window, pixel); |
4443 |
- if (wPreferences.new_style) { |
4444 |
+ if (wPreferences.new_style == TS_NEW) { |
4445 |
if (fwin->left_button) |
4446 |
XSetWindowBackground(dpy, fwin->left_button->window, |
4447 |
pixel); |
4448 |
@@ -855,7 +876,7 @@ |
4449 |
|
4450 |
if (fwin->title_texture[state] && fwin->titlebar) { |
4451 |
FREE_PIXMAP(fwin->title_back[state]); |
4452 |
- if (wPreferences.new_style) { |
4453 |
+ if (wPreferences.new_style == TS_NEW) { |
4454 |
FREE_PIXMAP(fwin->lbutton_back[state]); |
4455 |
FREE_PIXMAP(fwin->rbutton_back[state]); |
4456 |
#ifdef XKB_BUTTON_HINT |
4457 |
@@ -895,7 +916,7 @@ |
4458 |
#endif |
4459 |
|
4460 |
fwin->title_back[state] = pmap; |
4461 |
- if (wPreferences.new_style) { |
4462 |
+ if (wPreferences.new_style == TS_NEW) { |
4463 |
fwin->lbutton_back[state] = lpmap; |
4464 |
fwin->rbutton_back[state] = rpmap; |
4465 |
#ifdef XKB_BUTTON_HINT |
4466 |
@@ -1023,7 +1044,7 @@ |
4467 |
int allButtons = 1; |
4468 |
|
4469 |
|
4470 |
- if (!wPreferences.new_style) { |
4471 |
+ if (!wPreferences.new_style == TS_NEW) { |
4472 |
if (fwin->left_button && !fwin->flags.hide_left_button |
4473 |
&& !fwin->flags.lbutton_dont_fit) |
4474 |
lofs += fwin->left_button->width + 3; |
4475 |
@@ -1128,7 +1149,7 @@ |
4476 |
reconfigure(WFrameWindow *fwin, int x, int y, int width, int height, |
4477 |
Bool dontMove) |
4478 |
{ |
4479 |
- int k = (wPreferences.new_style ? 4 : 3); |
4480 |
+ int k = (wPreferences.new_style == TS_NEW ? 4 : 3); |
4481 |
int resizedHorizontally = 0; |
4482 |
|
4483 |
if (dontMove) |
4484 |
@@ -1203,7 +1224,7 @@ |
4485 |
} |
4486 |
} |
4487 |
|
4488 |
- if (wPreferences.new_style) { |
4489 |
+ if (wPreferences.new_style == TS_NEW) { |
4490 |
if (fwin->right_button) |
4491 |
XMoveWindow(dpy, fwin->right_button->window, |
4492 |
width - fwin->right_button->width + 1, 0); |
4493 |
@@ -1318,7 +1339,7 @@ |
4494 |
width = fwin->titlebar->width - 6 - 6; |
4495 |
} |
4496 |
|
4497 |
- if (!wPreferences.new_style) { |
4498 |
+ if (!wPreferences.new_style == TS_NEW) { |
4499 |
if (fwin->left_button && !fwin->flags.hide_left_button |
4500 |
&& !fwin->flags.lbutton_dont_fit) |
4501 |
width -= fwin->left_button->width + 3; |
4502 |
@@ -1363,20 +1384,30 @@ |
4503 |
} |
4504 |
} |
4505 |
XSetClipMask(dpy, copy_gc, None); |
4506 |
- XSetForeground(dpy, copy_gc, scr->white_pixel); |
4507 |
+ if (wPreferences.new_style == TS_NEXT) { |
4508 |
+ XSetForeground(dpy, copy_gc, scr->black_pixel); |
4509 |
+ } else { |
4510 |
+ XSetForeground(dpy, copy_gc, scr->white_pixel); |
4511 |
+ } |
4512 |
d=1; |
4513 |
- if (wPreferences.new_style) { |
4514 |
+ if (wPreferences.new_style == TS_NEW) { |
4515 |
XFillRectangle(dpy, button->window, copy_gc, 0, 0, |
4516 |
button->width-1, button->height-1); |
4517 |
XSetForeground(dpy, copy_gc, scr->black_pixel); |
4518 |
XDrawRectangle(dpy, button->window, copy_gc, 0, 0, |
4519 |
button->width-1, button->height-1); |
4520 |
- } else { |
4521 |
+ } else if (wPreferences.new_style == TS_OLD) { |
4522 |
XFillRectangle(dpy, button->window, copy_gc, 0, 0, |
4523 |
button->width, button->height); |
4524 |
XSetForeground(dpy, copy_gc, scr->black_pixel); |
4525 |
XDrawRectangle(dpy, button->window, copy_gc, 0, 0, |
4526 |
button->width, button->height); |
4527 |
+ } else { |
4528 |
+ XFillRectangle(dpy, button->window, copy_gc, 0, 0, |
4529 |
+ button->width-3, button->height-3); |
4530 |
+ XSetForeground(dpy, copy_gc, scr->black_pixel); |
4531 |
+ XDrawRectangle(dpy, button->window, copy_gc, 0, 0, |
4532 |
+ button->width-3, button->height-3); |
4533 |
} |
4534 |
} else { |
4535 |
XClearWindow(dpy, button->window); |
4536 |
@@ -1389,7 +1420,7 @@ |
4537 |
} |
4538 |
d=0; |
4539 |
|
4540 |
- if (wPreferences.new_style) { |
4541 |
+ if (wPreferences.new_style == TS_NEW) { |
4542 |
if (texture->any.type==WTEX_SOLID || pushed) { |
4543 |
wDrawBevel(button->window, button->width, button->height, |
4544 |
(WTexSolid*)texture, WREL_RAISED); |
4545 |
@@ -1406,7 +1437,7 @@ |
4546 |
x = (button->width - width)/2 + d; |
4547 |
y = (button->height - image->height)/2 + d; |
4548 |
XSetClipOrigin(dpy, copy_gc, x-left, y); |
4549 |
- if (!wPreferences.new_style) { |
4550 |
+ if (!(wPreferences.new_style == TS_NEW)) { |
4551 |
XSetForeground(dpy, copy_gc, scr->black_pixel); |
4552 |
if (!pushed) { |
4553 |
if (image->depth==1) |
4554 |
@@ -1416,9 +1447,15 @@ |
4555 |
XCopyArea(dpy, image->image, button->window, copy_gc, |
4556 |
left, 0, width, image->height, x, y); |
4557 |
} else { |
4558 |
- XSetForeground(dpy, copy_gc, scr->dark_pixel); |
4559 |
- XFillRectangle(dpy, button->window, copy_gc, 0, 0, |
4560 |
- button->width, button->height); |
4561 |
+ if (wPreferences.new_style == TS_OLD) { |
4562 |
+ XSetForeground(dpy, copy_gc, scr->dark_pixel); |
4563 |
+ XFillRectangle(dpy, button->window, copy_gc, 0, 0, |
4564 |
+ button->width, button->height); |
4565 |
+ } else { |
4566 |
+ XSetForeground(dpy, copy_gc, scr->black_pixel); |
4567 |
+ XCopyArea(dpy, image->image, button->window, copy_gc, |
4568 |
+ left, 0, width, image->height, x, y); |
4569 |
+ } |
4570 |
} |
4571 |
} else { |
4572 |
if (pushed) { |
4573 |
--- WindowMaker-0.91.0/src/def_pixmaps.h.vns 2004-10-12 21:54:26 +0400 |
4574 |
+++ WindowMaker-0.91.0/src/def_pixmaps.h 2005-05-18 14:57:22 +0400 |
4575 |
@@ -97,6 +97,272 @@ |
4576 |
".........." |
4577 |
}; |
4578 |
|
4579 |
+static char *NEXT_CLOSE_XPM[] = { |
4580 |
+"10 10 69 1", |
4581 |
+" c None", |
4582 |
+". c #FBFBFB", |
4583 |
+"+ c #F9F9F9", |
4584 |
+"@ c #F7F7F7", |
4585 |
+"# c #F4F4F4", |
4586 |
+"$ c #F0F0F0", |
4587 |
+"% c #EDEDED", |
4588 |
+"& c #E8E8E8", |
4589 |
+"* c #AFAFAF", |
4590 |
+"= c #FCFCFC", |
4591 |
+"- c #8B8B8B", |
4592 |
+"; c #DEDEDE", |
4593 |
+"> c #E0E0E0", |
4594 |
+", c #C7C7C7", |
4595 |
+"' c #999999", |
4596 |
+") c #2B2B2B", |
4597 |
+"! c #878787", |
4598 |
+"~ c #F1F1F1", |
4599 |
+"{ c #222222", |
4600 |
+"] c #C2C2C2", |
4601 |
+"^ c #EBEBEB", |
4602 |
+"/ c #DCDCDC", |
4603 |
+"( c #9F9F9F", |
4604 |
+"_ c #363636", |
4605 |
+": c #FEFEFE", |
4606 |
+"< c #C1C1C1", |
4607 |
+"[ c #232323", |
4608 |
+"} c #CFCFCF", |
4609 |
+"| c #282828", |
4610 |
+"1 c #D5D5D5", |
4611 |
+"2 c #FAFAFA", |
4612 |
+"3 c #F6F6F6", |
4613 |
+"4 c #D3D3D3", |
4614 |
+"5 c #121212", |
4615 |
+"6 c #BEBEBE", |
4616 |
+"7 c #898989", |
4617 |
+"8 c #838383", |
4618 |
+"9 c #EEEEEE", |
4619 |
+"0 c #E9E9E9", |
4620 |
+"a c #CDCDCD", |
4621 |
+"b c #080808", |
4622 |
+"c c #131313", |
4623 |
+"d c #A1A1A1", |
4624 |
+"e c #7F7F7F", |
4625 |
+"f c #808080", |
4626 |
+"g c #D9D9D9", |
4627 |
+"h c #8D8D8D", |
4628 |
+"i c #1D1D1D", |
4629 |
+"j c #C9C9C9", |
4630 |
+"k c #B4B4B4", |
4631 |
+"l c #191919", |
4632 |
+"m c #6A6A6A", |
4633 |
+"n c #6C6C6C", |
4634 |
+"o c #7A7A7A", |
4635 |
+"p c #B1B1B1", |
4636 |
+"q c #202020", |
4637 |
+"r c #BBBBBB", |
4638 |
+"s c #D4D4D4", |
4639 |
+"t c #151515", |
4640 |
+"u c #515151", |
4641 |
+"v c #747474", |
4642 |
+"w c #3A3A3A", |
4643 |
+"x c #CCCCCC", |
4644 |
+"y c #B3B3B3", |
4645 |
+"z c #939393", |
4646 |
+"A c #A3A3A3", |
4647 |
+"B c #919191", |
4648 |
+"C c #858585", |
4649 |
+"D c #7C7C7C", |
4650 |
+"...+@#$%&*", |
4651 |
+"=-;#%>,')!", |
4652 |
+"=~{]^/(_!!", |
4653 |
+"=:<[}*|1(!", |
4654 |
+"2@345[>678", |
4655 |
+"@90abc6def", |
4656 |
+"#ghijklmno", |
4657 |
+"~pqrgs(tuv", |
4658 |
+"%wxx'-p8tn", |
4659 |
+"yzAB7C8enD"}; |
4660 |
+ |
4661 |
+ |
4662 |
+static char * NEXT_BROKEN_CLOSE_XPM[] = { |
4663 |
+"10 10 8 1", |
4664 |
+" c None", |
4665 |
+". c #E0E0E0", |
4666 |
+"+ c #7D7D7D", |
4667 |
+"@ c #DBDBDB", |
4668 |
+"# c #BDBDBD", |
4669 |
+"$ c #080808", |
4670 |
+"% c #363636", |
4671 |
+"& c #D4D4D4", |
4672 |
+".........+", |
4673 |
+".+@...#+$+", |
4674 |
+"..$#.@+%++", |
4675 |
+"..###++&++", |
4676 |
+"...&...#++", |
4677 |
+"...&..#+++", |
4678 |
+".@+##+%%%+", |
4679 |
+".+$#@&+$%%", |
4680 |
+".%##++++$%", |
4681 |
+"++++++++%+"}; |
4682 |
+ |
4683 |
+static char *NEXT_KILL_XPM[] = { |
4684 |
+"10 10 64 1", |
4685 |
+" c None", |
4686 |
+". c #FBFBFB", |
4687 |
+"+ c #FAFAFA", |
4688 |
+"@ c #F7F7F7", |
4689 |
+"# c #F5F5F5", |
4690 |
+"$ c #F6F6F6", |
4691 |
+"% c #EEEEEE", |
4692 |
+"& c #B3B3B3", |
4693 |
+"* c #FCFCFC", |
4694 |
+"= c #8B8B8B", |
4695 |
+"- c #E3E3E3", |
4696 |
+"; c #F4F4F4", |
4697 |
+"> c #ECECEC", |
4698 |
+", c #EAEAEA", |
4699 |
+"' c #BFBFBF", |
4700 |
+") c #474747", |
4701 |
+"! c #A5A5A5", |
4702 |
+"~ c #EFEFEF", |
4703 |
+"{ c #262626", |
4704 |
+"] c #B6B6B6", |
4705 |
+"^ c #B4B4B4", |
4706 |
+"/ c #282828", |
4707 |
+"( c #A3A3A3", |
4708 |
+"_ c #FEFEFE", |
4709 |
+": c #E0E0E0", |
4710 |
+"< c #B8B8B8", |
4711 |
+"[ c #C5C5C5", |
4712 |
+"} c #DCDCDC", |
4713 |
+"| c #D3D3D3", |
4714 |
+"1 c #E4E4E4", |
4715 |
+"2 c #B1B1B1", |
4716 |
+"3 c #878787", |
4717 |
+"4 c #D5D5D5", |
4718 |
+"5 c #202020", |
4719 |
+"6 c #222222", |
4720 |
+"7 c #F1F1F1", |
4721 |
+"8 c #959595", |
4722 |
+"9 c #838383", |
4723 |
+"0 c #DBDBDB", |
4724 |
+"a c #252525", |
4725 |
+"b c #E9E9E9", |
4726 |
+"c c #F0F0F0", |
4727 |
+"d c #999999", |
4728 |
+"e c #808080", |
4729 |
+"f c #9B9B9B", |
4730 |
+"g c #C2C2C2", |
4731 |
+"h c #7C7C7C", |
4732 |
+"i c #7A7A7A", |
4733 |
+"j c #232323", |
4734 |
+"k c #CCCCCC", |
4735 |
+"l c #C1C1C1", |
4736 |
+"m c #181818", |
4737 |
+"n c #404040", |
4738 |
+"o c #747474", |
4739 |
+"p c #E7E7E7", |
4740 |
+"q c #303030", |
4741 |
+"r c #C9C9C9", |
4742 |
+"s c #ACACAC", |
4743 |
+"t c #787878", |
4744 |
+"u c #141414", |
4745 |
+"v c #6C6C6C", |
4746 |
+"w c #8F8F8F", |
4747 |
+"x c #858585", |
4748 |
+"y c #7F7F7F", |
4749 |
+"...+@#$$%&", |
4750 |
+"*=-+;>,')!", |
4751 |
+"*~{];#^/((", |
4752 |
+"*_:<[}|123", |
4753 |
+"+@+456;789", |
4754 |
+"@~706abcde", |
4755 |
+"#0fg#$3ehi", |
4756 |
+"c=jk>%lmno", |
4757 |
+"pqr}s(^tuv", |
4758 |
+"2w!d=x9yvh"}; |
4759 |
+ |
4760 |
+static char *NEXT_ICONIFY_XPM[] = { |
4761 |
+"10 10 72 1", |
4762 |
+" c None", |
4763 |
+". c #FCFCFC", |
4764 |
+"+ c #FAFAFA", |
4765 |
+"@ c #F8F8F8", |
4766 |
+"# c #F6F6F6", |
4767 |
+"$ c #F2F2F2", |
4768 |
+"% c #EFEFEF", |
4769 |
+"& c #EAEAEA", |
4770 |
+"* c #A6A6A6", |
4771 |
+"= c #FEFEFE", |
4772 |
+"- c #FDFDFD", |
4773 |
+"; c #F9F9F9", |
4774 |
+"> c #E2E2E2", |
4775 |
+", c #CBCBCB", |
4776 |
+"' c #AFAFAF", |
4777 |
+") c #808080", |
4778 |
+"! c #717171", |
4779 |
+"~ c #FFFFFF", |
4780 |
+"{ c #FBFBFB", |
4781 |
+"] c #F1F1F1", |
4782 |
+"^ c #E5E5E5", |
4783 |
+"/ c #CCCCCC", |
4784 |
+"( c #838383", |
4785 |
+"_ c #A0A0A0", |
4786 |
+": c #989898", |
4787 |
+"< c #8B8B8B", |
4788 |
+"[ c #7F7F7F", |
4789 |
+"} c #E8E8E8", |
4790 |
+"| c #ADADAD", |
4791 |
+"1 c #181818", |
4792 |
+"2 c #171717", |
4793 |
+"3 c #161616", |
4794 |
+"4 c #141414", |
4795 |
+"5 c #0A0A0A", |
4796 |
+"6 c #000000", |
4797 |
+"7 c #A2A2A2", |
4798 |
+"8 c #747474", |
4799 |
+"9 c #6C6C6C", |
4800 |
+"0 c #F0F0F0", |
4801 |
+"a c #B9B9B9", |
4802 |
+"b c #B7B7B7", |
4803 |
+"c c #B1B1B1", |
4804 |
+"d c #868686", |
4805 |
+"e c #020202", |
4806 |
+"f c #EDEDED", |
4807 |
+"g c #939393", |
4808 |
+"h c #676767", |
4809 |
+"i c #696969", |
4810 |
+"j c #8E8E8E", |
4811 |
+"k c #787878", |
4812 |
+"l c #757575", |
4813 |
+"m c #777777", |
4814 |
+"n c #767676", |
4815 |
+"o c #EBEBEB", |
4816 |
+"p c #525252", |
4817 |
+"q c #626262", |
4818 |
+"r c #F3F3F3", |
4819 |
+"s c #E1E1E1", |
4820 |
+"t c #B5B5B5", |
4821 |
+"u c #5F5F5F", |
4822 |
+"v c #424242", |
4823 |
+"w c #5B5B5B", |
4824 |
+"x c #9D9D9D", |
4825 |
+"y c #969696", |
4826 |
+"z c #E4E4E4", |
4827 |
+"A c #444444", |
4828 |
+"B c #2E2E2E", |
4829 |
+"C c #A9A9A9", |
4830 |
+"D c #7C7C7C", |
4831 |
+"E c #797979", |
4832 |
+"F c #5D5D5D", |
4833 |
+"G c #646464", |
4834 |
+"...+@#$%&*", |
4835 |
+".=-;%>,')!", |
4836 |
+"-~={]^/'(!", |
4837 |
+"_'*:<[}|)!", |
4838 |
+"123456%789", |
4839 |
+"0abcdefghi", |
4840 |
+"jklmneonpq", |
4841 |
+"rs^>te}uvw", |
4842 |
+"f_xy9ezABp", |
4843 |
+"CDDEue7FpG"}; |
4844 |
+ |
4845 |
#ifdef XKB_BUTTON_HINT |
4846 |
#include "extend_pixmaps.h" |
4847 |
#endif /* XKB_BUTTON_HINT */ |
4848 |
--- WindowMaker-0.91.0/src/menu.c.vns 2005-05-18 14:57:22 +0400 |
4849 |
+++ WindowMaker-0.91.0/src/menu.c 2005-05-18 14:57:22 +0400 |
4850 |
@@ -672,7 +672,7 @@ |
4851 |
twidth = WMWidthOfString(scr->menu_title_font, menu->frame->title, |
4852 |
strlen(menu->frame->title)); |
4853 |
theight = menu->frame->top_width; |
4854 |
- twidth += theight + (wPreferences.new_style ? 16 : 8); |
4855 |
+ twidth += theight + (wPreferences.new_style == TS_NEW ? 16 : 8); |
4856 |
} else { |
4857 |
twidth = 0; |
4858 |
theight = 0; |
4859 |
--- WindowMaker-0.91.0/WPrefs.app/xpm/Makefile.am.vns 2005-05-18 14:57:22 +0400 |
4860 |
+++ WindowMaker-0.91.0/WPrefs.app/xpm/Makefile.am 2005-05-18 14:57:22 +0400 |
4861 |
@@ -28,6 +28,7 @@ |
4862 |
msty2.xpm \ |
4863 |
msty3.xpm \ |
4864 |
newstyle.xpm \ |
4865 |
+ nextstyle.xpm \ |
4866 |
nonopaque.xpm \ |
4867 |
oldstyle.xpm \ |
4868 |
opaque.xpm \ |
4869 |
--- WindowMaker-0.91.0/WPrefs.app/xpm/oldstyle.xpm.vns 1999-05-01 21:44:44 +0400 |
4870 |
+++ WindowMaker-0.91.0/WPrefs.app/xpm/oldstyle.xpm 2005-05-18 14:57:22 +0400 |
4871 |
@@ -1,45 +1,51 @@ |
4872 |
/* XPM */ |
4873 |
-static char * image_name[] = { |
4874 |
-"38 33 9 1", |
4875 |
-" c #739C739C739C", |
4876 |
-". c #000000000000", |
4877 |
-"X c #210821082108", |
4878 |
-"o c #294A294A294A", |
4879 |
-"O c #FFFFFFFFFFFF", |
4880 |
-"+ c #084208420842", |
4881 |
-"@ c #A528A528A528", |
4882 |
-"# c #529452945294", |
4883 |
-"$ c #AD6AAD6AAD6A", |
4884 |
-" .", |
4885 |
-"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.", |
4886 |
-"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.", |
4887 |
-"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.", |
4888 |
-"XXXXXXXXXXXXXXXXXXXoOOOOOOOOOOOOOOooo+", |
4889 |
-"XXXXXXXXXXXXXXXXXXXoO@@@@@@@@@@@@#ooo+", |
4890 |
-"XXXXXXXXXXXXXXXXXXXoO@.#@@@@@@#.@#ooo+", |
4891 |
-"XXXXXXXXXXXXXXXXXXXoO@#.#@@@@#.#@#ooo+", |
4892 |
-"XXXXXXXXXXXXXXXXXXXoO@@#.#@@#.#@@#ooo+", |
4893 |
-"XXXXXXXXXXXXXXXXXXXoO@@@#.##.#@@@#ooo+", |
4894 |
-"XXXXXXXXXXXXXXXXXXXoO@@@@#..#@@@@#ooo+", |
4895 |
-"XXXXXXXXXXXXXXXXXXXoO@@@@#..#@@@@#ooo+", |
4896 |
-"XXXXXXXXXXXXXXXXXXXoO@@@#.##.#@@@#ooo+", |
4897 |
-"XXXXXXXXXXXXXXXXXXXoO@@#.#@@#.#@@#ooo+", |
4898 |
-"XXXXXXXXXXXXXXXXXXXoO@#.#@@@@#.#@#ooo+", |
4899 |
-"XXXXXXXXXXXXXXXXXXXoO@.#@@@@@@#.@#ooo+", |
4900 |
-"XXXXXXXXXXXXXXXXXXXoO@@@@@@@@@@@@#ooo+", |
4901 |
-"XXXXXXXXXXXXXXXXXXXoO#############ooo+", |
4902 |
-"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo+", |
4903 |
-"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo+", |
4904 |
-"+++++++++++++++++++++++++++++++++++++.", |
4905 |
-"......................................", |
4906 |
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.", |
4907 |
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.", |
4908 |
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.", |
4909 |
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.", |
4910 |
-"##################################O$$.", |
4911 |
-".................................$O$$.", |
4912 |
-"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.", |
4913 |
-"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.", |
4914 |
-"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.", |
4915 |
-"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.", |
4916 |
-"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$."}; |
4917 |
+static char * oldstyle_xpm[] = { |
4918 |
+"37 33 15 1", |
4919 |
+" c None", |
4920 |
+". c #747474", |
4921 |
+"+ c #757575", |
4922 |
+"@ c #000000", |
4923 |
+"# c #222222", |
4924 |
+"$ c #262626", |
4925 |
+"% c #282828", |
4926 |
+"& c #FFFFFF", |
4927 |
+"* c #080808", |
4928 |
+"= c #A5A5A5", |
4929 |
+"- c #535353", |
4930 |
+"; c #060606", |
4931 |
+"> c #070707", |
4932 |
+", c #030303", |
4933 |
+"' c #ABABAB", |
4934 |
+"..................+++++++...........@", |
4935 |
+"##################$$$$$$$%$%$$$$$$$$@", |
4936 |
+"##################$$$$$$$$%%%%%%%%%%@", |
4937 |
+"##################$$$$$$$%$%%%%%%%%%@", |
4938 |
+"##################$&&&&&&&&&&&&&&%%%*", |
4939 |
+"##################$&============-%%%*", |
4940 |
+"##################$&=@-======-@=-%%%*", |
4941 |
+"##################$&=-@-====-@-=-%%%*", |
4942 |
+"##################$&==-@-==-@-==-%%%*", |
4943 |
+"##################$&===-@--@-===-%%%*", |
4944 |
+"##################$&====-@@-====-%%%*", |
4945 |
+"##################$&====-@@-====-%%%*", |
4946 |
+"##################$&===-@--@-===-%%%*", |
4947 |
+"##################$&==-@-==-@-==-%%%*", |
4948 |
+"##################$&=-@-====-@-=-%%%*", |
4949 |
+"##################$&=@-======-@=-%%%*", |
4950 |
+"##################$&============-%%%*", |
4951 |
+"##################$&-------------%%%*", |
4952 |
+"##################$$$$$$$$$%%%%%%%%%*", |
4953 |
+"##################$$$$$$$%$%%%%%%%%%*", |
4954 |
+";;;;;;;;;;;;;;;;;;>>>>>>>>>>>>>*****,", |
4955 |
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", |
4956 |
+"''''''''''''''''''''''''''''''''''''@", |
4957 |
+"''''''''''''''''''''''''''''''''''''@", |
4958 |
+"''''''''''''''''''''''''''''''''''''@", |
4959 |
+"''''''''''''''''''''''''''''''''''''@", |
4960 |
+"---------------------------------&''@", |
4961 |
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'&''@", |
4962 |
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@", |
4963 |
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@", |
4964 |
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@", |
4965 |
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@", |
4966 |
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@"}; |
4967 |
--- WindowMaker-0.91.0/WPrefs.app/tiff/Makefile.am.vns 2005-05-18 14:57:22 +0400 |
4968 |
+++ WindowMaker-0.91.0/WPrefs.app/tiff/Makefile.am 2005-05-18 14:57:22 +0400 |
4969 |
@@ -27,6 +27,7 @@ |
4970 |
msty2.tiff \ |
4971 |
msty3.tiff \ |
4972 |
newstyle.tiff \ |
4973 |
+ nextstyle.tiff \ |
4974 |
nonopaque.tiff \ |
4975 |
oldstyle.tiff \ |
4976 |
opaque.tiff \ |
4977 |
--- WindowMaker-0.91.0/WPrefs.app/Configurations.c.vns 2004-10-23 07:03:35 +0400 |
4978 |
+++ WindowMaker-0.91.0/WPrefs.app/Configurations.c 2005-05-18 15:26:38 +0400 |
4979 |
@@ -42,6 +42,7 @@ |
4980 |
WMFrame *titlF; |
4981 |
WMButton *oldsB; |
4982 |
WMButton *newsB; |
4983 |
+ WMButton *nextB; |
4984 |
|
4985 |
WMFrame *animF; |
4986 |
WMButton *animB; |
4987 |
@@ -68,6 +69,7 @@ |
4988 |
|
4989 |
#define OLDS_IMAGE "oldstyle" |
4990 |
#define NEWS_IMAGE "newstyle" |
4991 |
+#define NEXT_IMAGE "nextstyle" |
4992 |
|
4993 |
#define ANIM_IMAGE "animations" |
4994 |
#define SUPERF_IMAGE "moreanim" |
4995 |
@@ -86,16 +88,21 @@ |
4996 |
static void |
4997 |
showData(_Panel *panel) |
4998 |
{ |
4999 |
+ char *str; |
5000 |
+ |
5001 |
WMPerformButtonClick(panel->icoB[GetSpeedForKey("IconSlideSpeed")]); |
5002 |
|
5003 |
WMPerformButtonClick(panel->shaB[GetSpeedForKey("ShadeSpeed")]); |
5004 |
|
5005 |
- if (GetBoolForKey("NewStyle")) { |
5006 |
- WMPerformButtonClick(panel->newsB); |
5007 |
+ str = GetStringForKey("Newstyle"); |
5008 |
+ if (str && strcasecmp(str, "next") == 0) { |
5009 |
+ WMPerformButtonClick(panel->nextB); |
5010 |
+ } else if(str && strcasecmp(str, "old") == 0) { |
5011 |
+ WMPerformButtonClick(panel->oldsB); |
5012 |
} else { |
5013 |
- WMPerformButtonClick(panel->oldsB); |
5014 |
+ WMPerformButtonClick(panel->newsB); |
5015 |
} |
5016 |
- |
5017 |
+ |
5018 |
WMSetButtonSelected(panel->animB, !GetBoolForKey("DisableAnimations")); |
5019 |
|
5020 |
WMSetButtonSelected(panel->supB, GetBoolForKey("Superfluous")); |
5021 |
@@ -325,20 +332,34 @@ |
5022 |
} |
5023 |
|
5024 |
panel->oldsB = WMCreateButton(panel->titlF, WBTOnOff); |
5025 |
- WMResizeWidget(panel->oldsB, 74, 40); |
5026 |
+ WMResizeWidget(panel->oldsB, 37, 40); |
5027 |
WMMoveWidget(panel->oldsB, 15, 60); |
5028 |
WMSetButtonImagePosition(panel->oldsB, WIPImageOnly); |
5029 |
path = LocateImage(OLDS_IMAGE); |
5030 |
if (path) { |
5031 |
- icon = WMCreatePixmapFromFile(scr, path); |
5032 |
- if (icon) { |
5033 |
- WMSetButtonImage(panel->oldsB, icon); |
5034 |
- WMReleasePixmap(icon); |
5035 |
- } |
5036 |
- wfree(path); |
5037 |
+ icon = WMCreatePixmapFromFile(scr, path); |
5038 |
+ if (icon) { |
5039 |
+ WMSetButtonImage(panel->oldsB, icon); |
5040 |
+ WMReleasePixmap(icon); |
5041 |
+ } |
5042 |
+ } |
5043 |
+ |
5044 |
+ panel->nextB = WMCreateButton(panel->titlF, WBTOnOff); |
5045 |
+ WMResizeWidget(panel->nextB, 37, 40); |
5046 |
+ WMMoveWidget(panel->nextB, 52, 60); |
5047 |
+ WMSetButtonImagePosition(panel->nextB, WIPImageOnly); |
5048 |
+ path = LocateImage(NEXT_IMAGE); |
5049 |
+ if (path) { |
5050 |
+ icon = WMCreatePixmapFromFile(scr, path); |
5051 |
+ if (icon) { |
5052 |
+ WMSetButtonImage(panel->nextB, icon); |
5053 |
+ WMReleasePixmap(icon); |
5054 |
+ } |
5055 |
+ wfree(path); |
5056 |
} |
5057 |
|
5058 |
WMGroupButtons(panel->newsB, panel->oldsB); |
5059 |
+ WMGroupButtons(panel->newsB, panel->nextB); |
5060 |
|
5061 |
WMMapSubwidgets(panel->titlF); |
5062 |
|
5063 |
@@ -495,7 +516,13 @@ |
5064 |
} |
5065 |
SetSpeedForKey(i, "ShadeSpeed"); |
5066 |
|
5067 |
- SetBoolForKey(WMGetButtonSelected(panel->newsB), "NewStyle"); |
5068 |
+ if (WMGetButtonSelected(panel->newsB)) { |
5069 |
+ SetStringForKey("new", "NewStyle"); |
5070 |
+ } else if (WMGetButtonSelected(panel->oldsB)) { |
5071 |
+ SetStringForKey("old", "NewStyle"); |
5072 |
+ } else { |
5073 |
+ SetStringForKey("next", "NewStyle"); |
5074 |
+ } |
5075 |
|
5076 |
SetBoolForKey(!WMGetButtonSelected(panel->animB), "DisableAnimations"); |
5077 |
SetBoolForKey(WMGetButtonSelected(panel->supB), "Superfluous"); |
5078 |
|
5079 |
|
5080 |
|
5081 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-vlaad-trance.patch |
5082 |
|
5083 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-vlaad-trance.patch?rev=1.1&view=markup |
5084 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-alt-vlaad-trance.patch?rev=1.1&content-type=text/plain |
5085 |
|
5086 |
Index: WindowMaker-0.91.0-alt-vlaad-trance.patch |
5087 |
=================================================================== |
5088 |
--- WindowMaker-0.91.0/src/menu.c.vns 2005-05-18 14:44:22 +0400 |
5089 |
+++ WindowMaker-0.91.0/src/menu.c 2005-05-18 14:44:23 +0400 |
5090 |
@@ -93,6 +93,7 @@ |
5091 |
static void menuCloseClick(WCoreWindow *sender, void *data, XEvent *event); |
5092 |
|
5093 |
static void updateTexture(WMenu *menu); |
5094 |
+static void clipDimensionsToScreen(WMenu *menu, int *x, int *y, int *width, int *height); |
5095 |
|
5096 |
#ifndef LITE |
5097 |
static int saveMenuRecurs(WMPropList *menus, WScreen *scr, WMenu *menu); |
5098 |
@@ -498,6 +499,119 @@ |
5099 |
|
5100 |
|
5101 |
static void |
5102 |
+clipDimensionsToScreen(WMenu *menu, int *x, int *y, int *width, int *height) |
5103 |
+{ |
5104 |
+ int sw, sh; |
5105 |
+ int fx, fy; |
5106 |
+ |
5107 |
+ sw = menu->menu->screen_ptr->scr_width; |
5108 |
+ sh = menu->menu->screen_ptr->scr_height; |
5109 |
+ |
5110 |
+ fx = *x + *width; |
5111 |
+ fy = *y + *height; |
5112 |
+ |
5113 |
+ /* CLAMP everything */ |
5114 |
+ if (*x > sw) { *x = sw; } else if (*x < 0) { *x = 0; } |
5115 |
+ if (*y > sh) { *y = sh; } else if (*y < 0) { *y = 0; } |
5116 |
+ if (fx > sw) { fx = sw; } else if (fx < 0) { fx = 0; } |
5117 |
+ if (fy > sh) { fy = sh; } else if (fy < 0) { fy = 0; } |
5118 |
+ |
5119 |
+ /* Make sure that height and width are positive */ |
5120 |
+ if (fx < *x) { *width = 0; } else { *width = fx - *x; } |
5121 |
+ if (fy < *y) { *height = 0; } else { *height = fy - *y; } |
5122 |
+} |
5123 |
+ |
5124 |
+static Pixmap |
5125 |
+tranceMenu(WMenu *menu) |
5126 |
+{ |
5127 |
+ WScreen *scr = menu->menu->screen_ptr; |
5128 |
+ |
5129 |
+ XImage *back, *front; |
5130 |
+ RImage *trance, *menu_image, *msnormal; |
5131 |
+ Pixmap original, result; |
5132 |
+ |
5133 |
+ int mw, mh, dx, dy; /* these correspond to the menu proper */ |
5134 |
+ int gx, gy, gw, gh; /* these correspond to what we grab from the root window */ |
5135 |
+ int tamount; |
5136 |
+ unsigned long red_mask, green_mask, blue_mask; |
5137 |
+ |
5138 |
+ unsigned int w, h, bar; |
5139 |
+ int foo; |
5140 |
+ Window baz; |
5141 |
+ |
5142 |
+ mw = gw = menu->menu->width; |
5143 |
+ mh = gh = menu->menu->height; |
5144 |
+ dx = gx = menu->frame_x + 1; |
5145 |
+ dy = gy = menu->frame_y + menu->frame->top_width + 1; |
5146 |
+ |
5147 |
+ tamount = wPreferences.trance_amount; |
5148 |
+ clipDimensionsToScreen(menu, &gx, &gy, &gw, &gh); |
5149 |
+ back = XGetImage(dpy, scr->root_win, gx, gy, gw, gh, |
5150 |
+ AllPlanes, ZPixmap); |
5151 |
+ if (!back) { |
5152 |
+ wwarning(_("error capturing \"back\" image"),RMessageForError(RErrorCode)); |
5153 |
+ return None; |
5154 |
+ } else { |
5155 |
+ red_mask = back->red_mask; |
5156 |
+ green_mask = back->green_mask; |
5157 |
+ blue_mask = back->blue_mask; |
5158 |
+ |
5159 |
+ trance = RCreateImageFromXImage(scr->rcontext, back, NULL); |
5160 |
+ XDestroyImage(back); |
5161 |
+ if (!trance) { |
5162 |
+ wwarning(_("error rendering \"trance\" image"), |
5163 |
+ RMessageForError(RErrorCode)); |
5164 |
+ return None; |
5165 |
+ } else { |
5166 |
+ /************************************************************/ |
5167 |
+ original = renderTexture(menu); |
5168 |
+ |
5169 |
+ XGetGeometry(dpy, original, &baz, &foo, |
5170 |
+ &foo, &w, &h, &bar, &bar); |
5171 |
+ front = XGetImage(dpy, original, 0, 0, w, h, |
5172 |
+ AllPlanes, ZPixmap); |
5173 |
+ if (!front) { |
5174 |
+ wwarning(_("error capturing \"front\" image"), |
5175 |
+ RMessageForError(RErrorCode)); |
5176 |
+ return None; |
5177 |
+ } |
5178 |
+ front->red_mask = red_mask; |
5179 |
+ front->green_mask = green_mask; |
5180 |
+ front->blue_mask = blue_mask; |
5181 |
+ |
5182 |
+ menu_image=RCreateImageFromXImage(scr->rcontext,front,NULL); |
5183 |
+ |
5184 |
+ XDestroyImage(front); |
5185 |
+ /************************************************************/ |
5186 |
+ if (original) { |
5187 |
+ FREE_PIXMAP(original); |
5188 |
+ } |
5189 |
+ if (!menu_image) { |
5190 |
+ wwarning(_("error rendering \"menu_image\""), |
5191 |
+ RMessageForError(RErrorCode)); |
5192 |
+ return None; |
5193 |
+ } else { |
5194 |
+ if (wPreferences.menu_style == MS_NORMAL) { |
5195 |
+ msnormal = RMakeTiledImage(menu_image, mw, mh); |
5196 |
+ RCombineAreaWithOpaqueness(trance, msnormal,0,0,gw,gh, |
5197 |
+ gx - dx,gy - dy,256*tamount/10); |
5198 |
+ RReleaseImage(menu_image); |
5199 |
+ RReleaseImage(msnormal); |
5200 |
+ } else { |
5201 |
+ RCombineAreaWithOpaqueness(trance, menu_image,0,0,gw,gh, |
5202 |
+ gx - dx,gy - dy,256*tamount/10); |
5203 |
+ RReleaseImage(menu_image); |
5204 |
+ } |
5205 |
+ RConvertImage(scr->rcontext, trance, |
5206 |
+ &result); |
5207 |
+ } |
5208 |
+ RReleaseImage(trance); |
5209 |
+ } |
5210 |
+ } |
5211 |
+ return result; |
5212 |
+} |
5213 |
+ |
5214 |
+static void |
5215 |
updateTexture(WMenu *menu) |
5216 |
{ |
5217 |
WScreen *scr = menu->menu->screen_ptr; |
5218 |
@@ -507,7 +621,14 @@ |
5219 |
if (!menu->flags.brother) { |
5220 |
FREE_PIXMAP(menu->menu_texture_data); |
5221 |
|
5222 |
- menu->menu_texture_data = renderTexture(menu); |
5223 |
+ if (wPreferences.menu_trance) { |
5224 |
+ if((menu->menu_texture_data = tranceMenu(menu))==NULL) |
5225 |
+ { |
5226 |
+ menu->menu_texture_data = renderTexture(menu); |
5227 |
+ } |
5228 |
+ } else { |
5229 |
+ menu->menu_texture_data = renderTexture(menu); |
5230 |
+ } |
5231 |
|
5232 |
XSetWindowBackgroundPixmap(dpy, menu->menu->window, |
5233 |
menu->menu_texture_data); |
5234 |
@@ -1166,6 +1287,11 @@ |
5235 |
XMoveWindow(dpy, menu->frame->core->window, x, y); |
5236 |
menu->frame_x = x; |
5237 |
menu->frame_y = y; |
5238 |
+ /* FIXME: needs an if */ |
5239 |
+ if (wPreferences.menu_trance) { |
5240 |
+ updateTexture(menu); |
5241 |
+ } |
5242 |
+ /* */ |
5243 |
XMapWindow(dpy, menu->frame->core->window); |
5244 |
wRaiseFrame(menu->frame->core); |
5245 |
menu->flags.mapped = 1; |
5246 |
@@ -1190,6 +1316,11 @@ |
5247 |
menu->frame_y = menu->frame->screen_ptr->app_menu_y; |
5248 |
XMoveWindow(dpy, menu->frame->core->window, menu->frame_x, menu->frame_y); |
5249 |
} |
5250 |
+ /* FIXME: needs an if */ |
5251 |
+ if (wPreferences.menu_trance) { |
5252 |
+ updateTexture(menu); |
5253 |
+ } |
5254 |
+ /* */ |
5255 |
XMapWindow(dpy, menu->frame->core->window); |
5256 |
wRaiseFrame(menu->frame->core); |
5257 |
menu->flags.mapped = 1; |
5258 |
--- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 14:44:23 +0400 |
5259 |
+++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 14:44:23 +0400 |
5260 |
@@ -339,6 +339,8 @@ |
5261 |
char opaque_move; /* update window position during */ |
5262 |
/* move */ |
5263 |
|
5264 |
+ char menu_trance; /* whether menu should be translucent */ |
5265 |
+ int trance_amount; /* percentage of translucency */ |
5266 |
char wrap_menus; /* wrap menus at edge of screen */ |
5267 |
char scrollable_menus; /* let them be scrolled */ |
5268 |
char align_menus; /* align menu with their parents */ |
5269 |
--- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 14:44:23 +0400 |
5270 |
+++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 14:44:23 +0400 |
5271 |
@@ -499,6 +499,12 @@ |
5272 |
{"UseSaveUnders", "NO", NULL, |
5273 |
&wPreferences.use_saveunders, getBool, NULL |
5274 |
}, |
5275 |
+ {"MenuTrance", "NO", NULL, |
5276 |
+ &wPreferences.menu_trance, getBool, NULL |
5277 |
+ }, |
5278 |
+ {"TranceAmount", "30", NULL, |
5279 |
+ &wPreferences.trance_amount, getInt, NULL |
5280 |
+ }, |
5281 |
{"OpaqueMove", "NO", NULL, |
5282 |
&wPreferences.opaque_move, getBool, NULL |
5283 |
}, |
5284 |
--- WindowMaker-0.91.0/WPrefs.app/Appearance.c.vns 2005-05-18 14:44:23 +0400 |
5285 |
+++ WindowMaker-0.91.0/WPrefs.app/Appearance.c 2005-05-18 14:51:21 +0400 |
5286 |
@@ -82,6 +82,11 @@ |
5287 |
WMFrame *taliF; |
5288 |
WMButton *taliB[3]; |
5289 |
|
5290 |
+ WMFrame *tranceF; |
5291 |
+ WMButton *tranceB; |
5292 |
+ WMSlider *tranceSl; |
5293 |
+ WMLabel *tranceL; |
5294 |
+ |
5295 |
/* root bg */ |
5296 |
WMFrame *bgF; |
5297 |
|
5298 |
@@ -1714,6 +1719,23 @@ |
5299 |
} |
5300 |
} |
5301 |
|
5302 |
+static void |
5303 |
+tranceCallback(WMWidget *self, void *data) |
5304 |
+{ |
5305 |
+ _Panel *panel = (_Panel*)data; |
5306 |
+ char buffer[5]; |
5307 |
+ int i; |
5308 |
+ |
5309 |
+ i = WMGetSliderValue(panel->tranceSl); |
5310 |
+ i = 10*(10-i); |
5311 |
+ |
5312 |
+ if (i == 0) { |
5313 |
+ WMSetLabelText(panel->tranceL, "OFF"); |
5314 |
+ } else { |
5315 |
+ sprintf(buffer, "%i%%", i); |
5316 |
+ WMSetLabelText(panel->tranceL, buffer); |
5317 |
+ } |
5318 |
+} |
5319 |
|
5320 |
static void |
5321 |
createPanel(Panel *p) |
5322 |
@@ -2005,7 +2027,7 @@ |
5323 |
|
5324 |
|
5325 |
panel->taliF = WMCreateFrame(panel->optF); |
5326 |
- WMResizeWidget(panel->taliF, 110, 80); |
5327 |
+ WMResizeWidget(panel->taliF, 105, 80); |
5328 |
WMMoveWidget(panel->taliF, 15, 100); |
5329 |
WMSetFrameTitle(panel->taliF, _("Title Alignment")); |
5330 |
|
5331 |
@@ -2023,7 +2045,7 @@ |
5332 |
WMSetButtonText(panel->taliB[i], _("Right")); |
5333 |
break; |
5334 |
} |
5335 |
- WMResizeWidget(panel->taliB[i], 90, 18); |
5336 |
+ WMResizeWidget(panel->taliB[i], 85, 18); |
5337 |
WMMoveWidget(panel->taliB[i], 10, 15 + 20*i); |
5338 |
} |
5339 |
WMGroupButtons(panel->taliB[0], panel->taliB[1]); |
5340 |
@@ -2031,6 +2053,36 @@ |
5341 |
|
5342 |
WMMapSubwidgets(panel->taliF); |
5343 |
|
5344 |
+ panel->tranceF = WMCreateFrame(panel->optF); |
5345 |
+ WMResizeWidget(panel->tranceF, 105,80); |
5346 |
+ WMMoveWidget(panel->tranceF, 125, 100); |
5347 |
+ WMSetFrameTitle(panel->tranceF,_("Transparency")); |
5348 |
+ |
5349 |
+ WMSetBalloonTextForView(_("<yermom> i love windowmaker\n" |
5350 |
+ "<tarzeau> get some fresh sand-wich-es\n" |
5351 |
+ "<flip-> heh\n" |
5352 |
+ "<flip-> transparency\n" |
5353 |
+ "<flip-> moo\n" |
5354 |
+ "<flip-> :P\n"), WMWidgetView(panel->tranceF)); |
5355 |
+ |
5356 |
+ panel->tranceB = WMCreateSwitchButton(panel->tranceF); |
5357 |
+ WMSetButtonText(panel->tranceB, _("Menu")); |
5358 |
+ WMResizeWidget(panel->tranceB,85,18); |
5359 |
+ WMMoveWidget(panel->tranceB, 10, 15); |
5360 |
+ |
5361 |
+ panel->tranceSl = WMCreateSlider(panel->tranceF); |
5362 |
+ WMResizeWidget(panel->tranceSl, 70, 18); |
5363 |
+ WMMoveWidget(panel->tranceSl, 17, 15 + 20*2); |
5364 |
+ WMSetSliderMinValue(panel->tranceSl, 0); |
5365 |
+ WMSetSliderMaxValue(panel->tranceSl, 10); |
5366 |
+ WMSetSliderAction(panel->tranceSl, tranceCallback, panel); |
5367 |
+ |
5368 |
+ panel->tranceL = WMCreateLabel(panel->tranceF); |
5369 |
+ WMResizeWidget(panel->tranceL, 27, 18); |
5370 |
+ WMMoveWidget(panel->tranceL, 40, 35); |
5371 |
+ |
5372 |
+ WMMapSubwidgets(panel->tranceF); |
5373 |
+ |
5374 |
WMMapSubwidgets(panel->optF); |
5375 |
|
5376 |
/**/ |
5377 |
@@ -2089,6 +2141,7 @@ |
5378 |
static void |
5379 |
showData(_Panel *panel) |
5380 |
{ |
5381 |
+ int x; |
5382 |
int i; |
5383 |
char *str; |
5384 |
|
5385 |
@@ -2134,6 +2187,13 @@ |
5386 |
|
5387 |
WMSetButtonSelected(panel->mstyB[panel->menuStyle], True); |
5388 |
WMSetButtonSelected(panel->taliB[panel->titleAlignment], True); |
5389 |
+ |
5390 |
+ |
5391 |
+ WMSetButtonSelected(panel->tranceB, GetBoolForKey("MenuTrance")); |
5392 |
+ |
5393 |
+ x = GetIntegerForKey("TranceAmount"); |
5394 |
+ WMSetSliderValue(panel->tranceSl, x); |
5395 |
+ tranceCallback(NULL, panel); |
5396 |
} |
5397 |
|
5398 |
|
5399 |
@@ -2185,6 +2245,9 @@ |
5400 |
SetStringForKey("center", "TitleJustify"); |
5401 |
break; |
5402 |
} |
5403 |
+ |
5404 |
+ SetBoolForKey(WMGetButtonSelected(panel->tranceB), "MenuTrance"); |
5405 |
+ SetIntegerForKey(WMGetSliderValue(panel->tranceSl), "TranceAmount"); |
5406 |
} |
5407 |
|
5408 |
|
5409 |
|
5410 |
|
5411 |
|
5412 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-hmepas-minimizeall.patch |
5413 |
|
5414 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-hmepas-minimizeall.patch?rev=1.1&view=markup |
5415 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-hmepas-minimizeall.patch?rev=1.1&content-type=text/plain |
5416 |
|
5417 |
Index: WindowMaker-0.91.0-hmepas-minimizeall.patch |
5418 |
=================================================================== |
5419 |
--- WindowMaker-0.91.0/src/event.c.vns 2005-05-18 21:40:15 +0400 |
5420 |
+++ WindowMaker-0.91.0/src/event.c 2005-05-18 21:42:02 +0400 |
5421 |
@@ -1410,6 +1410,10 @@ |
5422 |
OpenWindowMenu(wwin, wwin->frame_x, |
5423 |
wwin->frame_y+wwin->frame->top_width, True); |
5424 |
break; |
5425 |
+ case WKBD_ALLMINIMIZE: |
5426 |
+ CloseWindowMenu(scr); |
5427 |
+ wHideAll(scr); |
5428 |
+ break; |
5429 |
case WKBD_MINIATURIZE: |
5430 |
if (ISMAPPED(wwin) && ISFOCUSED(wwin) |
5431 |
&& !WFLAGP(wwin, no_miniaturizable)) { |
5432 |
--- WindowMaker-0.91.0/src/actions.c.vns 2005-05-18 21:40:15 +0400 |
5433 |
+++ WindowMaker-0.91.0/src/actions.c 2005-05-18 21:40:16 +0400 |
5434 |
@@ -1295,6 +1295,57 @@ |
5435 |
|
5436 |
|
5437 |
|
5438 |
+// ADDED BY HMEPAS |
5439 |
+void wHideAll(WScreen *scr) |
5440 |
+{ |
5441 |
+ WWindow *wwin; |
5442 |
+ WWindow **windows; |
5443 |
+ Window FocusedWin; |
5444 |
+ WMenu *menu; |
5445 |
+ unsigned int wcount = 0; |
5446 |
+ int FocusState; |
5447 |
+ int i; |
5448 |
+ |
5449 |
+ if (!scr) |
5450 |
+ return; |
5451 |
+ |
5452 |
+ menu = scr->switch_menu; |
5453 |
+ |
5454 |
+ windows = malloc( sizeof(WWindow *) ); |
5455 |
+ |
5456 |
+ if (menu != NULL) { |
5457 |
+ for(i=0;i<menu->entry_no;i++) { |
5458 |
+ windows[wcount] = (WWindow *) menu->entries[i]->clientdata; |
5459 |
+ wcount++; |
5460 |
+ windows = realloc(windows, sizeof(WWindow *) * (wcount+1) ); |
5461 |
+ } |
5462 |
+ } else { |
5463 |
+ wwin = scr->focused_window; |
5464 |
+ |
5465 |
+ while(wwin) { |
5466 |
+ windows[wcount] = wwin; |
5467 |
+ wcount++; |
5468 |
+ windows = realloc(windows, sizeof(WWindow *) * (wcount+1) ); |
5469 |
+ wwin = wwin->prev; |
5470 |
+ |
5471 |
+ } |
5472 |
+ } |
5473 |
+ |
5474 |
+ for(i=0;i < wcount; i++) { |
5475 |
+ wwin = windows[i]; |
5476 |
+ if (wwin->frame->workspace == scr->current_workspace |
5477 |
+ && !(wwin->flags.miniaturized||wwin->flags.hidden) |
5478 |
+ && !wwin->flags.internal_window |
5479 |
+ && !WFLAGP(wwin, no_miniaturizable) |
5480 |
+ ) |
5481 |
+ { |
5482 |
+ wwin->flags.skip_next_animation = 1; |
5483 |
+ wIconifyWindow(wwin); |
5484 |
+ } |
5485 |
+ } |
5486 |
+} |
5487 |
+ |
5488 |
+ |
5489 |
void |
5490 |
wHideOtherApplications(WWindow *awin) |
5491 |
{ |
5492 |
--- WindowMaker-0.91.0/src/actions.h.vns 2004-10-12 21:53:07 +0400 |
5493 |
+++ WindowMaker-0.91.0/src/actions.h 2005-05-18 21:40:16 +0400 |
5494 |
@@ -69,5 +69,8 @@ |
5495 |
void wUnfullscreenWindow(WWindow *wwin); |
5496 |
|
5497 |
|
5498 |
+// ADDED BY HMEPAS TO MINIMIZE ALL WINDOWS ON CURRENT WORKSPACE |
5499 |
+void wHideAll(WScreen *src); |
5500 |
+ |
5501 |
#endif |
5502 |
|
5503 |
--- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 21:40:16 +0400 |
5504 |
+++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 21:40:16 +0400 |
5505 |
@@ -705,6 +705,9 @@ |
5506 |
NULL, getKeybind, setKeyGrab |
5507 |
}, |
5508 |
#endif /* LITE */ |
5509 |
+ {"AllMinimizeKey", "None", (void*)WKBD_ALLMINIMIZE, |
5510 |
+ NULL, getKeybind, setKeyGrab |
5511 |
+ }, |
5512 |
{"WindowMenuKey", "None", (void*)WKBD_WINDOWMENU, |
5513 |
NULL, getKeybind, setKeyGrab |
5514 |
}, |
5515 |
--- WindowMaker-0.91.0/src/keybind.h.vns 2004-10-12 21:55:38 +0400 |
5516 |
+++ WindowMaker-0.91.0/src/keybind.h 2005-05-18 21:43:50 +0400 |
5517 |
@@ -77,12 +77,13 @@ |
5518 |
#define WKBD_WINDOW10 44 |
5519 |
|
5520 |
#define WKBD_SWITCH_SCREEN 45 |
5521 |
+#define WKBD_ALLMINIMIZE 46 |
5522 |
|
5523 |
#ifdef KEEP_XKB_LOCK_STATUS |
5524 |
-# define WKBD_TOGGLE 46 |
5525 |
-# define WKBD_TMP 47 |
5526 |
+# define WKBD_TOGGLE 47 |
5527 |
+# define WKBD_TMP 48 |
5528 |
#else |
5529 |
-# define WKBD_TMP 46 |
5530 |
+# define WKBD_TMP 47 |
5531 |
#endif |
5532 |
|
5533 |
#ifdef VIRTUAL_DESKTOP |
5534 |
|
5535 |
|
5536 |
|
5537 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-hmepas-swmenu_rclick.patch |
5538 |
|
5539 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-hmepas-swmenu_rclick.patch?rev=1.1&view=markup |
5540 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-hmepas-swmenu_rclick.patch?rev=1.1&content-type=text/plain |
5541 |
|
5542 |
Index: WindowMaker-0.91.0-hmepas-swmenu_rclick.patch |
5543 |
=================================================================== |
5544 |
--- WindowMaker-0.91.0/src/menu.c.vns 2005-05-18 21:46:03 +0400 |
5545 |
+++ WindowMaker-0.91.0/src/menu.c 2005-05-18 21:46:03 +0400 |
5546 |
@@ -2077,6 +2077,7 @@ |
5547 |
static void |
5548 |
menuMouseDown(WObjDescriptor *desc, XEvent *event) |
5549 |
{ |
5550 |
+ WWindow *wwin; // ADDED BY HMEPAS FOR sw_rclick |
5551 |
XButtonEvent *bev = &event->xbutton; |
5552 |
WMenu *menu = desc->parent; |
5553 |
WMenu *smenu; |
5554 |
@@ -2160,7 +2161,27 @@ |
5555 |
} |
5556 |
|
5557 |
} else if (!delayed_select) { |
5558 |
- selectEntry(menu, entry_no); |
5559 |
+ // ADDED BY HMEPAS |
5560 |
+ // FOR WindowMenu open by right click on |
5561 |
+ // switchmenu entry |
5562 |
+ if( menu == scr->switch_menu && event->xbutton.button == Button3 ) { |
5563 |
+ selectEntry(menu, entry_no); |
5564 |
+ OpenWindowMenu2( (WWindow*)entry->clientdata, |
5565 |
+ event->xbutton.x_root, |
5566 |
+ event->xbutton.y_root, False); |
5567 |
+ wwin = (WWindow*)entry->clientdata; |
5568 |
+ desc = &wwin->screen_ptr->window_menu->menu->descriptor; |
5569 |
+ event->xany.send_event = True; |
5570 |
+ (*desc->handle_mousedown)(desc, event); |
5571 |
+ |
5572 |
+ XUngrabPointer(dpy, CurrentTime); |
5573 |
+ selectEntry(menu, -1); |
5574 |
+ return; |
5575 |
+ } |
5576 |
+ else { |
5577 |
+ selectEntry(menu, entry_no); |
5578 |
+ } |
5579 |
+ // END OF HMEPAS PATCH |
5580 |
} |
5581 |
|
5582 |
if (!wPreferences.wrap_menus && !wPreferences.scrollable_menus) { |
5583 |
--- WindowMaker-0.91.0/src/funcs.h.vns 2004-10-14 22:03:28 +0400 |
5584 |
+++ WindowMaker-0.91.0/src/funcs.h 2005-05-18 21:46:03 +0400 |
5585 |
@@ -65,6 +65,13 @@ |
5586 |
|
5587 |
void OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard); |
5588 |
|
5589 |
+// THIS IS NEED FOR MY SW_RIGHT CLICK PATCH |
5590 |
+// (FOR MOVING WINDOW FROM ANOTHER WORKSPACE TO |
5591 |
+// CURRENT) ON NATIVE FUNCTION MOVE TO CURRENT |
5592 |
+// WORKSPACE IS DISABLED |
5593 |
+// HMEPAS |
5594 |
+void OpenWindowMenu2(WWindow *wwin, int x, int y, int keyboard); |
5595 |
+ |
5596 |
void OpenMiniwindowMenu(WWindow *wwin, int x, int y); |
5597 |
|
5598 |
void OpenWorkspaceMenu(WScreen *scr, int x, int y); |
5599 |
--- WindowMaker-0.91.0/src/winmenu.c.vns 2004-10-21 07:21:16 +0400 |
5600 |
+++ WindowMaker-0.91.0/src/winmenu.c 2005-05-18 21:52:50 +0400 |
5601 |
@@ -619,7 +619,6 @@ |
5602 |
wMenuRealize(menu); |
5603 |
} |
5604 |
|
5605 |
- |
5606 |
void |
5607 |
OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard) |
5608 |
{ |
5609 |
@@ -650,10 +649,46 @@ |
5610 |
updateMenuForWindow(menu, wwin); |
5611 |
|
5612 |
x -= menu->frame->core->width/2; |
5613 |
- if (x + menu->frame->core->width > wwin->frame_x+wwin->frame->core->width) |
5614 |
- x = wwin->frame_x+wwin->frame->core->width - menu->frame->core->width; |
5615 |
- if (x < wwin->frame_x) |
5616 |
- x = wwin->frame_x; |
5617 |
+ if (!wwin->flags.internal_window) |
5618 |
+ wMenuMapAt(menu, x, y, keyboard); |
5619 |
+} |
5620 |
+ |
5621 |
+void |
5622 |
+OpenWindowMenu2(WWindow *wwin, int x, int y, int keyboard) |
5623 |
+{ |
5624 |
+ int i; |
5625 |
+ WMenu *menu; |
5626 |
+ WScreen *scr = wwin->screen_ptr; |
5627 |
+ |
5628 |
+ wwin->flags.menu_open_for_me = 1; |
5629 |
+ |
5630 |
+ if (!scr->window_menu) { |
5631 |
+ scr->window_menu = createWindowMenu(scr); |
5632 |
+ |
5633 |
+ /* hack to save some memory allocation/deallocation */ |
5634 |
+ wfree(scr->window_menu->entries[MC_MINIATURIZE]->text); |
5635 |
+ wfree(scr->window_menu->entries[MC_MAXIMIZE]->text); |
5636 |
+ wfree(scr->window_menu->entries[MC_SHADE]->text); |
5637 |
+ } else { |
5638 |
+ updateWorkspaceMenu(scr->workspace_submenu); |
5639 |
+ } |
5640 |
+ |
5641 |
+ menu = scr->window_menu; |
5642 |
+ if (menu->flags.mapped) { |
5643 |
+ wMenuUnmap(menu); |
5644 |
+ if (menu->entries[0]->clientdata==wwin) { |
5645 |
+ return; |
5646 |
+ } |
5647 |
+ } |
5648 |
+ |
5649 |
+ updateMenuForWindow(menu, wwin); |
5650 |
+ |
5651 |
+ for (i = 0; i < scr->workspace_submenu->entry_no; i++) { |
5652 |
+ scr->workspace_submenu->entries[i]->clientdata = wwin; |
5653 |
+ wMenuSetEnabled(scr->workspace_submenu, i, True); |
5654 |
+ } |
5655 |
+ |
5656 |
+ x -= menu->frame->core->width/2; |
5657 |
|
5658 |
if (!wwin->flags.internal_window) |
5659 |
wMenuMapAt(menu, x, y, keyboard); |
5660 |
|
5661 |
|
5662 |
|
5663 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-peter-appicon-bouncer2.patch |
5664 |
|
5665 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-peter-appicon-bouncer2.patch?rev=1.1&view=markup |
5666 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-peter-appicon-bouncer2.patch?rev=1.1&content-type=text/plain |
5667 |
|
5668 |
Index: WindowMaker-0.91.0-peter-appicon-bouncer2.patch |
5669 |
=================================================================== |
5670 |
--- WindowMaker-0.91.0/src/application.c.vns 2005-05-19 12:42:35 +0400 |
5671 |
+++ WindowMaker-0.91.0/src/application.c 2005-05-19 12:42:35 +0400 |
5672 |
@@ -448,6 +448,16 @@ |
5673 |
if (wapp->refcount>0) |
5674 |
return; |
5675 |
|
5676 |
+#ifdef BOUNCE_APP |
5677 |
+ if (wapp->flags.bouncing) |
5678 |
+ { |
5679 |
+ /* event.c:handleDestroyNotify forced this destroy |
5680 |
+ and thereby overlooked the bounce callback */ |
5681 |
+ wapp->refcount = 1; |
5682 |
+ return; |
5683 |
+ } |
5684 |
+#endif |
5685 |
+ |
5686 |
|
5687 |
scr = wapp->main_window_desc->screen_ptr; |
5688 |
main_window = wapp->main_window; |
5689 |
--- WindowMaker-0.91.0/src/application.h.vns 2005-05-19 12:42:35 +0400 |
5690 |
+++ WindowMaker-0.91.0/src/application.h 2005-05-19 12:44:51 +0400 |
5691 |
@@ -46,6 +46,9 @@ |
5692 |
unsigned int skip_next_animation:1; |
5693 |
unsigned int hidden:1; |
5694 |
unsigned int emulated:1; |
5695 |
+#ifdef BOUNCE_APP |
5696 |
+ unsigned int bouncing:1; |
5697 |
+#endif |
5698 |
} flags; |
5699 |
} WApplication; |
5700 |
|
5701 |
@@ -58,6 +61,8 @@ |
5702 |
void wApplicationExtractDirPackIcon(WScreen *scr,char *path, char *wm_instance, |
5703 |
char *wm_class); |
5704 |
|
5705 |
+void wAppBounce(WApplication *); |
5706 |
+ |
5707 |
#ifdef NEWAPPICON |
5708 |
|
5709 |
#define wApplicationActivate(wapp) do { \ |
5710 |
--- WindowMaker-0.91.0/src/superfluous.c.vns 2004-10-12 21:46:38 +0400 |
5711 |
+++ WindowMaker-0.91.0/src/superfluous.c 2005-05-19 12:42:35 +0400 |
5712 |
@@ -41,6 +41,7 @@ |
5713 |
#include "window.h" |
5714 |
#include "icon.h" |
5715 |
#include "appicon.h" |
5716 |
+#include "xinerama.h" |
5717 |
|
5718 |
|
5719 |
extern WPreferences wPreferences; |
5720 |
@@ -810,3 +811,164 @@ |
5721 |
|
5722 |
#endif /* GHOST_WINDOW_MOVE */ |
5723 |
|
5724 |
+#ifdef BOUNCE_APP |
5725 |
+ |
5726 |
+#define BOUNCE_HZ 25 |
5727 |
+#define BOUNCE_DELAY (1000/BOUNCE_HZ) |
5728 |
+#define BOUNCE_HEIGHT 24 |
5729 |
+#define BOUNCE_LENGTH 0.3 |
5730 |
+#define BOUNCE_DAMP 0.6 |
5731 |
+ |
5732 |
+typedef struct AppBouncerData { |
5733 |
+ WApplication *wapp; |
5734 |
+ int count; |
5735 |
+ int pow; |
5736 |
+ int dir; |
5737 |
+ WMHandlerID *timer; |
5738 |
+} AppBouncerData; |
5739 |
+ |
5740 |
+static void |
5741 |
+doAppBounce(void *arg) |
5742 |
+{ |
5743 |
+ AppBouncerData *data = (AppBouncerData*)arg; |
5744 |
+ WAppIcon *aicon = data->wapp->app_icon; |
5745 |
+ |
5746 |
+reinit: |
5747 |
+ if (aicon && data->wapp->refcount > 1) |
5748 |
+ { |
5749 |
+ const double ticks = BOUNCE_HZ*BOUNCE_LENGTH; |
5750 |
+ const double s = sqrt(BOUNCE_HEIGHT)/(ticks/2); |
5751 |
+ double h = BOUNCE_HEIGHT*pow(BOUNCE_DAMP, data->pow); |
5752 |
+ double sqrt_h = sqrt(h); |
5753 |
+ if (h > 3) |
5754 |
+ { |
5755 |
+ double offset, x = s * data->count - sqrt_h; |
5756 |
+ if (x > sqrt_h) |
5757 |
+ { |
5758 |
+ ++data->pow; |
5759 |
+ data->count = 0; |
5760 |
+ goto reinit; |
5761 |
+ } else ++data->count; |
5762 |
+ offset = h - x*x; |
5763 |
+ |
5764 |
+ switch(data->dir) |
5765 |
+ { |
5766 |
+ case 0: /* left, bounce to right */ |
5767 |
+ XMoveWindow(dpy, aicon->icon->core->window, |
5768 |
+ aicon->x_pos + (int)offset, aicon->y_pos); |
5769 |
+ break; |
5770 |
+ case 1: /* right, bounce to left */ |
5771 |
+ XMoveWindow(dpy, aicon->icon->core->window, |
5772 |
+ aicon->x_pos - (int)offset, aicon->y_pos); |
5773 |
+ break; |
5774 |
+ case 2: /* top, bounce down */ |
5775 |
+ XMoveWindow(dpy, aicon->icon->core->window, |
5776 |
+ aicon->x_pos, aicon->y_pos + (int)offset); |
5777 |
+ break; |
5778 |
+ case 3: /* bottom, bounce up */ |
5779 |
+ XMoveWindow(dpy, aicon->icon->core->window, |
5780 |
+ aicon->x_pos, aicon->y_pos - (int)offset); |
5781 |
+ break; |
5782 |
+ } |
5783 |
+ return; |
5784 |
+ } |
5785 |
+ XMoveWindow(dpy, aicon->icon->core->window, |
5786 |
+ aicon->x_pos, aicon->y_pos); |
5787 |
+ } |
5788 |
+ |
5789 |
+ data->wapp->flags.bouncing = 0; |
5790 |
+ WMDeleteTimerHandler(data->timer); |
5791 |
+ wApplicationDestroy(data->wapp); |
5792 |
+ free(data); |
5793 |
+} |
5794 |
+ |
5795 |
+static int |
5796 |
+bounceDirection(WAppIcon *aicon) |
5797 |
+{ |
5798 |
+ enum { left_e = 1, right_e = 2, top_e = 4, bottom_e = 8 }; |
5799 |
+ |
5800 |
+ WScreen *scr = aicon->icon->core->screen_ptr; |
5801 |
+ WMRect rr, sr; |
5802 |
+ int l,r,t,b, h,v; |
5803 |
+ int dir = 0; |
5804 |
+ |
5805 |
+ rr.pos.x = aicon->x_pos; |
5806 |
+ rr.pos.y = aicon->y_pos; |
5807 |
+ rr.size.width = rr.size.height = 64; |
5808 |
+ |
5809 |
+ sr = wGetRectForHead(scr, wGetHeadForRect(scr, rr)); |
5810 |
+ |
5811 |
+ l = rr.pos.x - sr.pos.x; |
5812 |
+ r = sr.pos.x + sr.size.width - rr.pos.x - rr.size.width; |
5813 |
+ t = rr.pos.y - sr.pos.y; |
5814 |
+ b = sr.pos.y + sr.size.height - rr.pos.y - rr.size.height; |
5815 |
+ |
5816 |
+ if (l < r) { |
5817 |
+ dir |= left_e; |
5818 |
+ h = l; |
5819 |
+ } else { |
5820 |
+ dir |= right_e; |
5821 |
+ h = r; |
5822 |
+ } |
5823 |
+ |
5824 |
+ if (t < b) { |
5825 |
+ dir |= top_e; |
5826 |
+ v = t; |
5827 |
+ } else { |
5828 |
+ dir |= bottom_e; |
5829 |
+ v = b; |
5830 |
+ } |
5831 |
+ |
5832 |
+ if (h < v) dir &= ~(top_e | bottom_e); |
5833 |
+ else dir &= ~(left_e | right_e); |
5834 |
+ |
5835 |
+ switch(dir) |
5836 |
+ { |
5837 |
+ case left_e: |
5838 |
+ dir = 0; |
5839 |
+ break; |
5840 |
+ |
5841 |
+ case right_e: |
5842 |
+ dir = 1; |
5843 |
+ break; |
5844 |
+ |
5845 |
+ case top_e: |
5846 |
+ dir = 2; |
5847 |
+ break; |
5848 |
+ |
5849 |
+ case bottom_e: |
5850 |
+ dir = 3; |
5851 |
+ break; |
5852 |
+ |
5853 |
+ default: |
5854 |
+ wwarning(_("impossible direction: %d\n"), dir); |
5855 |
+ dir = 3; |
5856 |
+ break; |
5857 |
+ } |
5858 |
+ |
5859 |
+ return dir; |
5860 |
+} |
5861 |
+ |
5862 |
+void |
5863 |
+wAppBounce(WApplication * wapp) |
5864 |
+{ |
5865 |
+ if (wapp->app_icon && !wapp->flags.bouncing) |
5866 |
+ { |
5867 |
+ ++wapp->refcount; |
5868 |
+ wapp->flags.bouncing = 1; |
5869 |
+ |
5870 |
+ AppBouncerData *data = |
5871 |
+ (AppBouncerData*)malloc(sizeof(AppBouncerData)); |
5872 |
+ data->wapp = wapp; |
5873 |
+ data->count = data->pow = 0; |
5874 |
+ data->dir = bounceDirection(wapp->app_icon); |
5875 |
+ data->timer = WMAddPersistentTimerHandler(BOUNCE_DELAY, doAppBounce, data); |
5876 |
+ } |
5877 |
+} |
5878 |
+ |
5879 |
+#else |
5880 |
+void |
5881 |
+wAppBounce(WApplication * wapp) |
5882 |
+{ |
5883 |
+} |
5884 |
+#endif |
5885 |
--- WindowMaker-0.92.0/src/window.c.orig 2006-11-04 09:57:52.000000000 +0100 |
5886 |
+++ WindowMaker-0.92.0/src/window.c 2006-11-04 10:00:33.000000000 +0100 |
5887 |
@@ -1399,6 +1399,11 @@ |
5888 |
raise = True; |
5889 |
} |
5890 |
} |
5891 |
+ /* only do the Bounce when animations are activated */ |
5892 |
+ if(!wPreferences.no_animations) |
5893 |
+ { |
5894 |
+ wAppBounce(app); |
5895 |
+ } |
5896 |
} |
5897 |
} |
5898 |
|
5899 |
|
5900 |
|
5901 |
|
5902 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-peter-mouse-placement.patch |
5903 |
|
5904 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-peter-mouse-placement.patch?rev=1.1&view=markup |
5905 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-peter-mouse-placement.patch?rev=1.1&content-type=text/plain |
5906 |
|
5907 |
Index: WindowMaker-0.91.0-peter-mouse-placement.patch |
5908 |
=================================================================== |
5909 |
--- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-19 12:29:12 +0400 |
5910 |
+++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-19 12:29:12 +0400 |
5911 |
@@ -169,6 +169,8 @@ |
5912 |
#define WPM_SMART 2 |
5913 |
#define WPM_RANDOM 3 |
5914 |
#define WPM_AUTO 4 |
5915 |
+#define WPM_SMARTMOUSE 5 |
5916 |
+#define WPM_MOUSE 6 |
5917 |
|
5918 |
/* text justification */ |
5919 |
#define WTJ_CENTER 0 |
5920 |
--- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-19 12:29:12 +0400 |
5921 |
+++ WindowMaker-0.91.0/src/defaults.c 2005-05-19 12:29:12 +0400 |
5922 |
@@ -238,6 +238,8 @@ |
5923 |
{"Cascade", WPM_CASCADE, 0}, |
5924 |
{"Random", WPM_RANDOM, 0}, |
5925 |
{"Manual", WPM_MANUAL, 0}, |
5926 |
+ {"SmartMouse", WPM_SMARTMOUSE, 0}, |
5927 |
+ {"Mouse", WPM_MOUSE, 0}, |
5928 |
{NULL, 0, 0} |
5929 |
}; |
5930 |
|
5931 |
--- WindowMaker-0.91.0/src/placement.c.vns 2005-05-19 12:29:11 +0400 |
5932 |
+++ WindowMaker-0.91.0/src/placement.c 2005-05-19 12:31:22 +0400 |
5933 |
@@ -416,6 +416,127 @@ |
5934 |
*y_ret = min_isect_y; |
5935 |
} |
5936 |
|
5937 |
+static void |
5938 |
+smartmousePlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, |
5939 |
+ unsigned int width, unsigned int height, |
5940 |
+ WArea usableArea) |
5941 |
+{ |
5942 |
+ WScreen *scr = wwin->screen_ptr; |
5943 |
+ int test_x = 0, test_y = usableArea.y1; |
5944 |
+ int from_x, to_x, from_y, to_y; |
5945 |
+ int pointer_x, pointer_y; |
5946 |
+ double rad, min_rad = INT_MAX; |
5947 |
+ int sx; |
5948 |
+ int min_isect, min_isect_x, min_isect_y; |
5949 |
+ int sum_isect; |
5950 |
+ |
5951 |
+ if (wwin->frame) { |
5952 |
+ height += wwin->frame->top_width + wwin->frame->bottom_width; |
5953 |
+ } else { |
5954 |
+ if (HAS_TITLEBAR(wwin)) height += 18; |
5955 |
+ if (HAS_RESIZEBAR(wwin)) height += 8; |
5956 |
+ } |
5957 |
+ if (HAS_BORDER(wwin)) { |
5958 |
+ height += 2; |
5959 |
+ width += 2; |
5960 |
+ } |
5961 |
+ |
5962 |
+ sx = usableArea.x1; |
5963 |
+ |
5964 |
+ min_isect = INT_MAX; |
5965 |
+ min_isect_x = sx; |
5966 |
+ min_isect_y = test_y; |
5967 |
+ |
5968 |
+ { |
5969 |
+ Window win; |
5970 |
+ int tint; |
5971 |
+ unsigned int tuint; |
5972 |
+ |
5973 |
+ XQueryPointer(dpy, scr->root_win, &win, &win, |
5974 |
+ &pointer_x, &pointer_y, |
5975 |
+ &tint, &tint, &tuint); |
5976 |
+ } |
5977 |
+ |
5978 |
+#define SQ(x) ((x)*(x)) |
5979 |
+#define RAD() sqrt( SQ(test_x + width/2 - pointer_x) + \ |
5980 |
+ SQ(test_y + height/2 - pointer_y)) |
5981 |
+ |
5982 |
+ while (((test_y + height) < usableArea.y2)) { |
5983 |
+ test_x = sx; |
5984 |
+ while ((test_x + width) < usableArea.x2) { |
5985 |
+ sum_isect = calcSumOfCoveredAreas(wwin, test_x, test_y, |
5986 |
+ width, height); |
5987 |
+ rad = RAD(); |
5988 |
+ if ( sum_isect < min_isect || |
5989 |
+ (sum_isect == min_isect && rad < min_rad)) { |
5990 |
+ min_rad = rad; |
5991 |
+ min_isect = sum_isect; |
5992 |
+ min_isect_x = test_x; |
5993 |
+ min_isect_y = test_y; |
5994 |
+ } |
5995 |
+ |
5996 |
+ test_x += PLACETEST_HSTEP; |
5997 |
+ } |
5998 |
+ test_y += PLACETEST_VSTEP; |
5999 |
+ } |
6000 |
+ |
6001 |
+ from_x = min_isect_x - PLACETEST_HSTEP + 1; |
6002 |
+ from_x = WMAX(from_x, usableArea.x1); |
6003 |
+ to_x = min_isect_x + PLACETEST_HSTEP; |
6004 |
+ if (to_x + width > usableArea.x2) |
6005 |
+ to_x = usableArea.x2 - width; |
6006 |
+ |
6007 |
+ from_y = min_isect_y - PLACETEST_VSTEP + 1; |
6008 |
+ from_y = WMAX(from_y, usableArea.y1); |
6009 |
+ to_y = min_isect_y + PLACETEST_VSTEP; |
6010 |
+ if (to_y + height > usableArea.y2) |
6011 |
+ to_y = usableArea.y2 - height; |
6012 |
+ |
6013 |
+ for (test_x = from_x; test_x < to_x; test_x++) { |
6014 |
+ for (test_y = from_y; test_y < to_y; test_y++) { |
6015 |
+ sum_isect = calcSumOfCoveredAreas(wwin, test_x, test_y, |
6016 |
+ width, height); |
6017 |
+ rad = RAD(); |
6018 |
+ if ( sum_isect < min_isect || |
6019 |
+ (sum_isect == min_isect && rad < min_rad)) { |
6020 |
+ min_rad = rad; |
6021 |
+ min_isect = sum_isect; |
6022 |
+ min_isect_x = test_x; |
6023 |
+ min_isect_y = test_y; |
6024 |
+ } |
6025 |
+ } |
6026 |
+ } |
6027 |
+ |
6028 |
+ *x_ret = min_isect_x; |
6029 |
+ *y_ret = min_isect_y; |
6030 |
+} |
6031 |
+ |
6032 |
+static void |
6033 |
+mousePlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, |
6034 |
+ unsigned int width, unsigned int height, WArea usableArea) |
6035 |
+{ |
6036 |
+ WScreen *scr = wwin->screen_ptr; |
6037 |
+ int pointer_x, pointer_y; |
6038 |
+ |
6039 |
+ { |
6040 |
+ Window win; |
6041 |
+ int tint; |
6042 |
+ unsigned int tuint; |
6043 |
+ |
6044 |
+ XQueryPointer(dpy, scr->root_win, &win, &win, |
6045 |
+ &pointer_x, &pointer_y, |
6046 |
+ &tint, &tint, &tuint); |
6047 |
+ } |
6048 |
+ |
6049 |
+ *x_ret = pointer_x - width/2; |
6050 |
+ *y_ret = pointer_y - height/2; |
6051 |
+ |
6052 |
+ if ( *x_ret < usableArea.x1) *x_ret = usableArea.x1; |
6053 |
+ else if ( *x_ret + width > usableArea.x2) *x_ret = usableArea.x2 - width; |
6054 |
+ |
6055 |
+ if ( *y_ret < usableArea.y1) *y_ret = usableArea.y1; |
6056 |
+ else if ( *y_ret + height > usableArea.y2) *y_ret = usableArea.y2 - height; |
6057 |
+} |
6058 |
|
6059 |
static Bool |
6060 |
autoPlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, |
6061 |
@@ -610,6 +731,14 @@ |
6062 |
smartPlaceWindow(wwin, x_ret, y_ret, width, height, usableArea); |
6063 |
break; |
6064 |
|
6065 |
+ case WPM_SMARTMOUSE: |
6066 |
+ smartmousePlaceWindow(wwin, x_ret, y_ret, width, height, usableArea); |
6067 |
+ break; |
6068 |
+ |
6069 |
+ case WPM_MOUSE: |
6070 |
+ mousePlaceWindow(wwin, x_ret, y_ret, width, height, usableArea); |
6071 |
+ break; |
6072 |
+ |
6073 |
case WPM_AUTO: |
6074 |
if (autoPlaceWindow(wwin, x_ret, y_ret, width, height, 0, |
6075 |
usableArea)) { |
6076 |
--- WindowMaker-0.91.0/WPrefs.app/WindowHandling.c.vns 2004-10-13 00:19:34 +0400 |
6077 |
+++ WindowMaker-0.91.0/WPrefs.app/WindowHandling.c 2005-05-19 12:32:39 +0400 |
6078 |
@@ -77,7 +77,9 @@ |
6079 |
"random", |
6080 |
"manual", |
6081 |
"cascade", |
6082 |
- "smart" |
6083 |
+ "smart", |
6084 |
+ "smartmouse", |
6085 |
+ "mouse" |
6086 |
}; |
6087 |
|
6088 |
|
6089 |
@@ -137,6 +139,10 @@ |
6090 |
return 3; |
6091 |
else if (strcasecmp(str, "smart")==0) |
6092 |
return 4; |
6093 |
+ else if (strcasecmp(str, "smartmouse")==0) |
6094 |
+ return 5; |
6095 |
+ else if (strcasecmp(str, "mouse")==0) |
6096 |
+ return 6; |
6097 |
else |
6098 |
wwarning(_("bad option value %s in WindowPlacement. Using default value"), |
6099 |
str); |
6100 |
@@ -252,6 +258,8 @@ |
6101 |
WMAddPopUpButtonItem(panel->placP, _("Manual")); |
6102 |
WMAddPopUpButtonItem(panel->placP, _("Cascade")); |
6103 |
WMAddPopUpButtonItem(panel->placP, _("Smart")); |
6104 |
+ WMAddPopUpButtonItem(panel->placP, _("SmartMouse")); |
6105 |
+ WMAddPopUpButtonItem(panel->placP, _("Mouse")); |
6106 |
|
6107 |
panel->porigL = WMCreateLabel(panel->placF); |
6108 |
WMResizeWidget(panel->porigL, 120, 32); |
6109 |
|
6110 |
|
6111 |
|
6112 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-peter-newappicon.patch |
6113 |
|
6114 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-peter-newappicon.patch?rev=1.1&view=markup |
6115 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-peter-newappicon.patch?rev=1.1&content-type=text/plain |
6116 |
|
6117 |
Index: WindowMaker-0.91.0-peter-newappicon.patch |
6118 |
=================================================================== |
6119 |
--- WindowMaker-0.91.0/wrlib/misc.c.vns 2004-10-12 22:21:39 +0400 |
6120 |
+++ WindowMaker-0.91.0/wrlib/misc.c 2005-05-19 11:42:54 +0400 |
6121 |
@@ -152,7 +152,7 @@ |
6122 |
} |
6123 |
} else { |
6124 |
int bytes = image->width*image->height; |
6125 |
- int alpha, nalpha, r, g, b; |
6126 |
+ int alpha, nalpha, r, g, b, s; |
6127 |
|
6128 |
alpha = color->alpha; |
6129 |
r = color->red * alpha; |
6130 |
@@ -160,17 +160,53 @@ |
6131 |
b = color->blue * alpha; |
6132 |
nalpha = 255 - alpha; |
6133 |
|
6134 |
- for (i=0; i<bytes; i++) { |
6135 |
- *d = (((int)*d * nalpha) + r)/256; d++; |
6136 |
- *d = (((int)*d * nalpha) + g)/256; d++; |
6137 |
- *d = (((int)*d * nalpha) + b)/256; d++; |
6138 |
- if (image->format == RRGBAFormat) { |
6139 |
- d++; |
6140 |
- } |
6141 |
+ s = (image->format == RRGBAFormat) ? 4 : 3; |
6142 |
+ |
6143 |
+ for (i=0; i<bytes; i++, d+=s) { |
6144 |
+ d[0] = (((int)d[0] * nalpha) + r)/256; |
6145 |
+ d[1] = (((int)d[1] * nalpha) + g)/256; |
6146 |
+ d[2] = (((int)d[2] * nalpha) + b)/256; |
6147 |
} |
6148 |
} |
6149 |
} |
6150 |
|
6151 |
+static __inline__ unsigned char |
6152 |
+clip(int c) { |
6153 |
+ if (c > 255) c=255; |
6154 |
+ return (unsigned char)c; |
6155 |
+} |
6156 |
+ |
6157 |
+void |
6158 |
+RLightImage(RImage *image, RColor *color) |
6159 |
+{ |
6160 |
+ unsigned char *d = image->data; |
6161 |
+ unsigned char *dd; |
6162 |
+ int alpha, r, g, b, s; |
6163 |
+ |
6164 |
+ s = (image->format == RRGBAFormat) ? 4 : 3; |
6165 |
+ dd = d + s*image->width*image->height; |
6166 |
+ |
6167 |
+ r = color->red; |
6168 |
+ g = color->green; |
6169 |
+ b = color->blue; |
6170 |
+ |
6171 |
+ alpha = color->alpha; |
6172 |
+ |
6173 |
+ if (r == 0 && g == 0 && b == 0) { |
6174 |
+ for (; d<dd; d+=s) { |
6175 |
+ d[0] = clip(((int)d[0] * alpha)/128); |
6176 |
+ d[1] = clip(((int)d[1] * alpha)/128); |
6177 |
+ d[2] = clip(((int)d[2] * alpha)/128); |
6178 |
+ } |
6179 |
+ } else { |
6180 |
+ for (; d<dd; d+=s) { |
6181 |
+ d[0] = clip((((int)d[0] * alpha) + r)/128); |
6182 |
+ d[1] = clip((((int)d[1] * alpha) + g)/128); |
6183 |
+ d[2] = clip((((int)d[2] * alpha) + b)/128); |
6184 |
+ } |
6185 |
+ } |
6186 |
+} |
6187 |
+ |
6188 |
const char* |
6189 |
RMessageForError(int errorCode) |
6190 |
{ |
6191 |
--- WindowMaker-0.91.0/wrlib/wraster.h.vns 2004-10-24 09:08:13 +0400 |
6192 |
+++ WindowMaker-0.91.0/wrlib/wraster.h 2005-05-19 11:42:54 +0400 |
6193 |
@@ -411,6 +411,8 @@ |
6194 |
*/ |
6195 |
void RClearImage(RImage *image, RColor *color); |
6196 |
|
6197 |
+void RLightImage(RImage *image, RColor *color); |
6198 |
+ |
6199 |
void RFillImage(RImage *image, RColor *color); |
6200 |
|
6201 |
void RBevelImage(RImage *image, int bevel_type); |
6202 |
--- WindowMaker-0.91.0/src/icon.c.vns 2005-05-19 11:42:53 +0400 |
6203 |
+++ WindowMaker-0.91.0/src/icon.c 2005-05-19 11:42:54 +0400 |
6204 |
@@ -312,7 +312,7 @@ |
6205 |
|
6206 |
|
6207 |
static Pixmap |
6208 |
-makeIcon(WScreen *scr, RImage *icon, int titled, int shadowed, int tileType) |
6209 |
+makeIcon(WScreen *scr, RImage *icon, int titled, int shadowed, int tileType, int highlighted) |
6210 |
{ |
6211 |
RImage *tile; |
6212 |
Pixmap pixmap; |
6213 |
@@ -355,6 +355,13 @@ |
6214 |
color.alpha = 150; /* about 60% */ |
6215 |
RClearImage(tile, &color); |
6216 |
} |
6217 |
+ if (highlighted) { |
6218 |
+ RColor color; |
6219 |
+ |
6220 |
+ color.red = color.green = color.blue = 0; |
6221 |
+ color.alpha = 160; |
6222 |
+ RLightImage(tile, &color); |
6223 |
+ } |
6224 |
|
6225 |
if (!RConvertImage(scr->rcontext, tile, &pixmap)) { |
6226 |
wwarning(_("error rendering image:%s"), RMessageForError(RErrorCode)); |
6227 |
@@ -597,6 +604,7 @@ |
6228 |
} |
6229 |
|
6230 |
icon->highlighted = flag; |
6231 |
+ icon->force_paint = True; |
6232 |
wIconPaint(icon); |
6233 |
} |
6234 |
|
6235 |
@@ -766,7 +774,7 @@ |
6236 |
|
6237 |
if (icon->image) { |
6238 |
icon->pixmap = makeIcon(scr, icon->image, icon->show_title, |
6239 |
- icon->shadowed, icon->tile_type); |
6240 |
+ icon->shadowed, icon->tile_type, icon->highlighted); |
6241 |
} else { |
6242 |
/* make default icons */ |
6243 |
|
6244 |
@@ -794,9 +802,9 @@ |
6245 |
|
6246 |
image = wIconValidateIconSize(scr, image); |
6247 |
scr->def_icon_pixmap = makeIcon(scr, image, False, False, |
6248 |
- icon->tile_type); |
6249 |
+ icon->tile_type, icon->highlighted); |
6250 |
scr->def_ticon_pixmap = makeIcon(scr, image, True, False, |
6251 |
- icon->tile_type); |
6252 |
+ icon->tile_type, icon->highlighted); |
6253 |
if (image) |
6254 |
RReleaseImage(image); |
6255 |
} |
6256 |
--- WindowMaker-0.91.0/src/appicon.c.vns 2005-05-19 11:42:53 +0400 |
6257 |
+++ WindowMaker-0.91.0/src/appicon.c 2005-05-19 11:42:54 +0400 |
6258 |
@@ -222,7 +222,7 @@ |
6259 |
|
6260 |
|
6261 |
|
6262 |
-#ifdef NEWAPPICON |
6263 |
+#if 0 |
6264 |
static void |
6265 |
drawCorner(WIcon *icon, WWindow *wwin, int active) |
6266 |
{ |
6267 |
--- WindowMaker-0.91.0/src/application.c.vns 2005-05-19 11:42:53 +0400 |
6268 |
+++ WindowMaker-0.91.0/src/application.c 2005-05-19 11:42:54 +0400 |
6269 |
@@ -465,6 +465,9 @@ |
6270 |
|
6271 |
XDeleteContext(dpy, wapp->main_window, wAppWinContext); |
6272 |
wAppMenuDestroy(wapp->menu); |
6273 |
+#ifdef NEWAPPICON |
6274 |
+ wApplicationDeactivate(wapp); |
6275 |
+#endif |
6276 |
if (wapp->app_icon) { |
6277 |
if (wapp->app_icon->docked && !wapp->app_icon->attracted) { |
6278 |
wapp->app_icon->running = 0; |
6279 |
--- WindowMaker-0.91.0/src/application.h.vns 2004-10-12 21:53:54 +0400 |
6280 |
+++ WindowMaker-0.91.0/src/application.h 2005-05-19 11:47:21 +0400 |
6281 |
@@ -60,15 +60,21 @@ |
6282 |
|
6283 |
#ifdef NEWAPPICON |
6284 |
|
6285 |
-# define wApplicationActivate(wapp) {\ |
6286 |
- wapp->main_window_desc->flags.focused=1; \ |
6287 |
- wAppIconPaint(wapp->app_icon);\ |
6288 |
- } |
6289 |
-#define wApplicationDeactivate(wapp) {\ |
6290 |
- wapp->main_window_desc->flags.focused=0;\ |
6291 |
- wAppIconPaint(wapp->app_icon);\ |
6292 |
- } |
6293 |
-#endif |
6294 |
+#define wApplicationActivate(wapp) do { \ |
6295 |
+ if (wapp->app_icon) { \ |
6296 |
+ wIconSetHighlited(wapp->app_icon->icon, True); \ |
6297 |
+ wAppIconPaint(wapp->app_icon);\ |
6298 |
+ } \ |
6299 |
+ } while (0) |
6300 |
+ |
6301 |
+#define wApplicationDeactivate(wapp) do { \ |
6302 |
+ if (wapp->app_icon) { \ |
6303 |
+ wIconSetHighlited(wapp->app_icon->icon, False); \ |
6304 |
+ wAppIconPaint(wapp->app_icon);\ |
6305 |
+ } \ |
6306 |
+ } while (0) |
6307 |
+ |
6308 |
|
6309 |
#endif |
6310 |
|
6311 |
+#endif |
6312 |
|
6313 |
|
6314 |
|
6315 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-sga-moving-add.patch |
6316 |
|
6317 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-sga-moving-add.patch?rev=1.1&view=markup |
6318 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-sga-moving-add.patch?rev=1.1&content-type=text/plain |
6319 |
|
6320 |
Index: WindowMaker-0.91.0-sga-moving-add.patch |
6321 |
=================================================================== |
6322 |
--- WindowMaker-0.91.0/src/event.c.vns 2005-05-18 22:00:15 +0400 |
6323 |
+++ WindowMaker-0.91.0/src/event.c 2005-05-18 22:01:18 +0400 |
6324 |
@@ -1405,6 +1405,21 @@ |
6325 |
} |
6326 |
break; |
6327 |
#endif /* !LITE */ |
6328 |
+ case WKBD_MOVELEFTBOTTOM: |
6329 |
+ case WKBD_MOVEBOTTOM: |
6330 |
+ case WKBD_MOVERIGHTBOTTOM: |
6331 |
+ case WKBD_MOVELEFT: |
6332 |
+ case WKBD_MOVECENTER: |
6333 |
+ case WKBD_MOVERIGHT: |
6334 |
+ case WKBD_MOVELEFTTOP: |
6335 |
+ case WKBD_MOVETOP: |
6336 |
+ case WKBD_MOVERIGHTTOP: |
6337 |
+ if (ISMAPPED(wwin) && ISFOCUSED(wwin) && |
6338 |
+ (!WFLAGP(wwin, no_resizable) || !WFLAGP(wwin, no_movable))) { |
6339 |
+ CloseWindowMenu(scr); |
6340 |
+ wKeyboardMoveWindowAdditional(wwin, command); |
6341 |
+ } |
6342 |
+ break; |
6343 |
case WKBD_WINDOWMENU: |
6344 |
if (ISMAPPED(wwin) && ISFOCUSED(wwin)) |
6345 |
OpenWindowMenu(wwin, wwin->frame_x, |
6346 |
--- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 22:00:15 +0400 |
6347 |
+++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 22:00:15 +0400 |
6348 |
@@ -705,6 +705,33 @@ |
6349 |
NULL, getKeybind, setKeyGrab |
6350 |
}, |
6351 |
#endif /* LITE */ |
6352 |
+ {"MoveLeftBottomKey", "None", (void*)WKBD_MOVELEFTBOTTOM, |
6353 |
+ NULL, getKeybind, setKeyGrab |
6354 |
+ }, |
6355 |
+ {"MoveBottomKey", "None", (void*)WKBD_MOVEBOTTOM, |
6356 |
+ NULL, getKeybind, setKeyGrab |
6357 |
+ }, |
6358 |
+ {"MoveRightBottomKey", "None", (void*)WKBD_MOVERIGHTBOTTOM, |
6359 |
+ NULL, getKeybind, setKeyGrab |
6360 |
+ }, |
6361 |
+ {"MoveLeftKey", "None", (void*)WKBD_MOVELEFT, |
6362 |
+ NULL, getKeybind, setKeyGrab |
6363 |
+ }, |
6364 |
+ {"MoveCenterKey", "None", (void*)WKBD_MOVECENTER, |
6365 |
+ NULL, getKeybind, setKeyGrab |
6366 |
+ }, |
6367 |
+ {"MoveRightKey", "None", (void*)WKBD_MOVERIGHT, |
6368 |
+ NULL, getKeybind, setKeyGrab |
6369 |
+ }, |
6370 |
+ {"MoveLeftTopKey", "None", (void*)WKBD_MOVELEFTTOP, |
6371 |
+ NULL, getKeybind, setKeyGrab |
6372 |
+ }, |
6373 |
+ {"MoveTopKey", "None", (void*)WKBD_MOVETOP, |
6374 |
+ NULL, getKeybind, setKeyGrab |
6375 |
+ }, |
6376 |
+ {"MoveRightTopKey", "None", (void*)WKBD_MOVERIGHTTOP, |
6377 |
+ NULL, getKeybind, setKeyGrab |
6378 |
+ }, |
6379 |
{"AllMinimizeKey", "None", (void*)WKBD_ALLMINIMIZE, |
6380 |
NULL, getKeybind, setKeyGrab |
6381 |
}, |
6382 |
--- WindowMaker-0.91.0/src/keybind.h.vns 2005-05-18 22:00:15 +0400 |
6383 |
+++ WindowMaker-0.91.0/src/keybind.h 2005-05-18 22:02:39 +0400 |
6384 |
@@ -78,12 +78,21 @@ |
6385 |
|
6386 |
#define WKBD_SWITCH_SCREEN 45 |
6387 |
#define WKBD_ALLMINIMIZE 46 |
6388 |
+#define WKBD_MOVELEFTBOTTOM 47 |
6389 |
+#define WKBD_MOVEBOTTOM 48 |
6390 |
+#define WKBD_MOVERIGHTBOTTOM 49 |
6391 |
+#define WKBD_MOVELEFT 50 |
6392 |
+#define WKBD_MOVECENTER 51 |
6393 |
+#define WKBD_MOVERIGHT 52 |
6394 |
+#define WKBD_MOVELEFTTOP 53 |
6395 |
+#define WKBD_MOVETOP 54 |
6396 |
+#define WKBD_MOVERIGHTTOP 55 |
6397 |
|
6398 |
#ifdef KEEP_XKB_LOCK_STATUS |
6399 |
-# define WKBD_TOGGLE 47 |
6400 |
-# define WKBD_TMP 48 |
6401 |
+# define WKBD_TOGGLE 56 |
6402 |
+# define WKBD_TMP 57 |
6403 |
#else |
6404 |
-# define WKBD_TMP 47 |
6405 |
+# define WKBD_TMP 56 |
6406 |
#endif |
6407 |
|
6408 |
#ifdef VIRTUAL_DESKTOP |
6409 |
--- WindowMaker-0.91.0/src/moveres.c.vns 2005-05-18 22:00:15 +0400 |
6410 |
+++ WindowMaker-0.91.0/src/moveres.c 2005-05-18 22:03:33 +0400 |
6411 |
@@ -44,6 +44,8 @@ |
6412 |
#include "screen.h" |
6413 |
#include "xinerama.h" |
6414 |
|
6415 |
+#include "keybind.h" |
6416 |
+ |
6417 |
#include <WINGs/WINGsP.h> |
6418 |
|
6419 |
|
6420 |
@@ -1415,10 +1417,15 @@ |
6421 |
case XK_Escape: |
6422 |
done=1; |
6423 |
break; |
6424 |
- case XK_Up: |
6425 |
#ifdef XK_KP_Up |
6426 |
case XK_KP_Up: |
6427 |
#endif |
6428 |
+ case XK_8: |
6429 |
+ if (!ctrlmode){ |
6430 |
+ off_y=-src_y; |
6431 |
+ } |
6432 |
+ break; |
6433 |
+ case XK_Up: |
6434 |
case XK_k: |
6435 |
if (ctrlmode){ |
6436 |
if (moment != UP) |
6437 |
@@ -1429,10 +1436,15 @@ |
6438 |
} |
6439 |
else off_y-=kspeed; |
6440 |
break; |
6441 |
- case XK_Down: |
6442 |
#ifdef XK_KP_Down |
6443 |
case XK_KP_Down: |
6444 |
#endif |
6445 |
+ case XK_2: |
6446 |
+ if (!ctrlmode){ |
6447 |
+ off_y=-src_y+scr_height-wh; |
6448 |
+ } |
6449 |
+ break; |
6450 |
+ case XK_Down: |
6451 |
case XK_j: |
6452 |
if (ctrlmode){ |
6453 |
if (moment != DOWN) |
6454 |
@@ -1442,10 +1454,15 @@ |
6455 |
} |
6456 |
else off_y+=kspeed; |
6457 |
break; |
6458 |
- case XK_Left: |
6459 |
#ifdef XK_KP_Left |
6460 |
case XK_KP_Left: |
6461 |
#endif |
6462 |
+ case XK_4: |
6463 |
+ if (!ctrlmode){ |
6464 |
+ off_x=-src_x; |
6465 |
+ } |
6466 |
+ break; |
6467 |
+ case XK_Left: |
6468 |
case XK_h: |
6469 |
if (ctrlmode) { |
6470 |
if (moment != LEFT) |
6471 |
@@ -1456,10 +1473,15 @@ |
6472 |
} |
6473 |
else off_x-=kspeed; |
6474 |
break; |
6475 |
- case XK_Right: |
6476 |
#ifdef XK_KP_Right |
6477 |
case XK_KP_Right: |
6478 |
#endif |
6479 |
+ case XK_6: |
6480 |
+ if (!ctrlmode){ |
6481 |
+ off_x=-src_x+scr_width-ww; |
6482 |
+ } |
6483 |
+ break; |
6484 |
+ case XK_Right: |
6485 |
case XK_l: |
6486 |
if (ctrlmode) { |
6487 |
if (moment != RIGHT) |
6488 |
@@ -1469,6 +1491,51 @@ |
6489 |
} |
6490 |
else off_x+=kspeed; |
6491 |
break; |
6492 |
+#ifdef XK_KP_Home |
6493 |
+ case XK_KP_Home: |
6494 |
+#endif |
6495 |
+ case XK_7: |
6496 |
+ if (!ctrlmode){ |
6497 |
+ off_x=-src_x; |
6498 |
+ off_y=-src_y; |
6499 |
+ } |
6500 |
+ break; |
6501 |
+#ifdef XK_KP_Prior |
6502 |
+ case XK_KP_Prior: |
6503 |
+#endif |
6504 |
+ case XK_9: |
6505 |
+ if (!ctrlmode){ |
6506 |
+ off_y=-src_y; |
6507 |
+ off_x=-src_x+scr_width-ww; |
6508 |
+ } |
6509 |
+ break; |
6510 |
+#ifdef XK_KP_Next |
6511 |
+ case XK_KP_Next: |
6512 |
+#endif |
6513 |
+ case XK_3: |
6514 |
+ if (!ctrlmode){ |
6515 |
+ off_y=-src_y+scr_height-wh; |
6516 |
+ off_x=-src_x+scr_width-ww; |
6517 |
+ } |
6518 |
+ break; |
6519 |
+#ifdef XK_KP_End |
6520 |
+ case XK_KP_End: |
6521 |
+#endif |
6522 |
+ case XK_1: |
6523 |
+ if (!ctrlmode){ |
6524 |
+ off_y=-src_y+scr_height-wh; |
6525 |
+ off_x=-src_x; |
6526 |
+ } |
6527 |
+ break; |
6528 |
+#ifdef XK_KP_Begin |
6529 |
+ case XK_KP_Begin: |
6530 |
+#endif |
6531 |
+ case XK_5: |
6532 |
+ if (!ctrlmode){ |
6533 |
+ off_y=-src_y+(scr_height-wh)/2; |
6534 |
+ off_x=-src_x+(scr_width-ww)/2; |
6535 |
+ } |
6536 |
+ break; |
6537 |
} |
6538 |
|
6539 |
ww=w;wh=h; |
6540 |
@@ -2426,3 +2493,59 @@ |
6541 |
} |
6542 |
} |
6543 |
|
6544 |
+int |
6545 |
+wKeyboardMoveWindowAdditional(WWindow *wwin, int command) |
6546 |
+{ |
6547 |
+ WScreen *scr = wwin->screen_ptr; |
6548 |
+ int w = wwin->frame->core->width; |
6549 |
+ int h = wwin->frame->core->height; |
6550 |
+ int scr_width = wwin->screen_ptr->scr_width; |
6551 |
+ int scr_height = wwin->screen_ptr->scr_height; |
6552 |
+ int src_x = wwin->frame_x; |
6553 |
+ int src_y = wwin->frame_y; |
6554 |
+ int rc = scr_width - w; |
6555 |
+ int bc = scr_height - h; |
6556 |
+ int new_x = src_x; |
6557 |
+ int new_y = src_y; |
6558 |
+ |
6559 |
+ switch (command) { |
6560 |
+ case WKBD_MOVELEFTBOTTOM: |
6561 |
+ new_x = 0; |
6562 |
+ new_y = bc; |
6563 |
+ break; |
6564 |
+ case WKBD_MOVEBOTTOM: |
6565 |
+ new_y = bc; |
6566 |
+ break; |
6567 |
+ case WKBD_MOVERIGHTBOTTOM: |
6568 |
+ new_x = rc; |
6569 |
+ new_y = bc; |
6570 |
+ break; |
6571 |
+ case WKBD_MOVELEFT: |
6572 |
+ new_x = 0; |
6573 |
+ break; |
6574 |
+ case WKBD_MOVECENTER: |
6575 |
+ new_x = rc/2; |
6576 |
+ new_y = bc/2; |
6577 |
+ break; |
6578 |
+ case WKBD_MOVERIGHT: |
6579 |
+ new_x = rc; |
6580 |
+ break; |
6581 |
+ case WKBD_MOVELEFTTOP: |
6582 |
+ new_x = 0; |
6583 |
+ new_y = 0; |
6584 |
+ break; |
6585 |
+ case WKBD_MOVETOP: |
6586 |
+ new_y = 0; |
6587 |
+ break; |
6588 |
+ case WKBD_MOVERIGHTTOP: |
6589 |
+ new_x = rc; |
6590 |
+ new_y = 0; |
6591 |
+ } |
6592 |
+ |
6593 |
+ if (!scr->selected_windows) { |
6594 |
+ wWindowMove(wwin, new_x, new_y); |
6595 |
+ wWindowSynthConfigureNotify(wwin); |
6596 |
+ } |
6597 |
+ return 1; |
6598 |
+} |
6599 |
+ |
6600 |
|
6601 |
|
6602 |
|
6603 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-sga-swpanel-customization.patch |
6604 |
|
6605 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-sga-swpanel-customization.patch?rev=1.1&view=markup |
6606 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.91.0-sga-swpanel-customization.patch?rev=1.1&content-type=text/plain |
6607 |
|
6608 |
Index: WindowMaker-0.91.0-sga-swpanel-customization.patch |
6609 |
=================================================================== |
6610 |
diff -Naur WindowMaker-0.91.0/src/cycling.c WindowMaker-0.91.0.me/src/cycling.c |
6611 |
--- WindowMaker-0.91.0/src/cycling.c 2005-06-03 12:10:33 +0300 |
6612 |
+++ WindowMaker-0.91.0.me/src/cycling.c 2005-06-03 12:06:40 +0300 |
6613 |
@@ -107,6 +107,10 @@ |
6614 |
scr->flags.doing_alt_tab = 1; |
6615 |
|
6616 |
swpanel = wInitSwitchPanel(scr, wwin, scr->current_workspace); |
6617 |
+ if (swpanel == NULL) { |
6618 |
+ newFocused = NULL; |
6619 |
+ goto exiting; |
6620 |
+ } |
6621 |
oldFocused = wwin; |
6622 |
|
6623 |
if (swpanel) { |
6624 |
@@ -237,6 +241,9 @@ |
6625 |
break; |
6626 |
} |
6627 |
} |
6628 |
+ |
6629 |
+exiting: |
6630 |
+ |
6631 |
if (keymap) |
6632 |
XFreeModifiermap(keymap); |
6633 |
|
6634 |
diff -Naur WindowMaker-0.91.0/src/defaults.c WindowMaker-0.91.0.me/src/defaults.c |
6635 |
--- WindowMaker-0.91.0/src/defaults.c 2005-06-03 12:10:33 +0300 |
6636 |
+++ WindowMaker-0.91.0.me/src/defaults.c 2005-06-03 12:09:09 +0300 |
6637 |
@@ -419,6 +419,12 @@ |
6638 |
{"CirculateRaise", "NO", NULL, |
6639 |
&wPreferences.circ_raise, getBool, NULL |
6640 |
}, |
6641 |
+ {"ShowMiniaturized","YES", NULL, |
6642 |
+ &wPreferences.show_miniaturized, getBool, NULL |
6643 |
+ }, |
6644 |
+ {"ShowHidden", "YES", NULL, |
6645 |
+ &wPreferences.show_hidden, getBool, NULL |
6646 |
+ }, |
6647 |
{"Superfluous", "NO", NULL, |
6648 |
&wPreferences.superfluous, getBool, NULL |
6649 |
}, |
6650 |
diff -Naur WindowMaker-0.91.0/src/switchpanel.c WindowMaker-0.91.0.me/src/switchpanel.c |
6651 |
--- WindowMaker-0.91.0/src/switchpanel.c 2005-06-03 12:10:33 +0300 |
6652 |
+++ WindowMaker-0.91.0.me/src/switchpanel.c 2005-06-03 12:12:39 +0300 |
6653 |
@@ -409,7 +409,9 @@ |
6654 |
for (wwin= curwin; wwin; wwin= wwin->prev) { |
6655 |
if (((!fl && canReceiveFocus(wwin) > 0) || (fl && canReceiveFocus(wwin) < 0)) && |
6656 |
(!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window) && |
6657 |
- (wwin->flags.mapped || include_unmapped)) { |
6658 |
+ (wwin->flags.mapped || include_unmapped) && |
6659 |
+ (wPreferences.show_miniaturized || !wwin->flags.miniaturized ) && |
6660 |
+ (wPreferences.show_hidden || !wwin->flags.hidden)) { |
6661 |
WMAddToArray(windows, wwin); |
6662 |
} |
6663 |
} |
6664 |
@@ -421,7 +423,9 @@ |
6665 |
for (wwin= curwin; wwin && wwin != curwin; wwin= wwin->prev) { |
6666 |
if (((!fl && canReceiveFocus(wwin) > 0) || (fl && canReceiveFocus(wwin) < 0)) && |
6667 |
(!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window) && |
6668 |
- (wwin->flags.mapped || include_unmapped)) { |
6669 |
+ (wwin->flags.mapped || include_unmapped) && |
6670 |
+ (wPreferences.show_miniaturized || !wwin->flags.miniaturized ) && |
6671 |
+ (wPreferences.show_hidden || !wwin->flags.hidden)) { |
6672 |
WMAddToArray(windows, wwin); |
6673 |
} |
6674 |
} |
6675 |
diff -Naur WindowMaker-0.91.0/src/WindowMaker.h WindowMaker-0.91.0.me/src/WindowMaker.h |
6676 |
--- WindowMaker-0.91.0/src/WindowMaker.h 2005-06-03 12:10:33 +0300 |
6677 |
+++ WindowMaker-0.91.0.me/src/WindowMaker.h 2005-06-03 11:16:49 +0300 |
6678 |
@@ -365,6 +365,8 @@ |
6679 |
|
6680 |
char windows_cycling; /* windoze cycling */ |
6681 |
char circ_raise; /* raise window after Alt-tabbing */ |
6682 |
+ char show_miniaturized; /* show miniaturized windows in Alt-tabbing panel */ |
6683 |
+ char show_hidden; /* show hidden windows in Alt-tabbing panel */ |
6684 |
|
6685 |
char ignore_focus_click; |
6686 |
|
6687 |
|
6688 |
|
6689 |
|
6690 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.92.0-alt-newpo.patch |
6691 |
|
6692 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.92.0-alt-newpo.patch?rev=1.1&view=markup |
6693 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.92.0-alt-newpo.patch?rev=1.1&content-type=text/plain |
6694 |
|
6695 |
Index: WindowMaker-0.92.0-alt-newpo.patch |
6696 |
=================================================================== |
6697 |
--- WindowMaker-0.92.0/po/Makefile.am.vns 2004-10-27 01:03:42 +0400 |
6698 |
+++ WindowMaker-0.92.0/po/Makefile.am 2005-09-06 08:55:14 +0400 |
6699 |
@@ -7,7 +7,7 @@ |
6700 |
# Please keep this sorted in alphabetic order! |
6701 |
EXTRA_DIST = be.po bg.po bs.po ca.po cs.po da.po de.po el.po es.po et.po \ |
6702 |
fi.po fr.po gl.po hr.po hu.po it.po ja.po ko.po ms.po nl.po no.po \ |
6703 |
- pl.po pt.po ro.po ru.po sk.po sv.po tr.po zh_CN.po zh_TW.po |
6704 |
+ pl.po pt.po ro.po ru.po sk.po sv.po tr.po uk.po zh_CN.po zh_TW.po |
6705 |
|
6706 |
POTFILES = \ |
6707 |
$(top_builddir)/src/appicon.c \ |
6708 |
--- WindowMaker-0.92.0/configure.ac.vns 2005-09-06 08:55:13 +0400 |
6709 |
+++ WindowMaker-0.92.0/configure.ac 2005-09-06 08:57:02 +0400 |
6710 |
@@ -289,8 +289,8 @@ |
6711 |
|
6712 |
dnl List of supported locales |
6713 |
dnl ------------------------- |
6714 |
-supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW" |
6715 |
-supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW" |
6716 |
+supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr uk zh_CN zh_TW" |
6717 |
+supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk uk zh_CN zh_TW" |
6718 |
supported_wings_locales="bg ca cs de fr sk" |
6719 |
|
6720 |
for lang in $LINGUAS; do |
6721 |
|
6722 |
|
6723 |
|
6724 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.92.0-cvs-gcc41.patch |
6725 |
|
6726 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.92.0-cvs-gcc41.patch?rev=1.1&view=markup |
6727 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.92.0-cvs-gcc41.patch?rev=1.1&content-type=text/plain |
6728 |
|
6729 |
Index: WindowMaker-0.92.0-cvs-gcc41.patch |
6730 |
=================================================================== |
6731 |
--- src/wmspec.c.orig 2006-02-28 00:53:02.000000000 +0100 |
6732 |
+++ src/wmspec.c 2006-03-02 14:59:07.000000000 +0100 |
6733 |
@@ -827,19 +827,27 @@ |
6734 |
updateWorkspaceNames(WScreen *scr) |
6735 |
{ |
6736 |
char buf[1024], *pos; |
6737 |
- unsigned int i, len, curr_size; |
6738 |
- |
6739 |
- pos = buf; |
6740 |
+ unsigned int i, len, curr_size; |
6741 |
len = 0; |
6742 |
+ |
6743 |
+ pos = memset(buf,'\0',sizeof(buf)); |
6744 |
+ |
6745 |
for(i = 0; i < scr->workspace_count; i++) { |
6746 |
- curr_size = strlen(scr->workspaces[i]->name); |
6747 |
- strcpy(pos, scr->workspaces[i]->name); |
6748 |
- pos += (curr_size+1); |
6749 |
+ |
6750 |
+ curr_size = strlen(scr->workspaces[i]->name); |
6751 |
+ |
6752 |
+ if(len + curr_size + 1 > sizeof(buf)) { |
6753 |
+ break; |
6754 |
+ } |
6755 |
+ |
6756 |
+ strncpy(pos, scr->workspaces[i]->name,sizeof(buf) - len); |
6757 |
+ |
6758 |
+ pos += (curr_size+1); |
6759 |
len += (curr_size+1); |
6760 |
} |
6761 |
|
6762 |
XChangeProperty(dpy, scr->root_win, net_desktop_names, utf8_string, 8, |
6763 |
- PropModeReplace, (unsigned char *)buf, len); |
6764 |
+ PropModeReplace, (unsigned char *)buf, strlen(buf)); |
6765 |
} |
6766 |
|
6767 |
|
6768 |
|
6769 |
|
6770 |
|
6771 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-0.92.0-cvs20060123.patch |
6772 |
|
6773 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.92.0-cvs20060123.patch?rev=1.1&view=markup |
6774 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-0.92.0-cvs20060123.patch?rev=1.1&content-type=text/plain |
6775 |
|
6776 |
Index: WindowMaker-0.92.0-cvs20060123.patch |
6777 |
=================================================================== |
6778 |
diff -uhrN WindowMaker-0.92.0/aclocal.m4 WindowMaker-CVS-20060123/aclocal.m4 |
6779 |
--- WindowMaker-0.92.0/aclocal.m4 2005-06-19 05:22:57.000000000 +0200 |
6780 |
+++ WindowMaker-CVS-20060123/aclocal.m4 2006-01-22 21:33:50.000000000 +0100 |
6781 |
@@ -1217,8 +1217,7 @@ |
6782 |
|
6783 |
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
6784 |
|
6785 |
-# serial 47 AC_PROG_LIBTOOL |
6786 |
-# Debian $Rev: 214 $ |
6787 |
+# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL |
6788 |
|
6789 |
|
6790 |
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) |
6791 |
@@ -1328,7 +1327,7 @@ |
6792 |
|
6793 |
# Sed substitution that helps us do robust quoting. It backslashifies |
6794 |
# metacharacters that are still active within double-quoted strings. |
6795 |
-Xsed='sed -e s/^X//' |
6796 |
+Xsed='sed -e 1s/^X//' |
6797 |
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] |
6798 |
|
6799 |
# Same as above, but do not quote variable references. |
6800 |
@@ -1348,7 +1347,7 @@ |
6801 |
default_ofile=libtool |
6802 |
can_build_shared=yes |
6803 |
|
6804 |
-# All known linkers require a `.a' archive for static linking (except M$VC, |
6805 |
+# All known linkers require a `.a' archive for static linking (except MSVC, |
6806 |
# which needs '.lib'). |
6807 |
libext=a |
6808 |
ltmain="$ac_aux_dir/ltmain.sh" |
6809 |
@@ -1368,6 +1367,7 @@ |
6810 |
test -z "$AS" && AS=as |
6811 |
test -z "$CC" && CC=cc |
6812 |
test -z "$LTCC" && LTCC=$CC |
6813 |
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS |
6814 |
test -z "$DLLTOOL" && DLLTOOL=dlltool |
6815 |
test -z "$LD" && LD=ld |
6816 |
test -z "$LN_S" && LN_S="ln -s" |
6817 |
@@ -1387,15 +1387,17 @@ |
6818 |
if test -n "$RANLIB"; then |
6819 |
case $host_os in |
6820 |
openbsd*) |
6821 |
- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" |
6822 |
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
6823 |
;; |
6824 |
*) |
6825 |
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" |
6826 |
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
6827 |
;; |
6828 |
esac |
6829 |
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
6830 |
fi |
6831 |
|
6832 |
+_LT_CC_BASENAME([$compiler]) |
6833 |
+ |
6834 |
# Only perform the check for file, if the check method requires it |
6835 |
case $deplibs_check_method in |
6836 |
file_magic*) |
6837 |
@@ -1436,11 +1438,56 @@ |
6838 |
# If no C compiler was specified, use CC. |
6839 |
LTCC=${LTCC-"$CC"} |
6840 |
|
6841 |
+# If no C compiler flags were specified, use CFLAGS. |
6842 |
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} |
6843 |
+ |
6844 |
# Allow CC to be a program name with arguments. |
6845 |
compiler=$CC |
6846 |
])# _LT_AC_SYS_COMPILER |
6847 |
|
6848 |
|
6849 |
+# _LT_CC_BASENAME(CC) |
6850 |
+# ------------------- |
6851 |
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. |
6852 |
+AC_DEFUN([_LT_CC_BASENAME], |
6853 |
+[for cc_temp in $1""; do |
6854 |
+ case $cc_temp in |
6855 |
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; |
6856 |
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; |
6857 |
+ \-*) ;; |
6858 |
+ *) break;; |
6859 |
+ esac |
6860 |
+done |
6861 |
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
6862 |
+]) |
6863 |
+ |
6864 |
+ |
6865 |
+# _LT_COMPILER_BOILERPLATE |
6866 |
+# ------------------------ |
6867 |
+# Check for compiler boilerplate output or warnings with |
6868 |
+# the simple compiler test code. |
6869 |
+AC_DEFUN([_LT_COMPILER_BOILERPLATE], |
6870 |
+[ac_outfile=conftest.$ac_objext |
6871 |
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext |
6872 |
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
6873 |
+_lt_compiler_boilerplate=`cat conftest.err` |
6874 |
+$rm conftest* |
6875 |
+])# _LT_COMPILER_BOILERPLATE |
6876 |
+ |
6877 |
+ |
6878 |
+# _LT_LINKER_BOILERPLATE |
6879 |
+# ---------------------- |
6880 |
+# Check for linker boilerplate output or warnings with |
6881 |
+# the simple link test code. |
6882 |
+AC_DEFUN([_LT_LINKER_BOILERPLATE], |
6883 |
+[ac_outfile=conftest.$ac_objext |
6884 |
+printf "$lt_simple_link_test_code" >conftest.$ac_ext |
6885 |
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
6886 |
+_lt_linker_boilerplate=`cat conftest.err` |
6887 |
+$rm conftest* |
6888 |
+])# _LT_LINKER_BOILERPLATE |
6889 |
+ |
6890 |
+ |
6891 |
# _LT_AC_SYS_LIBPATH_AIX |
6892 |
# ---------------------- |
6893 |
# Links a minimal program and checks the executable |
6894 |
@@ -1513,15 +1560,15 @@ |
6895 |
|
6896 |
# The HP-UX ksh and POSIX shell print the target directory to stdout |
6897 |
# if CDPATH is set. |
6898 |
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi |
6899 |
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
6900 |
|
6901 |
if test -z "$ECHO"; then |
6902 |
if test "X${echo_test_string+set}" != Xset; then |
6903 |
# find a string as large as possible, as long as the shell can cope with it |
6904 |
for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do |
6905 |
# expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
6906 |
- if (echo_test_string="`eval $cmd`") 2>/dev/null && |
6907 |
- echo_test_string="`eval $cmd`" && |
6908 |
+ if (echo_test_string=`eval $cmd`) 2>/dev/null && |
6909 |
+ echo_test_string=`eval $cmd` && |
6910 |
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null |
6911 |
then |
6912 |
break |
6913 |
@@ -1690,7 +1737,7 @@ |
6914 |
# Find out which ABI we are using. |
6915 |
echo 'int i;' > conftest.$ac_ext |
6916 |
if AC_TRY_EVAL(ac_compile); then |
6917 |
- case "`/usr/bin/file conftest.o`" in |
6918 |
+ case `/usr/bin/file conftest.o` in |
6919 |
*32-bit*) |
6920 |
case $host in |
6921 |
x86_64-*linux*) |
6922 |
@@ -1741,6 +1788,22 @@ |
6923 |
CFLAGS="$SAVE_CFLAGS" |
6924 |
fi |
6925 |
;; |
6926 |
+sparc*-*solaris*) |
6927 |
+ # Find out which ABI we are using. |
6928 |
+ echo 'int i;' > conftest.$ac_ext |
6929 |
+ if AC_TRY_EVAL(ac_compile); then |
6930 |
+ case `/usr/bin/file conftest.o` in |
6931 |
+ *64-bit*) |
6932 |
+ case $lt_cv_prog_gnu_ld in |
6933 |
+ yes*) LD="${LD-ld} -m elf64_sparc" ;; |
6934 |
+ *) LD="${LD-ld} -64" ;; |
6935 |
+ esac |
6936 |
+ ;; |
6937 |
+ esac |
6938 |
+ fi |
6939 |
+ rm -rf conftest* |
6940 |
+ ;; |
6941 |
+ |
6942 |
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], |
6943 |
[*-*-cygwin* | *-*-mingw* | *-*-pw32*) |
6944 |
AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
6945 |
@@ -1772,7 +1835,7 @@ |
6946 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
6947 |
# The option is referenced via a variable to avoid confusing sed. |
6948 |
lt_compile=`echo "$ac_compile" | $SED \ |
6949 |
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
6950 |
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
6951 |
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
6952 |
-e 's:$: $lt_compiler_flag:'` |
6953 |
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
6954 |
@@ -1782,8 +1845,10 @@ |
6955 |
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
6956 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
6957 |
# The compiler can only warn and ignore the option if not recognized |
6958 |
- # So say no if there are warnings |
6959 |
- if test ! -s conftest.err; then |
6960 |
+ # So say no if there are warnings other than the usual output. |
6961 |
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
6962 |
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
6963 |
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
6964 |
$2=yes |
6965 |
fi |
6966 |
fi |
6967 |
@@ -1809,11 +1874,16 @@ |
6968 |
LDFLAGS="$LDFLAGS $3" |
6969 |
printf "$lt_simple_link_test_code" > conftest.$ac_ext |
6970 |
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
6971 |
- # The compiler can only warn and ignore the option if not recognized |
6972 |
+ # The linker can only warn and ignore the option if not recognized |
6973 |
# So say no if there are warnings |
6974 |
if test -s conftest.err; then |
6975 |
# Append any errors to the config.log. |
6976 |
cat conftest.err 1>&AS_MESSAGE_LOG_FD |
6977 |
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
6978 |
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
6979 |
+ if diff conftest.exp conftest.er2 >/dev/null; then |
6980 |
+ $2=yes |
6981 |
+ fi |
6982 |
else |
6983 |
$2=yes |
6984 |
fi |
6985 |
@@ -1872,11 +1942,55 @@ |
6986 |
lt_cv_sys_max_cmd_len=8192; |
6987 |
;; |
6988 |
|
6989 |
- *) |
6990 |
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) |
6991 |
+ # This has been around since 386BSD, at least. Likely further. |
6992 |
+ if test -x /sbin/sysctl; then |
6993 |
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` |
6994 |
+ elif test -x /usr/sbin/sysctl; then |
6995 |
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` |
6996 |
+ else |
6997 |
+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs |
6998 |
+ fi |
6999 |
+ # And add a safety zone |
7000 |
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
7001 |
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
7002 |
+ ;; |
7003 |
+ |
7004 |
+ interix*) |
7005 |
+ # We know the value 262144 and hardcode it with a safety zone (like BSD) |
7006 |
+ lt_cv_sys_max_cmd_len=196608 |
7007 |
+ ;; |
7008 |
+ |
7009 |
+ osf*) |
7010 |
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
7011 |
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
7012 |
+ # nice to cause kernel panics so lets avoid the loop below. |
7013 |
+ # First set a reasonable default. |
7014 |
+ lt_cv_sys_max_cmd_len=16384 |
7015 |
+ # |
7016 |
+ if test -x /sbin/sysconfig; then |
7017 |
+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in |
7018 |
+ *1*) lt_cv_sys_max_cmd_len=-1 ;; |
7019 |
+ esac |
7020 |
+ fi |
7021 |
+ ;; |
7022 |
+ sco3.2v5*) |
7023 |
+ lt_cv_sys_max_cmd_len=102400 |
7024 |
+ ;; |
7025 |
+ sysv5* | sco5v6* | sysv4.2uw2*) |
7026 |
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` |
7027 |
+ if test -n "$kargmax"; then |
7028 |
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` |
7029 |
+ else |
7030 |
+ lt_cv_sys_max_cmd_len=32768 |
7031 |
+ fi |
7032 |
+ ;; |
7033 |
+ *) |
7034 |
# If test is not a shell built-in, we'll probably end up computing a |
7035 |
# maximum length that is only half of the actual maximum length, but |
7036 |
# we can't tell. |
7037 |
- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ |
7038 |
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} |
7039 |
+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ |
7040 |
= "XX$teststring") >/dev/null 2>&1 && |
7041 |
new_result=`expr "X$teststring" : ".*" 2>&1` && |
7042 |
lt_cv_sys_max_cmd_len=$new_result && |
7043 |
@@ -1902,7 +2016,7 @@ |
7044 |
|
7045 |
|
7046 |
# _LT_AC_CHECK_DLFCN |
7047 |
-# -------------------- |
7048 |
+# ------------------ |
7049 |
AC_DEFUN([_LT_AC_CHECK_DLFCN], |
7050 |
[AC_CHECK_HEADERS(dlfcn.h)dnl |
7051 |
])# _LT_AC_CHECK_DLFCN |
7052 |
@@ -1910,7 +2024,7 @@ |
7053 |
|
7054 |
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, |
7055 |
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) |
7056 |
-# ------------------------------------------------------------------ |
7057 |
+# --------------------------------------------------------------------- |
7058 |
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], |
7059 |
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl |
7060 |
if test "$cross_compiling" = yes; then : |
7061 |
@@ -1976,17 +2090,19 @@ |
7062 |
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
7063 |
/* dlclose (self); */ |
7064 |
} |
7065 |
+ else |
7066 |
+ puts (dlerror ()); |
7067 |
|
7068 |
exit (status); |
7069 |
}] |
7070 |
EOF |
7071 |
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then |
7072 |
- (./conftest; exit; ) 2>/dev/null |
7073 |
+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null |
7074 |
lt_status=$? |
7075 |
case x$lt_status in |
7076 |
x$lt_dlno_uscore) $1 ;; |
7077 |
x$lt_dlneed_uscore) $2 ;; |
7078 |
- x$lt_unknown|x*) $3 ;; |
7079 |
+ x$lt_dlunknown|x*) $3 ;; |
7080 |
esac |
7081 |
else : |
7082 |
# compilation failed |
7083 |
@@ -1998,7 +2114,7 @@ |
7084 |
|
7085 |
|
7086 |
# AC_LIBTOOL_DLOPEN_SELF |
7087 |
-# ------------------- |
7088 |
+# ---------------------- |
7089 |
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], |
7090 |
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl |
7091 |
if test "x$enable_dlopen" != xyes; then |
7092 |
@@ -2069,7 +2185,7 @@ |
7093 |
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" |
7094 |
|
7095 |
save_LDFLAGS="$LDFLAGS" |
7096 |
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" |
7097 |
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" |
7098 |
|
7099 |
save_LIBS="$LIBS" |
7100 |
LIBS="$lt_cv_dlopen_libs $LIBS" |
7101 |
@@ -2082,7 +2198,7 @@ |
7102 |
]) |
7103 |
|
7104 |
if test "x$lt_cv_dlopen_self" = xyes; then |
7105 |
- LDFLAGS="$LDFLAGS $link_static_flag" |
7106 |
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" |
7107 |
AC_CACHE_CHECK([whether a statically linked program can dlopen itself], |
7108 |
lt_cv_dlopen_self_static, [dnl |
7109 |
_LT_AC_TRY_DLOPEN_SELF( |
7110 |
@@ -2130,7 +2246,7 @@ |
7111 |
# Note that $ac_compile itself does not contain backslashes and begins |
7112 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
7113 |
lt_compile=`echo "$ac_compile" | $SED \ |
7114 |
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
7115 |
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
7116 |
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
7117 |
-e 's:$: $lt_compiler_flag:'` |
7118 |
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
7119 |
@@ -2142,11 +2258,13 @@ |
7120 |
then |
7121 |
# The compiler can only warn and ignore the option if not recognized |
7122 |
# So say no if there are warnings |
7123 |
- if test ! -s out/conftest.err; then |
7124 |
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
7125 |
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
7126 |
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
7127 |
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
7128 |
fi |
7129 |
fi |
7130 |
- chmod u+w . |
7131 |
+ chmod u+w . 2>&AS_MESSAGE_LOG_FD |
7132 |
$rm conftest* |
7133 |
# SGI C++ compiler will create directory out/ii_files/ for |
7134 |
# template instantiation |
7135 |
@@ -2210,8 +2328,8 @@ |
7136 |
[AC_MSG_CHECKING([how to hardcode library paths into programs]) |
7137 |
_LT_AC_TAGVAR(hardcode_action, $1)= |
7138 |
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ |
7139 |
- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ |
7140 |
- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then |
7141 |
+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ |
7142 |
+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then |
7143 |
|
7144 |
# We can hardcode non-existant directories. |
7145 |
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && |
7146 |
@@ -2378,7 +2496,7 @@ |
7147 |
shlibpath_var=LIBRARY_PATH |
7148 |
;; |
7149 |
|
7150 |
-bsdi4*) |
7151 |
+bsdi[[45]]*) |
7152 |
version_type=linux |
7153 |
need_version=no |
7154 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
7155 |
@@ -2406,7 +2524,8 @@ |
7156 |
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ |
7157 |
dldir=$destdir/`dirname \$dlpath`~ |
7158 |
test -d \$dldir || mkdir -p \$dldir~ |
7159 |
- $install_prog $dir/$dlname \$dldir/$dlname' |
7160 |
+ $install_prog $dir/$dlname \$dldir/$dlname~ |
7161 |
+ chmod a+x \$dldir/$dlname' |
7162 |
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
7163 |
dlpath=$dir/\$dldll~ |
7164 |
$rm \$dlpath' |
7165 |
@@ -2436,7 +2555,7 @@ |
7166 |
;; |
7167 |
pw32*) |
7168 |
# pw32 DLLs use 'pw' prefix rather than 'lib' |
7169 |
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
7170 |
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
7171 |
;; |
7172 |
esac |
7173 |
;; |
7174 |
@@ -2459,7 +2578,7 @@ |
7175 |
soname_spec='${libname}${release}${major}$shared_ext' |
7176 |
shlibpath_overrides_runpath=yes |
7177 |
shlibpath_var=DYLD_LIBRARY_PATH |
7178 |
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' |
7179 |
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
7180 |
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
7181 |
if test "$GCC" = yes; then |
7182 |
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` |
7183 |
@@ -2494,8 +2613,17 @@ |
7184 |
dynamic_linker='GNU ld.so' |
7185 |
;; |
7186 |
|
7187 |
-freebsd*) |
7188 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
7189 |
+freebsd* | dragonfly*) |
7190 |
+ # DragonFly does not have aout. When/if they implement a new |
7191 |
+ # versioning mechanism, adjust this. |
7192 |
+ if test -x /usr/bin/objformat; then |
7193 |
+ objformat=`/usr/bin/objformat` |
7194 |
+ else |
7195 |
+ case $host_os in |
7196 |
+ freebsd[[123]]*) objformat=aout ;; |
7197 |
+ *) objformat=elf ;; |
7198 |
+ esac |
7199 |
+ fi |
7200 |
version_type=freebsd-$objformat |
7201 |
case $version_type in |
7202 |
freebsd-elf*) |
7203 |
@@ -2513,14 +2641,19 @@ |
7204 |
freebsd2*) |
7205 |
shlibpath_overrides_runpath=yes |
7206 |
;; |
7207 |
- freebsd3.[01]* | freebsdelf3.[01]*) |
7208 |
+ freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
7209 |
shlibpath_overrides_runpath=yes |
7210 |
hardcode_into_libs=yes |
7211 |
;; |
7212 |
- *) # from 3.2 on |
7213 |
+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ |
7214 |
+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) |
7215 |
shlibpath_overrides_runpath=no |
7216 |
hardcode_into_libs=yes |
7217 |
;; |
7218 |
+ freebsd*) # from 4.6 on |
7219 |
+ shlibpath_overrides_runpath=yes |
7220 |
+ hardcode_into_libs=yes |
7221 |
+ ;; |
7222 |
esac |
7223 |
;; |
7224 |
|
7225 |
@@ -2540,7 +2673,7 @@ |
7226 |
version_type=sunos |
7227 |
need_lib_prefix=no |
7228 |
need_version=no |
7229 |
- case "$host_cpu" in |
7230 |
+ case $host_cpu in |
7231 |
ia64*) |
7232 |
shrext_cmds='.so' |
7233 |
hardcode_into_libs=yes |
7234 |
@@ -2580,6 +2713,18 @@ |
7235 |
postinstall_cmds='chmod 555 $lib' |
7236 |
;; |
7237 |
|
7238 |
+interix3*) |
7239 |
+ version_type=linux |
7240 |
+ need_lib_prefix=no |
7241 |
+ need_version=no |
7242 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
7243 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
7244 |
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' |
7245 |
+ shlibpath_var=LD_LIBRARY_PATH |
7246 |
+ shlibpath_overrides_runpath=no |
7247 |
+ hardcode_into_libs=yes |
7248 |
+ ;; |
7249 |
+ |
7250 |
irix5* | irix6* | nonstopux*) |
7251 |
case $host_os in |
7252 |
nonstopux*) version_type=nonstopux ;; |
7253 |
@@ -2639,7 +2784,7 @@ |
7254 |
|
7255 |
# Append ld.so.conf contents to the search path |
7256 |
if test -f /etc/ld.so.conf; then |
7257 |
- lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` |
7258 |
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
7259 |
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
7260 |
fi |
7261 |
|
7262 |
@@ -2713,8 +2858,13 @@ |
7263 |
|
7264 |
openbsd*) |
7265 |
version_type=sunos |
7266 |
+ sys_lib_dlsearch_path_spec="/usr/lib" |
7267 |
need_lib_prefix=no |
7268 |
- need_version=yes |
7269 |
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. |
7270 |
+ case $host_os in |
7271 |
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; |
7272 |
+ *) need_version=no ;; |
7273 |
+ esac |
7274 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
7275 |
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
7276 |
shlibpath_var=LD_LIBRARY_PATH |
7277 |
@@ -2752,13 +2902,6 @@ |
7278 |
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" |
7279 |
;; |
7280 |
|
7281 |
-sco3.2v5*) |
7282 |
- version_type=osf |
7283 |
- soname_spec='${libname}${release}${shared_ext}$major' |
7284 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
7285 |
- shlibpath_var=LD_LIBRARY_PATH |
7286 |
- ;; |
7287 |
- |
7288 |
solaris*) |
7289 |
version_type=linux |
7290 |
need_lib_prefix=no |
7291 |
@@ -2784,7 +2927,7 @@ |
7292 |
need_version=yes |
7293 |
;; |
7294 |
|
7295 |
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
7296 |
+sysv4 | sysv4.3*) |
7297 |
version_type=linux |
7298 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
7299 |
soname_spec='${libname}${release}${shared_ext}$major' |
7300 |
@@ -2817,6 +2960,29 @@ |
7301 |
fi |
7302 |
;; |
7303 |
|
7304 |
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
7305 |
+ version_type=freebsd-elf |
7306 |
+ need_lib_prefix=no |
7307 |
+ need_version=no |
7308 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
7309 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
7310 |
+ shlibpath_var=LD_LIBRARY_PATH |
7311 |
+ hardcode_into_libs=yes |
7312 |
+ if test "$with_gnu_ld" = yes; then |
7313 |
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' |
7314 |
+ shlibpath_overrides_runpath=no |
7315 |
+ else |
7316 |
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' |
7317 |
+ shlibpath_overrides_runpath=yes |
7318 |
+ case $host_os in |
7319 |
+ sco3.2v5*) |
7320 |
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" |
7321 |
+ ;; |
7322 |
+ esac |
7323 |
+ fi |
7324 |
+ sys_lib_dlsearch_path_spec='/usr/lib' |
7325 |
+ ;; |
7326 |
+ |
7327 |
uts4*) |
7328 |
version_type=linux |
7329 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
7330 |
@@ -2830,6 +2996,11 @@ |
7331 |
esac |
7332 |
AC_MSG_RESULT([$dynamic_linker]) |
7333 |
test "$dynamic_linker" = no && can_build_shared=no |
7334 |
+ |
7335 |
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
7336 |
+if test "$GCC" = yes; then |
7337 |
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
7338 |
+fi |
7339 |
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER |
7340 |
|
7341 |
|
7342 |
@@ -2854,6 +3025,9 @@ |
7343 |
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) |
7344 |
fi |
7345 |
fi |
7346 |
+ if test -z "$LTCFLAGS"; then |
7347 |
+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" |
7348 |
+ fi |
7349 |
|
7350 |
# Extract list of available tagged configurations in $ofile. |
7351 |
# Note that this assumes the entire list is on one line. |
7352 |
@@ -2880,7 +3054,9 @@ |
7353 |
|
7354 |
case $tagname in |
7355 |
CXX) |
7356 |
- if test -n "$CXX" && test "X$CXX" != "Xno"; then |
7357 |
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
7358 |
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
7359 |
+ (test "X$CXX" != "Xg++"))) ; then |
7360 |
AC_LIBTOOL_LANG_CXX_CONFIG |
7361 |
else |
7362 |
tagname="" |
7363 |
@@ -2942,7 +3118,7 @@ |
7364 |
|
7365 |
# AC_LIBTOOL_WIN32_DLL |
7366 |
# -------------------- |
7367 |
-# declare package support for building win32 dll's |
7368 |
+# declare package support for building win32 DLLs |
7369 |
AC_DEFUN([AC_LIBTOOL_WIN32_DLL], |
7370 |
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) |
7371 |
])# AC_LIBTOOL_WIN32_DLL |
7372 |
@@ -2980,7 +3156,7 @@ |
7373 |
|
7374 |
# AC_DISABLE_SHARED |
7375 |
# ----------------- |
7376 |
-#- set the default shared flag to --disable-shared |
7377 |
+# set the default shared flag to --disable-shared |
7378 |
AC_DEFUN([AC_DISABLE_SHARED], |
7379 |
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl |
7380 |
AC_ENABLE_SHARED(no) |
7381 |
@@ -3116,7 +3292,7 @@ |
7382 |
if test -n "$file_magic_test_file"; then |
7383 |
case $deplibs_check_method in |
7384 |
"file_magic "*) |
7385 |
- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" |
7386 |
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` |
7387 |
MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
7388 |
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | |
7389 |
$EGREP "$file_magic_regex" > /dev/null; then |
7390 |
@@ -3226,7 +3402,7 @@ |
7391 |
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
7392 |
lt_cv_path_LD="$ac_dir/$ac_prog" |
7393 |
# Check to see if the program is GNU ld. I'd rather use --version, |
7394 |
- # but apparently some GNU ld's only accept -v. |
7395 |
+ # but apparently some variants of GNU ld only accept -v. |
7396 |
# Break only if it was the GNU/non-GNU ld that we prefer. |
7397 |
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in |
7398 |
*GNU* | *'with BFD'*) |
7399 |
@@ -3258,7 +3434,7 @@ |
7400 |
AC_DEFUN([AC_PROG_LD_GNU], |
7401 |
[AC_REQUIRE([AC_PROG_EGREP])dnl |
7402 |
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, |
7403 |
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v. |
7404 |
+[# I'd rather use --version here, but apparently some GNU lds only accept -v. |
7405 |
case `$LD -v 2>&1 </dev/null` in |
7406 |
*GNU* | *'with BFD'*) |
7407 |
lt_cv_prog_gnu_ld=yes |
7408 |
@@ -3285,6 +3461,15 @@ |
7409 |
*) reload_flag=" $reload_flag" ;; |
7410 |
esac |
7411 |
reload_cmds='$LD$reload_flag -o $output$reload_objs' |
7412 |
+case $host_os in |
7413 |
+ darwin*) |
7414 |
+ if test "$GCC" = yes; then |
7415 |
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
7416 |
+ else |
7417 |
+ reload_cmds='$LD$reload_flag -o $output$reload_objs' |
7418 |
+ fi |
7419 |
+ ;; |
7420 |
+esac |
7421 |
])# AC_PROG_LD_RELOAD_FLAG |
7422 |
|
7423 |
|
7424 |
@@ -3318,7 +3503,7 @@ |
7425 |
lt_cv_deplibs_check_method=pass_all |
7426 |
;; |
7427 |
|
7428 |
-bsdi4*) |
7429 |
+bsdi[[45]]*) |
7430 |
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' |
7431 |
lt_cv_file_magic_cmd='/usr/bin/file -L' |
7432 |
lt_cv_file_magic_test_file=/shlib/libc.so |
7433 |
@@ -3341,13 +3526,13 @@ |
7434 |
lt_cv_deplibs_check_method=pass_all |
7435 |
;; |
7436 |
|
7437 |
-freebsd* | kfreebsd*-gnu) |
7438 |
+freebsd* | kfreebsd*-gnu | dragonfly*) |
7439 |
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
7440 |
case $host_cpu in |
7441 |
i*86 ) |
7442 |
# Not sure whether the presence of OpenBSD here was a mistake. |
7443 |
# Let's accept both of them until this is cleared up. |
7444 |
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' |
7445 |
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' |
7446 |
lt_cv_file_magic_cmd=/usr/bin/file |
7447 |
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` |
7448 |
;; |
7449 |
@@ -3363,7 +3548,7 @@ |
7450 |
|
7451 |
hpux10.20* | hpux11*) |
7452 |
lt_cv_file_magic_cmd=/usr/bin/file |
7453 |
- case "$host_cpu" in |
7454 |
+ case $host_cpu in |
7455 |
ia64*) |
7456 |
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' |
7457 |
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
7458 |
@@ -3379,6 +3564,11 @@ |
7459 |
esac |
7460 |
;; |
7461 |
|
7462 |
+interix3*) |
7463 |
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here |
7464 |
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' |
7465 |
+ ;; |
7466 |
+ |
7467 |
irix5* | irix6* | nonstopux*) |
7468 |
case $LD in |
7469 |
*-32|*"-32 ") libmagic=32-bit;; |
7470 |
@@ -3413,12 +3603,10 @@ |
7471 |
;; |
7472 |
|
7473 |
openbsd*) |
7474 |
- lt_cv_file_magic_cmd=/usr/bin/file |
7475 |
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` |
7476 |
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
7477 |
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' |
7478 |
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' |
7479 |
else |
7480 |
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' |
7481 |
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
7482 |
fi |
7483 |
;; |
7484 |
|
7485 |
@@ -3426,15 +3614,11 @@ |
7486 |
lt_cv_deplibs_check_method=pass_all |
7487 |
;; |
7488 |
|
7489 |
-sco3.2v5*) |
7490 |
- lt_cv_deplibs_check_method=pass_all |
7491 |
- ;; |
7492 |
- |
7493 |
solaris*) |
7494 |
lt_cv_deplibs_check_method=pass_all |
7495 |
;; |
7496 |
|
7497 |
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
7498 |
+sysv4 | sysv4.3*) |
7499 |
case $host_vendor in |
7500 |
motorola) |
7501 |
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' |
7502 |
@@ -3455,10 +3639,13 @@ |
7503 |
siemens) |
7504 |
lt_cv_deplibs_check_method=pass_all |
7505 |
;; |
7506 |
+ pc) |
7507 |
+ lt_cv_deplibs_check_method=pass_all |
7508 |
+ ;; |
7509 |
esac |
7510 |
;; |
7511 |
|
7512 |
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) |
7513 |
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
7514 |
lt_cv_deplibs_check_method=pass_all |
7515 |
;; |
7516 |
esac |
7517 |
@@ -3478,36 +3665,43 @@ |
7518 |
# Let the user override the test. |
7519 |
lt_cv_path_NM="$NM" |
7520 |
else |
7521 |
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
7522 |
- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do |
7523 |
- IFS="$lt_save_ifs" |
7524 |
- test -z "$ac_dir" && ac_dir=. |
7525 |
- tmp_nm="$ac_dir/${ac_tool_prefix}nm" |
7526 |
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then |
7527 |
- # Check to see if the nm accepts a BSD-compat flag. |
7528 |
- # Adding the `sed 1q' prevents false positives on HP-UX, which says: |
7529 |
- # nm: unknown option "B" ignored |
7530 |
- # Tru64's nm complains that /dev/null is an invalid object file |
7531 |
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in |
7532 |
- */dev/null* | *'Invalid file or object type'*) |
7533 |
- lt_cv_path_NM="$tmp_nm -B" |
7534 |
- break |
7535 |
- ;; |
7536 |
- *) |
7537 |
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in |
7538 |
- */dev/null*) |
7539 |
- lt_cv_path_NM="$tmp_nm -p" |
7540 |
+ lt_nm_to_check="${ac_tool_prefix}nm" |
7541 |
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then |
7542 |
+ lt_nm_to_check="$lt_nm_to_check nm" |
7543 |
+ fi |
7544 |
+ for lt_tmp_nm in $lt_nm_to_check; do |
7545 |
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
7546 |
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do |
7547 |
+ IFS="$lt_save_ifs" |
7548 |
+ test -z "$ac_dir" && ac_dir=. |
7549 |
+ tmp_nm="$ac_dir/$lt_tmp_nm" |
7550 |
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then |
7551 |
+ # Check to see if the nm accepts a BSD-compat flag. |
7552 |
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: |
7553 |
+ # nm: unknown option "B" ignored |
7554 |
+ # Tru64's nm complains that /dev/null is an invalid object file |
7555 |
+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in |
7556 |
+ */dev/null* | *'Invalid file or object type'*) |
7557 |
+ lt_cv_path_NM="$tmp_nm -B" |
7558 |
break |
7559 |
;; |
7560 |
*) |
7561 |
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but |
7562 |
- continue # so that we can try to find one that supports BSD flags |
7563 |
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in |
7564 |
+ */dev/null*) |
7565 |
+ lt_cv_path_NM="$tmp_nm -p" |
7566 |
+ break |
7567 |
+ ;; |
7568 |
+ *) |
7569 |
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but |
7570 |
+ continue # so that we can try to find one that supports BSD flags |
7571 |
+ ;; |
7572 |
+ esac |
7573 |
;; |
7574 |
esac |
7575 |
- esac |
7576 |
- fi |
7577 |
+ fi |
7578 |
+ done |
7579 |
+ IFS="$lt_save_ifs" |
7580 |
done |
7581 |
- IFS="$lt_save_ifs" |
7582 |
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm |
7583 |
fi]) |
7584 |
NM="$lt_cv_path_NM" |
7585 |
@@ -3539,13 +3733,13 @@ |
7586 |
# ----------------------------------- |
7587 |
# sets LIBLTDL to the link flags for the libltdl convenience library and |
7588 |
# LTDLINCL to the include flags for the libltdl header and adds |
7589 |
-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL |
7590 |
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If |
7591 |
-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will |
7592 |
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with |
7593 |
-# '${top_srcdir}/' (note the single quotes!). If your package is not |
7594 |
-# flat and you're not using automake, define top_builddir and |
7595 |
-# top_srcdir appropriately in the Makefiles. |
7596 |
+# --enable-ltdl-convenience to the configure arguments. Note that |
7597 |
+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, |
7598 |
+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with |
7599 |
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' |
7600 |
+# (note the single quotes!). If your package is not flat and you're not |
7601 |
+# using automake, define top_builddir and top_srcdir appropriately in |
7602 |
+# the Makefiles. |
7603 |
AC_DEFUN([AC_LIBLTDL_CONVENIENCE], |
7604 |
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl |
7605 |
case $enable_ltdl_convenience in |
7606 |
@@ -3564,13 +3758,13 @@ |
7607 |
# ----------------------------------- |
7608 |
# sets LIBLTDL to the link flags for the libltdl installable library and |
7609 |
# LTDLINCL to the include flags for the libltdl header and adds |
7610 |
-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL |
7611 |
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If |
7612 |
-# DIRECTORY is not provided and an installed libltdl is not found, it is |
7613 |
-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' |
7614 |
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single |
7615 |
-# quotes!). If your package is not flat and you're not using automake, |
7616 |
-# define top_builddir and top_srcdir appropriately in the Makefiles. |
7617 |
+# --enable-ltdl-install to the configure arguments. Note that |
7618 |
+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, |
7619 |
+# and an installed libltdl is not found, it is assumed to be `libltdl'. |
7620 |
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with |
7621 |
+# '${top_srcdir}/' (note the single quotes!). If your package is not |
7622 |
+# flat and you're not using automake, define top_builddir and top_srcdir |
7623 |
+# appropriately in the Makefiles. |
7624 |
# In the future, this macro may have to be called after AC_PROG_LIBTOOL. |
7625 |
AC_DEFUN([AC_LIBLTDL_INSTALLABLE], |
7626 |
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl |
7627 |
@@ -3608,10 +3802,21 @@ |
7628 |
# --------------- |
7629 |
AC_DEFUN([_LT_AC_LANG_CXX], |
7630 |
[AC_REQUIRE([AC_PROG_CXX]) |
7631 |
-AC_REQUIRE([AC_PROG_CXXCPP]) |
7632 |
+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) |
7633 |
_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) |
7634 |
])# _LT_AC_LANG_CXX |
7635 |
|
7636 |
+# _LT_AC_PROG_CXXCPP |
7637 |
+# ------------------ |
7638 |
+AC_DEFUN([_LT_AC_PROG_CXXCPP], |
7639 |
+[ |
7640 |
+AC_REQUIRE([AC_PROG_CXX]) |
7641 |
+if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
7642 |
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
7643 |
+ (test "X$CXX" != "Xg++"))) ; then |
7644 |
+ AC_PROG_CXXCPP |
7645 |
+fi |
7646 |
+])# _LT_AC_PROG_CXXCPP |
7647 |
|
7648 |
# AC_LIBTOOL_F77 |
7649 |
# -------------- |
7650 |
@@ -3651,7 +3856,7 @@ |
7651 |
|
7652 |
|
7653 |
# AC_LIBTOOL_RC |
7654 |
-# -------------- |
7655 |
+# ------------- |
7656 |
# enable support for Windows resource files |
7657 |
AC_DEFUN([AC_LIBTOOL_RC], |
7658 |
[AC_REQUIRE([LT_AC_PROG_RC]) |
7659 |
@@ -3684,36 +3889,9 @@ |
7660 |
|
7661 |
_LT_AC_SYS_COMPILER |
7662 |
|
7663 |
-# |
7664 |
-# Check for any special shared library compilation flags. |
7665 |
-# |
7666 |
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= |
7667 |
-if test "$GCC" = no; then |
7668 |
- case $host_os in |
7669 |
- sco3.2v5*) |
7670 |
- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' |
7671 |
- ;; |
7672 |
- esac |
7673 |
-fi |
7674 |
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then |
7675 |
- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) |
7676 |
- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then : |
7677 |
- else |
7678 |
- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) |
7679 |
- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no |
7680 |
- fi |
7681 |
-fi |
7682 |
- |
7683 |
- |
7684 |
-# |
7685 |
-# Check to make sure the static flag actually works. |
7686 |
-# |
7687 |
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], |
7688 |
- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), |
7689 |
- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), |
7690 |
- [], |
7691 |
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) |
7692 |
- |
7693 |
+# save warnings/boilerplate of simple test code |
7694 |
+_LT_COMPILER_BOILERPLATE |
7695 |
+_LT_LINKER_BOILERPLATE |
7696 |
|
7697 |
AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) |
7698 |
AC_LIBTOOL_PROG_COMPILER_PIC($1) |
7699 |
@@ -3723,9 +3901,9 @@ |
7700 |
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) |
7701 |
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) |
7702 |
AC_LIBTOOL_SYS_LIB_STRIP |
7703 |
-AC_LIBTOOL_DLOPEN_SELF($1) |
7704 |
+AC_LIBTOOL_DLOPEN_SELF |
7705 |
|
7706 |
-# Report which librarie types wil actually be built |
7707 |
+# Report which library types will actually be built |
7708 |
AC_MSG_CHECKING([if libtool supports shared libraries]) |
7709 |
AC_MSG_RESULT([$can_build_shared]) |
7710 |
|
7711 |
@@ -3734,7 +3912,7 @@ |
7712 |
|
7713 |
# On AIX, shared libraries and static libraries use the same namespace, and |
7714 |
# are all built from PIC. |
7715 |
-case "$host_os" in |
7716 |
+case $host_os in |
7717 |
aix3*) |
7718 |
test "$enable_shared" = yes && enable_static=no |
7719 |
if test -n "$RANLIB"; then |
7720 |
@@ -3747,43 +3925,6 @@ |
7721 |
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then |
7722 |
test "$enable_shared" = yes && enable_static=no |
7723 |
fi |
7724 |
- ;; |
7725 |
- darwin* | rhapsody*) |
7726 |
- if test "$GCC" = yes; then |
7727 |
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
7728 |
- case "$host_os" in |
7729 |
- rhapsody* | darwin1.[[012]]) |
7730 |
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' |
7731 |
- ;; |
7732 |
- *) # Darwin 1.3 on |
7733 |
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
7734 |
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' |
7735 |
- else |
7736 |
- case ${MACOSX_DEPLOYMENT_TARGET} in |
7737 |
- 10.[[012]]) |
7738 |
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' |
7739 |
- ;; |
7740 |
- 10.*) |
7741 |
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' |
7742 |
- ;; |
7743 |
- esac |
7744 |
- fi |
7745 |
- ;; |
7746 |
- esac |
7747 |
- output_verbose_link_cmd='echo' |
7748 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' |
7749 |
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
7750 |
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
7751 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
7752 |
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
7753 |
- _LT_AC_TAGVAR(hardcode_direct, $1)=no |
7754 |
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes |
7755 |
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
7756 |
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' |
7757 |
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
7758 |
- else |
7759 |
- _LT_AC_TAGVAR(ld_shlibs, $1)=no |
7760 |
- fi |
7761 |
;; |
7762 |
esac |
7763 |
AC_MSG_RESULT([$enable_shared]) |
7764 |
@@ -3809,7 +3950,7 @@ |
7765 |
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], |
7766 |
[AC_LANG_PUSH(C++) |
7767 |
AC_REQUIRE([AC_PROG_CXX]) |
7768 |
-AC_REQUIRE([AC_PROG_CXXCPP]) |
7769 |
+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) |
7770 |
|
7771 |
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
7772 |
_LT_AC_TAGVAR(allow_undefined_flag, $1)= |
7773 |
@@ -3821,6 +3962,7 @@ |
7774 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
7775 |
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= |
7776 |
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no |
7777 |
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
7778 |
_LT_AC_TAGVAR(hardcode_automatic, $1)=no |
7779 |
_LT_AC_TAGVAR(module_cmds, $1)= |
7780 |
_LT_AC_TAGVAR(module_expsym_cmds, $1)= |
7781 |
@@ -3838,7 +3980,7 @@ |
7782 |
_LT_AC_TAGVAR(compiler_lib_search_path, $1)= |
7783 |
|
7784 |
# Source file extension for C++ test sources. |
7785 |
-ac_ext=cc |
7786 |
+ac_ext=cpp |
7787 |
|
7788 |
# Object file extension for compiled C++ test sources. |
7789 |
objext=o |
7790 |
@@ -3848,11 +3990,15 @@ |
7791 |
lt_simple_compile_test_code="int some_variable = 0;\n" |
7792 |
|
7793 |
# Code to be used in simple link tests |
7794 |
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' |
7795 |
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' |
7796 |
|
7797 |
# ltmain only uses $CC for tagged configurations so make sure $CC is set. |
7798 |
_LT_AC_SYS_COMPILER |
7799 |
|
7800 |
+# save warnings/boilerplate of simple test code |
7801 |
+_LT_COMPILER_BOILERPLATE |
7802 |
+_LT_LINKER_BOILERPLATE |
7803 |
+ |
7804 |
# Allow CC to be a program name with arguments. |
7805 |
lt_save_CC=$CC |
7806 |
lt_save_LD=$LD |
7807 |
@@ -3863,18 +4009,18 @@ |
7808 |
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then |
7809 |
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx |
7810 |
else |
7811 |
- unset lt_cv_prog_gnu_ld |
7812 |
+ $as_unset lt_cv_prog_gnu_ld |
7813 |
fi |
7814 |
if test -n "${lt_cv_path_LDCXX+set}"; then |
7815 |
lt_cv_path_LD=$lt_cv_path_LDCXX |
7816 |
else |
7817 |
- unset lt_cv_path_LD |
7818 |
+ $as_unset lt_cv_path_LD |
7819 |
fi |
7820 |
test -z "${LDCXX+set}" || LD=$LDCXX |
7821 |
CC=${CXX-"c++"} |
7822 |
compiler=$CC |
7823 |
_LT_AC_TAGVAR(compiler, $1)=$CC |
7824 |
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` |
7825 |
+_LT_CC_BASENAME([$compiler]) |
7826 |
|
7827 |
# We don't want -fno-exception wen compiling C++ code, so set the |
7828 |
# no_builtin_flag separately |
7829 |
@@ -3963,6 +4109,7 @@ |
7830 |
;; |
7831 |
esac |
7832 |
done |
7833 |
+ ;; |
7834 |
esac |
7835 |
|
7836 |
exp_sym_flag='-bexport' |
7837 |
@@ -3981,7 +4128,7 @@ |
7838 |
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
7839 |
|
7840 |
if test "$GXX" = yes; then |
7841 |
- case $host_os in aix4.[012]|aix4.[012].*) |
7842 |
+ case $host_os in aix4.[[012]]|aix4.[[012]].*) |
7843 |
# We only want to do this on AIX 4.2 and lower, the check |
7844 |
# below for broken collect2 doesn't work under 4.3+ |
7845 |
collect2name=`${CC} -print-prog-name=collect2` |
7846 |
@@ -4000,8 +4147,12 @@ |
7847 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
7848 |
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= |
7849 |
fi |
7850 |
+ ;; |
7851 |
esac |
7852 |
shared_flag='-shared' |
7853 |
+ if test "$aix_use_runtimelinking" = yes; then |
7854 |
+ shared_flag="$shared_flag "'${wl}-G' |
7855 |
+ fi |
7856 |
else |
7857 |
# not using gcc |
7858 |
if test "$host_cpu" = ia64; then |
7859 |
@@ -4028,12 +4179,12 @@ |
7860 |
_LT_AC_SYS_LIBPATH_AIX |
7861 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
7862 |
|
7863 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
7864 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
7865 |
else |
7866 |
if test "$host_cpu" = ia64; then |
7867 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
7868 |
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" |
7869 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" |
7870 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" |
7871 |
else |
7872 |
# Determine the default libpath from the value encoded in an empty executable. |
7873 |
_LT_AC_SYS_LIBPATH_AIX |
7874 |
@@ -4042,16 +4193,26 @@ |
7875 |
# -berok will link without error, but may produce a broken library. |
7876 |
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
7877 |
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
7878 |
- # -bexpall does not export symbols beginning with underscore (_) |
7879 |
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes |
7880 |
# Exported symbols can be pulled into shared objects from archives |
7881 |
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' |
7882 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
7883 |
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes |
7884 |
- # This is similar to how AIX traditionally builds it's shared libraries. |
7885 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
7886 |
+ # This is similar to how AIX traditionally builds its shared libraries. |
7887 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
7888 |
fi |
7889 |
fi |
7890 |
;; |
7891 |
+ |
7892 |
+ beos*) |
7893 |
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
7894 |
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported |
7895 |
+ # Joseph Beckenbach <jrb3@××××.com> says some releases of gcc |
7896 |
+ # support --undefined. This deserves some investigation. FIXME |
7897 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
7898 |
+ else |
7899 |
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no |
7900 |
+ fi |
7901 |
+ ;; |
7902 |
+ |
7903 |
chorus*) |
7904 |
case $cc_basename in |
7905 |
*) |
7906 |
@@ -4070,7 +4231,7 @@ |
7907 |
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
7908 |
|
7909 |
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then |
7910 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
7911 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
7912 |
# If the export-symbols file already is a .def file (1st line |
7913 |
# is EXPORTS), use it as is; otherwise, prepend... |
7914 |
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
7915 |
@@ -4079,70 +4240,81 @@ |
7916 |
echo EXPORTS > $output_objdir/$soname.def; |
7917 |
cat $export_symbols >> $output_objdir/$soname.def; |
7918 |
fi~ |
7919 |
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
7920 |
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
7921 |
else |
7922 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
7923 |
fi |
7924 |
;; |
7925 |
+ darwin* | rhapsody*) |
7926 |
+ case $host_os in |
7927 |
+ rhapsody* | darwin1.[[012]]) |
7928 |
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' |
7929 |
+ ;; |
7930 |
+ *) # Darwin 1.3 on |
7931 |
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
7932 |
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
7933 |
+ else |
7934 |
+ case ${MACOSX_DEPLOYMENT_TARGET} in |
7935 |
+ 10.[[012]]) |
7936 |
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
7937 |
+ ;; |
7938 |
+ 10.*) |
7939 |
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' |
7940 |
+ ;; |
7941 |
+ esac |
7942 |
+ fi |
7943 |
+ ;; |
7944 |
+ esac |
7945 |
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
7946 |
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no |
7947 |
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes |
7948 |
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
7949 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' |
7950 |
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
7951 |
|
7952 |
- darwin* | rhapsody*) |
7953 |
- if test "$GXX" = yes; then |
7954 |
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
7955 |
- case "$host_os" in |
7956 |
- rhapsody* | darwin1.[[012]]) |
7957 |
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' |
7958 |
- ;; |
7959 |
- *) # Darwin 1.3 on |
7960 |
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
7961 |
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' |
7962 |
+ if test "$GXX" = yes ; then |
7963 |
+ lt_int_apple_cc_single_mod=no |
7964 |
+ output_verbose_link_cmd='echo' |
7965 |
+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then |
7966 |
+ lt_int_apple_cc_single_mod=yes |
7967 |
+ fi |
7968 |
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
7969 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
7970 |
else |
7971 |
- case ${MACOSX_DEPLOYMENT_TARGET} in |
7972 |
- 10.[[012]]) |
7973 |
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' |
7974 |
- ;; |
7975 |
- 10.*) |
7976 |
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' |
7977 |
- ;; |
7978 |
- esac |
7979 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
7980 |
+ fi |
7981 |
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
7982 |
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
7983 |
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
7984 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
7985 |
+ else |
7986 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
7987 |
+ fi |
7988 |
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
7989 |
+ else |
7990 |
+ case $cc_basename in |
7991 |
+ xlc*) |
7992 |
+ output_verbose_link_cmd='echo' |
7993 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' |
7994 |
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
7995 |
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
7996 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
7997 |
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
7998 |
+ ;; |
7999 |
+ *) |
8000 |
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no |
8001 |
+ ;; |
8002 |
+ esac |
8003 |
fi |
8004 |
- ;; |
8005 |
- esac |
8006 |
- lt_int_apple_cc_single_mod=no |
8007 |
- output_verbose_link_cmd='echo' |
8008 |
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then |
8009 |
- lt_int_apple_cc_single_mod=yes |
8010 |
- fi |
8011 |
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
8012 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
8013 |
- else |
8014 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
8015 |
- fi |
8016 |
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
8017 |
- |
8018 |
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
8019 |
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
8020 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
8021 |
- else |
8022 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
8023 |
- fi |
8024 |
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
8025 |
- _LT_AC_TAGVAR(hardcode_direct, $1)=no |
8026 |
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes |
8027 |
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
8028 |
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' |
8029 |
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
8030 |
- else |
8031 |
- _LT_AC_TAGVAR(ld_shlibs, $1)=no |
8032 |
- fi |
8033 |
- ;; |
8034 |
+ ;; |
8035 |
|
8036 |
dgux*) |
8037 |
case $cc_basename in |
8038 |
- ec++) |
8039 |
+ ec++*) |
8040 |
# FIXME: insert proper C++ library support |
8041 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
8042 |
;; |
8043 |
- ghcx) |
8044 |
+ ghcx*) |
8045 |
# Green Hills C++ Compiler |
8046 |
# FIXME: insert proper C++ library support |
8047 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
8048 |
@@ -4153,14 +4325,14 @@ |
8049 |
;; |
8050 |
esac |
8051 |
;; |
8052 |
- freebsd[12]*) |
8053 |
+ freebsd[[12]]*) |
8054 |
# C++ shared libraries reported to be fairly broken before switch to ELF |
8055 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
8056 |
;; |
8057 |
freebsd-elf*) |
8058 |
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
8059 |
;; |
8060 |
- freebsd* | kfreebsd*-gnu) |
8061 |
+ freebsd* | kfreebsd*-gnu | dragonfly*) |
8062 |
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF |
8063 |
# conventions |
8064 |
_LT_AC_TAGVAR(ld_shlibs, $1)=yes |
8065 |
@@ -4177,11 +4349,11 @@ |
8066 |
# location of the library. |
8067 |
|
8068 |
case $cc_basename in |
8069 |
- CC) |
8070 |
+ CC*) |
8071 |
# FIXME: insert proper C++ library support |
8072 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
8073 |
;; |
8074 |
- aCC) |
8075 |
+ aCC*) |
8076 |
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
8077 |
# Commands to make compiler produce verbose output that lists |
8078 |
# what "hidden" libraries, object files and flags are used when |
8079 |
@@ -4191,7 +4363,7 @@ |
8080 |
# explicitly linking system object files so we need to strip them |
8081 |
# from the output so that they don't get included in the library |
8082 |
# dependencies. |
8083 |
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' |
8084 |
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' |
8085 |
;; |
8086 |
*) |
8087 |
if test "$GXX" = yes; then |
8088 |
@@ -4205,33 +4377,22 @@ |
8089 |
;; |
8090 |
hpux10*|hpux11*) |
8091 |
if test $with_gnu_ld = no; then |
8092 |
- case "$host_cpu" in |
8093 |
- hppa*64*) |
8094 |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
8095 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
8096 |
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
8097 |
+ |
8098 |
+ case $host_cpu in |
8099 |
+ hppa*64*|ia64*) |
8100 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' |
8101 |
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
8102 |
- ;; |
8103 |
- ia64*) |
8104 |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
8105 |
;; |
8106 |
*) |
8107 |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
8108 |
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
8109 |
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
8110 |
;; |
8111 |
esac |
8112 |
fi |
8113 |
- case "$host_cpu" in |
8114 |
- hppa*64*) |
8115 |
- _LT_AC_TAGVAR(hardcode_direct, $1)=no |
8116 |
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
8117 |
- ;; |
8118 |
- ia64*) |
8119 |
+ case $host_cpu in |
8120 |
+ hppa*64*|ia64*) |
8121 |
_LT_AC_TAGVAR(hardcode_direct, $1)=no |
8122 |
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
8123 |
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, |
8124 |
- # but as the default |
8125 |
- # location of the library. |
8126 |
;; |
8127 |
*) |
8128 |
_LT_AC_TAGVAR(hardcode_direct, $1)=yes |
8129 |
@@ -4242,14 +4403,17 @@ |
8130 |
esac |
8131 |
|
8132 |
case $cc_basename in |
8133 |
- CC) |
8134 |
+ CC*) |
8135 |
# FIXME: insert proper C++ library support |
8136 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
8137 |
;; |
8138 |
- aCC) |
8139 |
- case "$host_cpu" in |
8140 |
- hppa*64*|ia64*) |
8141 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' |
8142 |
+ aCC*) |
8143 |
+ case $host_cpu in |
8144 |
+ hppa*64*) |
8145 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
8146 |
+ ;; |
8147 |
+ ia64*) |
8148 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
8149 |
;; |
8150 |
*) |
8151 |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
8152 |
@@ -4268,9 +4432,12 @@ |
8153 |
*) |
8154 |
if test "$GXX" = yes; then |
8155 |
if test $with_gnu_ld = no; then |
8156 |
- case "$host_cpu" in |
8157 |
- ia64*|hppa*64*) |
8158 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' |
8159 |
+ case $host_cpu in |
8160 |
+ hppa*64*) |
8161 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
8162 |
+ ;; |
8163 |
+ ia64*) |
8164 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
8165 |
;; |
8166 |
*) |
8167 |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
8168 |
@@ -4284,11 +4451,25 @@ |
8169 |
;; |
8170 |
esac |
8171 |
;; |
8172 |
+ interix3*) |
8173 |
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no |
8174 |
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
8175 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
8176 |
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
8177 |
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. |
8178 |
+ # Instead, shared libraries are loaded at an image base (0x10000000 by |
8179 |
+ # default) and relocated if they conflict, which is a slow very memory |
8180 |
+ # consuming and fragmenting process. To avoid this, we pick a random, |
8181 |
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link |
8182 |
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. |
8183 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
8184 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
8185 |
+ ;; |
8186 |
irix5* | irix6*) |
8187 |
case $cc_basename in |
8188 |
- CC) |
8189 |
+ CC*) |
8190 |
# SGI C++ |
8191 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' |
8192 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
8193 |
|
8194 |
# Archives containing C++ object files must be created using |
8195 |
# "CC -ar", where "CC" is the IRIX C++ compiler. This is |
8196 |
@@ -4299,7 +4480,7 @@ |
8197 |
*) |
8198 |
if test "$GXX" = yes; then |
8199 |
if test "$with_gnu_ld" = no; then |
8200 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' |
8201 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
8202 |
else |
8203 |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' |
8204 |
fi |
8205 |
@@ -4312,7 +4493,7 @@ |
8206 |
;; |
8207 |
linux*) |
8208 |
case $cc_basename in |
8209 |
- KCC) |
8210 |
+ KCC*) |
8211 |
# Kuck and Associates, Inc. (KAI) C++ Compiler |
8212 |
|
8213 |
# KCC will only create a shared library if the output file |
8214 |
@@ -4337,17 +4518,41 @@ |
8215 |
# "CC -Bstatic", where "CC" is the KAI C++ compiler. |
8216 |
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' |
8217 |
;; |
8218 |
- icpc) |
8219 |
+ icpc*) |
8220 |
# Intel C++ |
8221 |
with_gnu_ld=yes |
8222 |
+ # version 8.0 and above of icpc choke on multiply defined symbols |
8223 |
+ # if we add $predep_objects and $postdep_objects, however 7.1 and |
8224 |
+ # earlier do not add the objects themselves. |
8225 |
+ case `$CC -V 2>&1` in |
8226 |
+ *"Version 7."*) |
8227 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
8228 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
8229 |
+ ;; |
8230 |
+ *) # Version 8.0 or newer |
8231 |
+ tmp_idyn= |
8232 |
+ case $host_cpu in |
8233 |
+ ia64*) tmp_idyn=' -i_dynamic';; |
8234 |
+ esac |
8235 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
8236 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
8237 |
+ ;; |
8238 |
+ esac |
8239 |
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
8240 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
8241 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
8242 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
8243 |
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
8244 |
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
8245 |
;; |
8246 |
- cxx) |
8247 |
+ pgCC*) |
8248 |
+ # Portland Group C++ compiler |
8249 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
8250 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
8251 |
+ |
8252 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' |
8253 |
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
8254 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
8255 |
+ ;; |
8256 |
+ cxx*) |
8257 |
# Compaq C++ |
8258 |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
8259 |
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' |
8260 |
@@ -4378,7 +4583,7 @@ |
8261 |
;; |
8262 |
mvs*) |
8263 |
case $cc_basename in |
8264 |
- cxx) |
8265 |
+ cxx*) |
8266 |
# FIXME: insert proper C++ library support |
8267 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
8268 |
;; |
8269 |
@@ -4399,9 +4604,25 @@ |
8270 |
# Workaround some broken pre-1.5 toolchains |
8271 |
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' |
8272 |
;; |
8273 |
+ openbsd2*) |
8274 |
+ # C++ shared libraries are fairly broken |
8275 |
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no |
8276 |
+ ;; |
8277 |
+ openbsd*) |
8278 |
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
8279 |
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
8280 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' |
8281 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
8282 |
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
8283 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' |
8284 |
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
8285 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
8286 |
+ fi |
8287 |
+ output_verbose_link_cmd='echo' |
8288 |
+ ;; |
8289 |
osf3*) |
8290 |
case $cc_basename in |
8291 |
- KCC) |
8292 |
+ KCC*) |
8293 |
# Kuck and Associates, Inc. (KAI) C++ Compiler |
8294 |
|
8295 |
# KCC will only create a shared library if the output file |
8296 |
@@ -4417,14 +4638,14 @@ |
8297 |
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' |
8298 |
|
8299 |
;; |
8300 |
- RCC) |
8301 |
+ RCC*) |
8302 |
# Rational C++ 2.4.1 |
8303 |
# FIXME: insert proper C++ library support |
8304 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
8305 |
;; |
8306 |
- cxx) |
8307 |
+ cxx*) |
8308 |
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
8309 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' |
8310 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
8311 |
|
8312 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
8313 |
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
8314 |
@@ -4442,7 +4663,7 @@ |
8315 |
*) |
8316 |
if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
8317 |
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
8318 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' |
8319 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
8320 |
|
8321 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
8322 |
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
8323 |
@@ -4461,7 +4682,7 @@ |
8324 |
;; |
8325 |
osf4* | osf5*) |
8326 |
case $cc_basename in |
8327 |
- KCC) |
8328 |
+ KCC*) |
8329 |
# Kuck and Associates, Inc. (KAI) C++ Compiler |
8330 |
|
8331 |
# KCC will only create a shared library if the output file |
8332 |
@@ -4476,17 +4697,17 @@ |
8333 |
# the KAI C++ compiler. |
8334 |
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' |
8335 |
;; |
8336 |
- RCC) |
8337 |
+ RCC*) |
8338 |
# Rational C++ 2.4.1 |
8339 |
# FIXME: insert proper C++ library support |
8340 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
8341 |
;; |
8342 |
- cxx) |
8343 |
+ cxx*) |
8344 |
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
8345 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' |
8346 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
8347 |
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ |
8348 |
echo "-hidden">> $lib.exp~ |
8349 |
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ |
8350 |
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ |
8351 |
$rm $lib.exp' |
8352 |
|
8353 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
8354 |
@@ -4505,7 +4726,7 @@ |
8355 |
*) |
8356 |
if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
8357 |
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
8358 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' |
8359 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
8360 |
|
8361 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
8362 |
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
8363 |
@@ -4526,27 +4747,14 @@ |
8364 |
# FIXME: insert proper C++ library support |
8365 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
8366 |
;; |
8367 |
- sco*) |
8368 |
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
8369 |
+ sunos4*) |
8370 |
case $cc_basename in |
8371 |
- CC) |
8372 |
+ CC*) |
8373 |
+ # Sun C++ 4.x |
8374 |
# FIXME: insert proper C++ library support |
8375 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
8376 |
;; |
8377 |
- *) |
8378 |
- # FIXME: insert proper C++ library support |
8379 |
- _LT_AC_TAGVAR(ld_shlibs, $1)=no |
8380 |
- ;; |
8381 |
- esac |
8382 |
- ;; |
8383 |
- sunos4*) |
8384 |
- case $cc_basename in |
8385 |
- CC) |
8386 |
- # Sun C++ 4.x |
8387 |
- # FIXME: insert proper C++ library support |
8388 |
- _LT_AC_TAGVAR(ld_shlibs, $1)=no |
8389 |
- ;; |
8390 |
- lcc) |
8391 |
+ lcc*) |
8392 |
# Lucid |
8393 |
# FIXME: insert proper C++ library support |
8394 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
8395 |
@@ -4559,36 +4767,33 @@ |
8396 |
;; |
8397 |
solaris*) |
8398 |
case $cc_basename in |
8399 |
- CC) |
8400 |
+ CC*) |
8401 |
# Sun C++ 4.2, 5.x and Centerline C++ |
8402 |
+ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes |
8403 |
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
8404 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
8405 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
8406 |
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
8407 |
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' |
8408 |
+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' |
8409 |
|
8410 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
8411 |
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
8412 |
case $host_os in |
8413 |
- solaris2.[0-5] | solaris2.[0-5].*) ;; |
8414 |
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; |
8415 |
*) |
8416 |
# The C++ compiler is used as linker so we must use $wl |
8417 |
# flag to pass the commands to the underlying system |
8418 |
- # linker. |
8419 |
+ # linker. We must also pass each convience library through |
8420 |
+ # to the system linker between allextract/defaultextract. |
8421 |
+ # The C++ compiler will combine linker options so we |
8422 |
+ # cannot just pass the convience library names through |
8423 |
+ # without $wl. |
8424 |
# Supported since Solaris 2.6 (maybe 2.5.1?) |
8425 |
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' |
8426 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' |
8427 |
;; |
8428 |
esac |
8429 |
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
8430 |
|
8431 |
- # Commands to make compiler produce verbose output that lists |
8432 |
- # what "hidden" libraries, object files and flags are used when |
8433 |
- # linking a shared library. |
8434 |
- # |
8435 |
- # There doesn't appear to be a way to prevent this compiler from |
8436 |
- # explicitly linking system object files so we need to strip them |
8437 |
- # from the output so that they don't get included in the library |
8438 |
- # dependencies. |
8439 |
- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' |
8440 |
+ output_verbose_link_cmd='echo' |
8441 |
|
8442 |
# Archives containing C++ object files must be created using |
8443 |
# "CC -xar", where "CC" is the Sun C++ compiler. This is |
8444 |
@@ -4596,7 +4801,7 @@ |
8445 |
# in the archive. |
8446 |
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' |
8447 |
;; |
8448 |
- gcx) |
8449 |
+ gcx*) |
8450 |
# Green Hills C++ Compiler |
8451 |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
8452 |
|
8453 |
@@ -4634,12 +4839,63 @@ |
8454 |
;; |
8455 |
esac |
8456 |
;; |
8457 |
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) |
8458 |
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) |
8459 |
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' |
8460 |
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
8461 |
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
8462 |
+ runpath_var='LD_RUN_PATH' |
8463 |
+ |
8464 |
+ case $cc_basename in |
8465 |
+ CC*) |
8466 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
8467 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
8468 |
+ ;; |
8469 |
+ *) |
8470 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
8471 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
8472 |
+ ;; |
8473 |
+ esac |
8474 |
+ ;; |
8475 |
+ sysv5* | sco3.2v5* | sco5v6*) |
8476 |
+ # Note: We can NOT use -z defs as we might desire, because we do not |
8477 |
+ # link with -lc, and that would cause any symbols used from libc to |
8478 |
+ # always be unresolved, which means just about no library would |
8479 |
+ # ever link correctly. If we're not using GNU ld we use -z text |
8480 |
+ # though, which does catch some bad symbols but isn't as heavy-handed |
8481 |
+ # as -z defs. |
8482 |
+ # For security reasons, it is highly recommended that you always |
8483 |
+ # use absolute paths for naming shared libraries, and exclude the |
8484 |
+ # DT_RUNPATH tag from executables and libraries. But doing so |
8485 |
+ # requires that you compile everything twice, which is a pain. |
8486 |
+ # So that behaviour is only enabled if SCOABSPATH is set to a |
8487 |
+ # non-empty value in the environment. Most likely only useful for |
8488 |
+ # creating official distributions of packages. |
8489 |
+ # This is a hack until libtool officially supports absolute path |
8490 |
+ # names for shared libraries. |
8491 |
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' |
8492 |
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' |
8493 |
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
8494 |
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
8495 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' |
8496 |
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' |
8497 |
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
8498 |
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' |
8499 |
+ runpath_var='LD_RUN_PATH' |
8500 |
+ |
8501 |
+ case $cc_basename in |
8502 |
+ CC*) |
8503 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
8504 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
8505 |
+ ;; |
8506 |
+ *) |
8507 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
8508 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
8509 |
+ ;; |
8510 |
+ esac |
8511 |
;; |
8512 |
tandem*) |
8513 |
case $cc_basename in |
8514 |
- NCC) |
8515 |
+ NCC*) |
8516 |
# NonStop-UX NCC 3.20 |
8517 |
# FIXME: insert proper C++ library support |
8518 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
8519 |
@@ -4672,8 +4928,6 @@ |
8520 |
AC_LIBTOOL_PROG_LD_SHLIBS($1) |
8521 |
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) |
8522 |
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) |
8523 |
-AC_LIBTOOL_SYS_LIB_STRIP |
8524 |
-AC_LIBTOOL_DLOPEN_SELF($1) |
8525 |
|
8526 |
AC_LIBTOOL_CONFIG($1) |
8527 |
|
8528 |
@@ -4691,7 +4945,7 @@ |
8529 |
])# AC_LIBTOOL_LANG_CXX_CONFIG |
8530 |
|
8531 |
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) |
8532 |
-# ------------------------ |
8533 |
+# ------------------------------------ |
8534 |
# Figure out "hidden" library dependencies from verbose |
8535 |
# compiler output when linking a shared library. |
8536 |
# Parse the compiler output and extract the necessary |
8537 |
@@ -4745,7 +4999,7 @@ |
8538 |
# The `*' in the case matches for architectures that use `case' in |
8539 |
# $output_verbose_cmd can trigger glob expansion during the loop |
8540 |
# eval without this substitution. |
8541 |
- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" |
8542 |
+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` |
8543 |
|
8544 |
for p in `eval $output_verbose_link_cmd`; do |
8545 |
case $p in |
8546 |
@@ -4821,13 +5075,37 @@ |
8547 |
|
8548 |
$rm -f confest.$objext |
8549 |
|
8550 |
+# PORTME: override above test on systems where it is broken |
8551 |
+ifelse([$1],[CXX], |
8552 |
+[case $host_os in |
8553 |
+interix3*) |
8554 |
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than |
8555 |
+ # hack all around it, let's just trust "g++" to DTRT. |
8556 |
+ _LT_AC_TAGVAR(predep_objects,$1)= |
8557 |
+ _LT_AC_TAGVAR(postdep_objects,$1)= |
8558 |
+ _LT_AC_TAGVAR(postdeps,$1)= |
8559 |
+ ;; |
8560 |
+ |
8561 |
+solaris*) |
8562 |
+ case $cc_basename in |
8563 |
+ CC*) |
8564 |
+ # Adding this requires a known-good setup of shared libraries for |
8565 |
+ # Sun compiler versions before 5.6, else PIC objects from an old |
8566 |
+ # archive will be linked into the output, leading to subtle bugs. |
8567 |
+ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' |
8568 |
+ ;; |
8569 |
+ esac |
8570 |
+ ;; |
8571 |
+esac |
8572 |
+]) |
8573 |
+ |
8574 |
case " $_LT_AC_TAGVAR(postdeps, $1) " in |
8575 |
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; |
8576 |
esac |
8577 |
])# AC_LIBTOOL_POSTDEP_PREDEP |
8578 |
|
8579 |
# AC_LIBTOOL_LANG_F77_CONFIG |
8580 |
-# ------------------------ |
8581 |
+# -------------------------- |
8582 |
# Ensure that the configuration vars for the C compiler are |
8583 |
# suitably defined. Those variables are subsequently used by |
8584 |
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. |
8585 |
@@ -4871,12 +5149,16 @@ |
8586 |
# ltmain only uses $CC for tagged configurations so make sure $CC is set. |
8587 |
_LT_AC_SYS_COMPILER |
8588 |
|
8589 |
+# save warnings/boilerplate of simple test code |
8590 |
+_LT_COMPILER_BOILERPLATE |
8591 |
+_LT_LINKER_BOILERPLATE |
8592 |
+ |
8593 |
# Allow CC to be a program name with arguments. |
8594 |
lt_save_CC="$CC" |
8595 |
CC=${F77-"f77"} |
8596 |
compiler=$CC |
8597 |
_LT_AC_TAGVAR(compiler, $1)=$CC |
8598 |
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` |
8599 |
+_LT_CC_BASENAME([$compiler]) |
8600 |
|
8601 |
AC_MSG_CHECKING([if libtool supports shared libraries]) |
8602 |
AC_MSG_RESULT([$can_build_shared]) |
8603 |
@@ -4886,7 +5168,7 @@ |
8604 |
|
8605 |
# On AIX, shared libraries and static libraries use the same namespace, and |
8606 |
# are all built from PIC. |
8607 |
-case "$host_os" in |
8608 |
+case $host_os in |
8609 |
aix3*) |
8610 |
test "$enable_shared" = yes && enable_static=no |
8611 |
if test -n "$RANLIB"; then |
8612 |
@@ -4895,7 +5177,9 @@ |
8613 |
fi |
8614 |
;; |
8615 |
aix4* | aix5*) |
8616 |
- test "$enable_shared" = yes && enable_static=no |
8617 |
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then |
8618 |
+ test "$enable_shared" = yes && enable_static=no |
8619 |
+ fi |
8620 |
;; |
8621 |
esac |
8622 |
AC_MSG_RESULT([$enable_shared]) |
8623 |
@@ -4905,8 +5189,6 @@ |
8624 |
test "$enable_shared" = yes || enable_static=yes |
8625 |
AC_MSG_RESULT([$enable_static]) |
8626 |
|
8627 |
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no |
8628 |
- |
8629 |
_LT_AC_TAGVAR(GCC, $1)="$G77" |
8630 |
_LT_AC_TAGVAR(LD, $1)="$LD" |
8631 |
|
8632 |
@@ -4916,8 +5198,6 @@ |
8633 |
AC_LIBTOOL_PROG_LD_SHLIBS($1) |
8634 |
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) |
8635 |
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) |
8636 |
-AC_LIBTOOL_SYS_LIB_STRIP |
8637 |
- |
8638 |
|
8639 |
AC_LIBTOOL_CONFIG($1) |
8640 |
|
8641 |
@@ -4946,20 +5226,27 @@ |
8642 |
lt_simple_compile_test_code="class foo {}\n" |
8643 |
|
8644 |
# Code to be used in simple link tests |
8645 |
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' |
8646 |
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' |
8647 |
|
8648 |
# ltmain only uses $CC for tagged configurations so make sure $CC is set. |
8649 |
_LT_AC_SYS_COMPILER |
8650 |
|
8651 |
+# save warnings/boilerplate of simple test code |
8652 |
+_LT_COMPILER_BOILERPLATE |
8653 |
+_LT_LINKER_BOILERPLATE |
8654 |
+ |
8655 |
# Allow CC to be a program name with arguments. |
8656 |
lt_save_CC="$CC" |
8657 |
CC=${GCJ-"gcj"} |
8658 |
compiler=$CC |
8659 |
_LT_AC_TAGVAR(compiler, $1)=$CC |
8660 |
+_LT_CC_BASENAME([$compiler]) |
8661 |
|
8662 |
# GCJ did not exist at the time GCC didn't implicitly link libc in. |
8663 |
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
8664 |
|
8665 |
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
8666 |
+ |
8667 |
AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) |
8668 |
AC_LIBTOOL_PROG_COMPILER_PIC($1) |
8669 |
AC_LIBTOOL_PROG_CC_C_O($1) |
8670 |
@@ -4967,8 +5254,6 @@ |
8671 |
AC_LIBTOOL_PROG_LD_SHLIBS($1) |
8672 |
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) |
8673 |
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) |
8674 |
-AC_LIBTOOL_SYS_LIB_STRIP |
8675 |
-AC_LIBTOOL_DLOPEN_SELF($1) |
8676 |
|
8677 |
AC_LIBTOOL_CONFIG($1) |
8678 |
|
8679 |
@@ -4978,7 +5263,7 @@ |
8680 |
|
8681 |
|
8682 |
# AC_LIBTOOL_LANG_RC_CONFIG |
8683 |
-# -------------------------- |
8684 |
+# ------------------------- |
8685 |
# Ensure that the configuration vars for the Windows resource compiler are |
8686 |
# suitably defined. Those variables are subsequently used by |
8687 |
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. |
8688 |
@@ -5002,11 +5287,16 @@ |
8689 |
# ltmain only uses $CC for tagged configurations so make sure $CC is set. |
8690 |
_LT_AC_SYS_COMPILER |
8691 |
|
8692 |
+# save warnings/boilerplate of simple test code |
8693 |
+_LT_COMPILER_BOILERPLATE |
8694 |
+_LT_LINKER_BOILERPLATE |
8695 |
+ |
8696 |
# Allow CC to be a program name with arguments. |
8697 |
lt_save_CC="$CC" |
8698 |
CC=${RC-"windres"} |
8699 |
compiler=$CC |
8700 |
_LT_AC_TAGVAR(compiler, $1)=$CC |
8701 |
+_LT_CC_BASENAME([$compiler]) |
8702 |
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
8703 |
|
8704 |
AC_LIBTOOL_CONFIG($1) |
8705 |
@@ -5036,7 +5326,7 @@ |
8706 |
# Now quote all the things that may contain metacharacters while being |
8707 |
# careful not to overquote the AC_SUBSTed values. We take copies of the |
8708 |
# variables and quote the copies for generation of the libtool script. |
8709 |
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ |
8710 |
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ |
8711 |
SED SHELL STRIP \ |
8712 |
libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
8713 |
old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
8714 |
@@ -5142,7 +5432,7 @@ |
8715 |
# |
8716 |
# You should have received a copy of the GNU General Public License |
8717 |
# along with this program; if not, write to the Free Software |
8718 |
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
8719 |
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
8720 |
# |
8721 |
# As a special exception to the GNU General Public License, if you |
8722 |
# distribute this file as part of a program that contains a |
8723 |
@@ -5153,11 +5443,11 @@ |
8724 |
SED=$lt_SED |
8725 |
|
8726 |
# Sed that helps us avoid accidentally triggering echo(1) options like -n. |
8727 |
-Xsed="$SED -e s/^X//" |
8728 |
+Xsed="$SED -e 1s/^X//" |
8729 |
|
8730 |
# The HP-UX ksh and POSIX shell print the target directory to stdout |
8731 |
# if CDPATH is set. |
8732 |
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi |
8733 |
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
8734 |
|
8735 |
# The names of the tagged configurations supported by this script. |
8736 |
available_tags= |
8737 |
@@ -5188,6 +5478,12 @@ |
8738 |
# The host system. |
8739 |
host_alias=$host_alias |
8740 |
host=$host |
8741 |
+host_os=$host_os |
8742 |
+ |
8743 |
+# The build system. |
8744 |
+build_alias=$build_alias |
8745 |
+build=$build |
8746 |
+build_os=$build_os |
8747 |
|
8748 |
# An echo program that does not interpret backslashes. |
8749 |
echo=$lt_echo |
8750 |
@@ -5199,6 +5495,9 @@ |
8751 |
# A C compiler. |
8752 |
LTCC=$lt_LTCC |
8753 |
|
8754 |
+# LTCC compiler flags. |
8755 |
+LTCFLAGS=$lt_LTCFLAGS |
8756 |
+ |
8757 |
# A language-specific compiler. |
8758 |
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) |
8759 |
|
8760 |
@@ -5264,7 +5563,7 @@ |
8761 |
# Does compiler simultaneously support -c and -o options? |
8762 |
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) |
8763 |
|
8764 |
-# Must we lock files when doing compilation ? |
8765 |
+# Must we lock files when doing compilation? |
8766 |
need_locks=$lt_need_locks |
8767 |
|
8768 |
# Do we need the lib prefix for modules? |
8769 |
@@ -5538,9 +5837,6 @@ |
8770 |
# Regexp to match symbols that can be accessed directly from C. |
8771 |
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' |
8772 |
|
8773 |
-# Transform the above into a raw symbol and a C symbol. |
8774 |
-symxfrm='\1 \2\3 \3' |
8775 |
- |
8776 |
# Transform an extracted symbol line into a proper C declaration |
8777 |
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" |
8778 |
|
8779 |
@@ -5562,15 +5858,31 @@ |
8780 |
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
8781 |
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" |
8782 |
;; |
8783 |
+linux*) |
8784 |
+ if test "$host_cpu" = ia64; then |
8785 |
+ symcode='[[ABCDGIRSTW]]' |
8786 |
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
8787 |
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" |
8788 |
+ fi |
8789 |
+ ;; |
8790 |
irix* | nonstopux*) |
8791 |
symcode='[[BCDEGRST]]' |
8792 |
;; |
8793 |
osf*) |
8794 |
symcode='[[BCDEGQRST]]' |
8795 |
;; |
8796 |
-solaris* | sysv5*) |
8797 |
+solaris*) |
8798 |
symcode='[[BDRT]]' |
8799 |
;; |
8800 |
+sco3.2v5*) |
8801 |
+ symcode='[[DT]]' |
8802 |
+ ;; |
8803 |
+sysv4.2uw2*) |
8804 |
+ symcode='[[DT]]' |
8805 |
+ ;; |
8806 |
+sysv5* | sco5v6* | unixware* | OpenUNIX*) |
8807 |
+ symcode='[[ABDT]]' |
8808 |
+ ;; |
8809 |
sysv4) |
8810 |
symcode='[[DFNSTU]]' |
8811 |
;; |
8812 |
@@ -5593,8 +5905,11 @@ |
8813 |
# Try without a prefix undercore, then with it. |
8814 |
for ac_symprfx in "" "_"; do |
8815 |
|
8816 |
+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. |
8817 |
+ symxfrm="\\1 $ac_symprfx\\2 \\2" |
8818 |
+ |
8819 |
# Write the raw and C identifiers. |
8820 |
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" |
8821 |
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
8822 |
|
8823 |
# Check to see that the pipe works correctly. |
8824 |
pipe_works=no |
8825 |
@@ -5750,6 +6065,10 @@ |
8826 |
# DJGPP does not support shared libraries at all |
8827 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= |
8828 |
;; |
8829 |
+ interix3*) |
8830 |
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
8831 |
+ # Instead, we relocate shared libraries at runtime. |
8832 |
+ ;; |
8833 |
sysv4*MP*) |
8834 |
if test -d /usr/nec; then |
8835 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic |
8836 |
@@ -5758,7 +6077,7 @@ |
8837 |
hpux*) |
8838 |
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
8839 |
# not for PA HP-UX. |
8840 |
- case "$host_cpu" in |
8841 |
+ case $host_cpu in |
8842 |
hppa*64*|ia64*) |
8843 |
;; |
8844 |
*) |
8845 |
@@ -5783,18 +6102,28 @@ |
8846 |
;; |
8847 |
chorus*) |
8848 |
case $cc_basename in |
8849 |
- cxch68) |
8850 |
+ cxch68*) |
8851 |
# Green Hills C++ Compiler |
8852 |
# _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" |
8853 |
;; |
8854 |
esac |
8855 |
;; |
8856 |
+ darwin*) |
8857 |
+ # PIC is the default on this platform |
8858 |
+ # Common symbols not allowed in MH_DYLIB files |
8859 |
+ case $cc_basename in |
8860 |
+ xlc*) |
8861 |
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' |
8862 |
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
8863 |
+ ;; |
8864 |
+ esac |
8865 |
+ ;; |
8866 |
dgux*) |
8867 |
case $cc_basename in |
8868 |
- ec++) |
8869 |
+ ec++*) |
8870 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
8871 |
;; |
8872 |
- ghcx) |
8873 |
+ ghcx*) |
8874 |
# Green Hills C++ Compiler |
8875 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' |
8876 |
;; |
8877 |
@@ -5802,22 +6131,22 @@ |
8878 |
;; |
8879 |
esac |
8880 |
;; |
8881 |
- freebsd* | kfreebsd*-gnu) |
8882 |
+ freebsd* | kfreebsd*-gnu | dragonfly*) |
8883 |
# FreeBSD uses GNU C++ |
8884 |
;; |
8885 |
hpux9* | hpux10* | hpux11*) |
8886 |
case $cc_basename in |
8887 |
- CC) |
8888 |
+ CC*) |
8889 |
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
8890 |
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" |
8891 |
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' |
8892 |
if test "$host_cpu" != ia64; then |
8893 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' |
8894 |
fi |
8895 |
;; |
8896 |
- aCC) |
8897 |
+ aCC*) |
8898 |
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
8899 |
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" |
8900 |
- case "$host_cpu" in |
8901 |
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' |
8902 |
+ case $host_cpu in |
8903 |
hppa*64*|ia64*) |
8904 |
# +Z the default |
8905 |
;; |
8906 |
@@ -5830,9 +6159,13 @@ |
8907 |
;; |
8908 |
esac |
8909 |
;; |
8910 |
+ interix*) |
8911 |
+ # This is c89, which is MS Visual C++ (no shared libs) |
8912 |
+ # Anyone wants to do a port? |
8913 |
+ ;; |
8914 |
irix5* | irix6* | nonstopux*) |
8915 |
case $cc_basename in |
8916 |
- CC) |
8917 |
+ CC*) |
8918 |
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
8919 |
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
8920 |
# CC pic flag -KPIC is the default. |
8921 |
@@ -5843,18 +6176,24 @@ |
8922 |
;; |
8923 |
linux*) |
8924 |
case $cc_basename in |
8925 |
- KCC) |
8926 |
+ KCC*) |
8927 |
# KAI C++ Compiler |
8928 |
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' |
8929 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
8930 |
;; |
8931 |
- icpc) |
8932 |
+ icpc* | ecpc*) |
8933 |
# Intel C++ |
8934 |
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
8935 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
8936 |
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' |
8937 |
;; |
8938 |
- cxx) |
8939 |
+ pgCC*) |
8940 |
+ # Portland Group C++ compiler. |
8941 |
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
8942 |
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
8943 |
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
8944 |
+ ;; |
8945 |
+ cxx*) |
8946 |
# Compaq C++ |
8947 |
# Make sure the PIC flag is empty. It appears that all Alpha |
8948 |
# Linux and Compaq Tru64 Unix objects are PIC. |
8949 |
@@ -5871,7 +6210,7 @@ |
8950 |
;; |
8951 |
mvs*) |
8952 |
case $cc_basename in |
8953 |
- cxx) |
8954 |
+ cxx*) |
8955 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' |
8956 |
;; |
8957 |
*) |
8958 |
@@ -5882,14 +6221,14 @@ |
8959 |
;; |
8960 |
osf3* | osf4* | osf5*) |
8961 |
case $cc_basename in |
8962 |
- KCC) |
8963 |
+ KCC*) |
8964 |
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' |
8965 |
;; |
8966 |
- RCC) |
8967 |
+ RCC*) |
8968 |
# Rational C++ 2.4.1 |
8969 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' |
8970 |
;; |
8971 |
- cxx) |
8972 |
+ cxx*) |
8973 |
# Digital/Compaq C++ |
8974 |
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
8975 |
# Make sure the PIC flag is empty. It appears that all Alpha |
8976 |
@@ -5903,24 +6242,15 @@ |
8977 |
;; |
8978 |
psos*) |
8979 |
;; |
8980 |
- sco*) |
8981 |
- case $cc_basename in |
8982 |
- CC) |
8983 |
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
8984 |
- ;; |
8985 |
- *) |
8986 |
- ;; |
8987 |
- esac |
8988 |
- ;; |
8989 |
solaris*) |
8990 |
case $cc_basename in |
8991 |
- CC) |
8992 |
+ CC*) |
8993 |
# Sun C++ 4.2, 5.x and Centerline C++ |
8994 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
8995 |
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
8996 |
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' |
8997 |
;; |
8998 |
- gcx) |
8999 |
+ gcx*) |
9000 |
# Green Hills C++ Compiler |
9001 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' |
9002 |
;; |
9003 |
@@ -5930,12 +6260,12 @@ |
9004 |
;; |
9005 |
sunos4*) |
9006 |
case $cc_basename in |
9007 |
- CC) |
9008 |
+ CC*) |
9009 |
# Sun C++ 4.x |
9010 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' |
9011 |
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
9012 |
;; |
9013 |
- lcc) |
9014 |
+ lcc*) |
9015 |
# Lucid |
9016 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' |
9017 |
;; |
9018 |
@@ -5945,7 +6275,7 @@ |
9019 |
;; |
9020 |
tandem*) |
9021 |
case $cc_basename in |
9022 |
- NCC) |
9023 |
+ NCC*) |
9024 |
# NonStop-UX NCC 3.20 |
9025 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
9026 |
;; |
9027 |
@@ -5953,7 +6283,14 @@ |
9028 |
;; |
9029 |
esac |
9030 |
;; |
9031 |
- unixware*) |
9032 |
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) |
9033 |
+ case $cc_basename in |
9034 |
+ CC*) |
9035 |
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
9036 |
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
9037 |
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
9038 |
+ ;; |
9039 |
+ esac |
9040 |
;; |
9041 |
vxworks*) |
9042 |
;; |
9043 |
@@ -6000,6 +6337,11 @@ |
9044 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
9045 |
;; |
9046 |
|
9047 |
+ interix3*) |
9048 |
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
9049 |
+ # Instead, we relocate shared libraries at runtime. |
9050 |
+ ;; |
9051 |
+ |
9052 |
msdosdjgpp*) |
9053 |
# Just because we use GCC doesn't mean we suddenly get shared libraries |
9054 |
# on systems that don't support them. |
9055 |
@@ -6016,7 +6358,7 @@ |
9056 |
hpux*) |
9057 |
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
9058 |
# not for PA HP-UX. |
9059 |
- case "$host_cpu" in |
9060 |
+ case $host_cpu in |
9061 |
hppa*64*|ia64*) |
9062 |
# +Z the default |
9063 |
;; |
9064 |
@@ -6042,6 +6384,16 @@ |
9065 |
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' |
9066 |
fi |
9067 |
;; |
9068 |
+ darwin*) |
9069 |
+ # PIC is the default on this platform |
9070 |
+ # Common symbols not allowed in MH_DYLIB files |
9071 |
+ case $cc_basename in |
9072 |
+ xlc*) |
9073 |
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' |
9074 |
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
9075 |
+ ;; |
9076 |
+ esac |
9077 |
+ ;; |
9078 |
|
9079 |
mingw* | pw32* | os2*) |
9080 |
# This hack is so that the source file can tell whether it is being |
9081 |
@@ -6053,7 +6405,7 @@ |
9082 |
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
9083 |
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
9084 |
# not for PA HP-UX. |
9085 |
- case "$host_cpu" in |
9086 |
+ case $host_cpu in |
9087 |
hppa*64*|ia64*) |
9088 |
# +Z the default |
9089 |
;; |
9090 |
@@ -6077,12 +6429,19 @@ |
9091 |
;; |
9092 |
|
9093 |
linux*) |
9094 |
- case $CC in |
9095 |
+ case $cc_basename in |
9096 |
icc* | ecc*) |
9097 |
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
9098 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
9099 |
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' |
9100 |
;; |
9101 |
+ pgcc* | pgf77* | pgf90* | pgf95*) |
9102 |
+ # Portland Group compilers (*not* the Pentium gcc compiler, |
9103 |
+ # which looks to be a dead project) |
9104 |
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
9105 |
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
9106 |
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
9107 |
+ ;; |
9108 |
ccc*) |
9109 |
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
9110 |
# All Alpha code is PIC. |
9111 |
@@ -6097,15 +6456,15 @@ |
9112 |
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
9113 |
;; |
9114 |
|
9115 |
- sco3.2v5*) |
9116 |
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' |
9117 |
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' |
9118 |
- ;; |
9119 |
- |
9120 |
solaris*) |
9121 |
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
9122 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
9123 |
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
9124 |
+ case $cc_basename in |
9125 |
+ f77* | f90* | f95*) |
9126 |
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
9127 |
+ *) |
9128 |
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
9129 |
+ esac |
9130 |
;; |
9131 |
|
9132 |
sunos4*) |
9133 |
@@ -6114,7 +6473,7 @@ |
9134 |
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
9135 |
;; |
9136 |
|
9137 |
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
9138 |
+ sysv4 | sysv4.2uw2* | sysv4.3*) |
9139 |
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
9140 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
9141 |
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
9142 |
@@ -6127,6 +6486,17 @@ |
9143 |
fi |
9144 |
;; |
9145 |
|
9146 |
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) |
9147 |
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
9148 |
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
9149 |
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
9150 |
+ ;; |
9151 |
+ |
9152 |
+ unicos*) |
9153 |
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
9154 |
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no |
9155 |
+ ;; |
9156 |
+ |
9157 |
uts4*) |
9158 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' |
9159 |
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
9160 |
@@ -6154,7 +6524,7 @@ |
9161 |
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= |
9162 |
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) |
9163 |
fi |
9164 |
-case "$host_os" in |
9165 |
+case $host_os in |
9166 |
# For platforms which do not support PIC, -DPIC is meaningless: |
9167 |
*djgpp*) |
9168 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= |
9169 |
@@ -6163,6 +6533,16 @@ |
9170 |
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" |
9171 |
;; |
9172 |
esac |
9173 |
+ |
9174 |
+# |
9175 |
+# Check to make sure the static flag actually works. |
9176 |
+# |
9177 |
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" |
9178 |
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], |
9179 |
+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), |
9180 |
+ $lt_tmp_static_flag, |
9181 |
+ [], |
9182 |
+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) |
9183 |
]) |
9184 |
|
9185 |
|
9186 |
@@ -6187,7 +6567,10 @@ |
9187 |
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
9188 |
;; |
9189 |
cygwin* | mingw*) |
9190 |
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' |
9191 |
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' |
9192 |
+ ;; |
9193 |
+ kfreebsd*-gnu) |
9194 |
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no |
9195 |
;; |
9196 |
linux*) |
9197 |
_LT_AC_TAGVAR(link_all_deplibs, $1)=no |
9198 |
@@ -6233,7 +6616,8 @@ |
9199 |
# rely on this symbol name, it's probably fine to never include it in |
9200 |
# preloaded symbol tables. |
9201 |
extract_expsyms_cmds= |
9202 |
- |
9203 |
+ # Just being paranoid about ensuring that cc_basename is set. |
9204 |
+ _LT_CC_BASENAME([$compiler]) |
9205 |
case $host_os in |
9206 |
cygwin* | mingw* | pw32*) |
9207 |
# FIXME: the MSVC++ port hasn't been tested in a loooong time |
9208 |
@@ -6243,6 +6627,10 @@ |
9209 |
with_gnu_ld=no |
9210 |
fi |
9211 |
;; |
9212 |
+ interix*) |
9213 |
+ # we just hope/assume this is gcc and not c89 (= MSVC++) |
9214 |
+ with_gnu_ld=yes |
9215 |
+ ;; |
9216 |
openbsd*) |
9217 |
with_gnu_ld=no |
9218 |
;; |
9219 |
@@ -6253,6 +6641,27 @@ |
9220 |
# If archive_cmds runs LD, not CC, wlarc should be empty |
9221 |
wlarc='${wl}' |
9222 |
|
9223 |
+ # Set some defaults for GNU ld with shared library support. These |
9224 |
+ # are reset later if shared libraries are not supported. Putting them |
9225 |
+ # here allows them to be overridden if necessary. |
9226 |
+ runpath_var=LD_RUN_PATH |
9227 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' |
9228 |
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
9229 |
+ # ancient GNU ld didn't support --whole-archive et. al. |
9230 |
+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then |
9231 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
9232 |
+ else |
9233 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= |
9234 |
+ fi |
9235 |
+ supports_anon_versioning=no |
9236 |
+ case `$LD -v 2>/dev/null` in |
9237 |
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 |
9238 |
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
9239 |
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
9240 |
+ *\ 2.11.*) ;; # other 2.11 versions |
9241 |
+ *) supports_anon_versioning=yes ;; |
9242 |
+ esac |
9243 |
+ |
9244 |
# See if GNU ld supports shared libraries. |
9245 |
case $host_os in |
9246 |
aix3* | aix4* | aix5*) |
9247 |
@@ -6303,10 +6712,10 @@ |
9248 |
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported |
9249 |
_LT_AC_TAGVAR(always_export_symbols, $1)=no |
9250 |
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
9251 |
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' |
9252 |
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' |
9253 |
|
9254 |
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then |
9255 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
9256 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
9257 |
# If the export-symbols file already is a .def file (1st line |
9258 |
# is EXPORTS), use it as is; otherwise, prepend... |
9259 |
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
9260 |
@@ -6315,9 +6724,56 @@ |
9261 |
echo EXPORTS > $output_objdir/$soname.def; |
9262 |
cat $export_symbols >> $output_objdir/$soname.def; |
9263 |
fi~ |
9264 |
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
9265 |
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
9266 |
else |
9267 |
- ld_shlibs=no |
9268 |
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no |
9269 |
+ fi |
9270 |
+ ;; |
9271 |
+ |
9272 |
+ interix3*) |
9273 |
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no |
9274 |
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
9275 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
9276 |
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
9277 |
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. |
9278 |
+ # Instead, shared libraries are loaded at an image base (0x10000000 by |
9279 |
+ # default) and relocated if they conflict, which is a slow very memory |
9280 |
+ # consuming and fragmenting process. To avoid this, we pick a random, |
9281 |
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link |
9282 |
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. |
9283 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
9284 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
9285 |
+ ;; |
9286 |
+ |
9287 |
+ linux*) |
9288 |
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
9289 |
+ tmp_addflag= |
9290 |
+ case $cc_basename,$host_cpu in |
9291 |
+ pgcc*) # Portland Group C compiler |
9292 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
9293 |
+ tmp_addflag=' $pic_flag' |
9294 |
+ ;; |
9295 |
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
9296 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
9297 |
+ tmp_addflag=' $pic_flag -Mnomain' ;; |
9298 |
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
9299 |
+ tmp_addflag=' -i_dynamic' ;; |
9300 |
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 |
9301 |
+ tmp_addflag=' -i_dynamic -nofor_main' ;; |
9302 |
+ ifc* | ifort*) # Intel Fortran compiler |
9303 |
+ tmp_addflag=' -nofor_main' ;; |
9304 |
+ esac |
9305 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
9306 |
+ |
9307 |
+ if test $supports_anon_versioning = yes; then |
9308 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ |
9309 |
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
9310 |
+ $echo "local: *; };" >> $output_objdir/$libname.ver~ |
9311 |
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
9312 |
+ fi |
9313 |
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no |
9314 |
+ else |
9315 |
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no |
9316 |
fi |
9317 |
;; |
9318 |
|
9319 |
@@ -6331,7 +6787,7 @@ |
9320 |
fi |
9321 |
;; |
9322 |
|
9323 |
- solaris* | sysv5*) |
9324 |
+ solaris*) |
9325 |
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then |
9326 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
9327 |
cat <<EOF 1>&2 |
9328 |
@@ -6352,6 +6808,33 @@ |
9329 |
fi |
9330 |
;; |
9331 |
|
9332 |
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) |
9333 |
+ case `$LD -v 2>&1` in |
9334 |
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) |
9335 |
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no |
9336 |
+ cat <<_LT_EOF 1>&2 |
9337 |
+ |
9338 |
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not |
9339 |
+*** reliably create shared libraries on SCO systems. Therefore, libtool |
9340 |
+*** is disabling shared libraries support. We urge you to upgrade GNU |
9341 |
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify |
9342 |
+*** your PATH or compiler configuration so that the native linker is |
9343 |
+*** used, and then restart. |
9344 |
+ |
9345 |
+_LT_EOF |
9346 |
+ ;; |
9347 |
+ *) |
9348 |
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
9349 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' |
9350 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' |
9351 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' |
9352 |
+ else |
9353 |
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no |
9354 |
+ fi |
9355 |
+ ;; |
9356 |
+ esac |
9357 |
+ ;; |
9358 |
+ |
9359 |
sunos4*) |
9360 |
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
9361 |
wlarc= |
9362 |
@@ -6359,32 +6842,6 @@ |
9363 |
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
9364 |
;; |
9365 |
|
9366 |
- linux*) |
9367 |
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
9368 |
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
9369 |
- _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds" |
9370 |
- supports_anon_versioning=no |
9371 |
- case `$LD -v 2>/dev/null` in |
9372 |
- *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 |
9373 |
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
9374 |
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
9375 |
- *\ 2.11.*) ;; # other 2.11 versions |
9376 |
- *) supports_anon_versioning=yes ;; |
9377 |
- esac |
9378 |
- if test $supports_anon_versioning = yes; then |
9379 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ |
9380 |
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
9381 |
-$echo "local: *; };" >> $output_objdir/$libname.ver~ |
9382 |
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
9383 |
- else |
9384 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds" |
9385 |
- fi |
9386 |
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no |
9387 |
- else |
9388 |
- _LT_AC_TAGVAR(ld_shlibs, $1)=no |
9389 |
- fi |
9390 |
- ;; |
9391 |
- |
9392 |
*) |
9393 |
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
9394 |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
9395 |
@@ -6395,16 +6852,11 @@ |
9396 |
;; |
9397 |
esac |
9398 |
|
9399 |
- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then |
9400 |
- runpath_var=LD_RUN_PATH |
9401 |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' |
9402 |
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
9403 |
- # ancient GNU ld didn't support --whole-archive et. al. |
9404 |
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then |
9405 |
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
9406 |
- else |
9407 |
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= |
9408 |
- fi |
9409 |
+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then |
9410 |
+ runpath_var= |
9411 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= |
9412 |
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= |
9413 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= |
9414 |
fi |
9415 |
else |
9416 |
# PORTME fill in a description of your system's linker (not GNU ld) |
9417 |
@@ -6416,7 +6868,7 @@ |
9418 |
# Note: this linker hardcodes the directories in LIBPATH if there |
9419 |
# are no directories specified by -L. |
9420 |
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes |
9421 |
- if test "$GCC" = yes && test -z "$link_static_flag"; then |
9422 |
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then |
9423 |
# Neither direct hardcoding nor static linking is supported with a |
9424 |
# broken collect2. |
9425 |
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported |
9426 |
@@ -6450,6 +6902,7 @@ |
9427 |
break |
9428 |
fi |
9429 |
done |
9430 |
+ ;; |
9431 |
esac |
9432 |
|
9433 |
exp_sym_flag='-bexport' |
9434 |
@@ -6468,7 +6921,7 @@ |
9435 |
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
9436 |
|
9437 |
if test "$GCC" = yes; then |
9438 |
- case $host_os in aix4.[012]|aix4.[012].*) |
9439 |
+ case $host_os in aix4.[[012]]|aix4.[[012]].*) |
9440 |
# We only want to do this on AIX 4.2 and lower, the check |
9441 |
# below for broken collect2 doesn't work under 4.3+ |
9442 |
collect2name=`${CC} -print-prog-name=collect2` |
9443 |
@@ -6487,8 +6940,12 @@ |
9444 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
9445 |
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= |
9446 |
fi |
9447 |
+ ;; |
9448 |
esac |
9449 |
shared_flag='-shared' |
9450 |
+ if test "$aix_use_runtimelinking" = yes; then |
9451 |
+ shared_flag="$shared_flag "'${wl}-G' |
9452 |
+ fi |
9453 |
else |
9454 |
# not using gcc |
9455 |
if test "$host_cpu" = ia64; then |
9456 |
@@ -6496,11 +6953,11 @@ |
9457 |
# chokes on -Wl,-G. The following line is correct: |
9458 |
shared_flag='-G' |
9459 |
else |
9460 |
- if test "$aix_use_runtimelinking" = yes; then |
9461 |
+ if test "$aix_use_runtimelinking" = yes; then |
9462 |
shared_flag='${wl}-G' |
9463 |
else |
9464 |
shared_flag='${wl}-bM:SRE' |
9465 |
- fi |
9466 |
+ fi |
9467 |
fi |
9468 |
fi |
9469 |
|
9470 |
@@ -6514,12 +6971,12 @@ |
9471 |
# Determine the default libpath from the value encoded in an empty executable. |
9472 |
_LT_AC_SYS_LIBPATH_AIX |
9473 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
9474 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
9475 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
9476 |
else |
9477 |
if test "$host_cpu" = ia64; then |
9478 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
9479 |
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" |
9480 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" |
9481 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" |
9482 |
else |
9483 |
# Determine the default libpath from the value encoded in an empty executable. |
9484 |
_LT_AC_SYS_LIBPATH_AIX |
9485 |
@@ -6528,13 +6985,11 @@ |
9486 |
# -berok will link without error, but may produce a broken library. |
9487 |
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
9488 |
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
9489 |
- # -bexpall does not export symbols beginning with underscore (_) |
9490 |
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes |
9491 |
# Exported symbols can be pulled into shared objects from archives |
9492 |
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' |
9493 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
9494 |
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes |
9495 |
- # This is similar to how AIX traditionally builds it's shared libraries. |
9496 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
9497 |
+ # This is similar to how AIX traditionally builds its shared libraries. |
9498 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
9499 |
fi |
9500 |
fi |
9501 |
;; |
9502 |
@@ -6547,7 +7002,7 @@ |
9503 |
_LT_AC_TAGVAR(ld_shlibs, $1)=no |
9504 |
;; |
9505 |
|
9506 |
- bsdi4*) |
9507 |
+ bsdi[[45]]*) |
9508 |
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic |
9509 |
;; |
9510 |
|
9511 |
@@ -6568,57 +7023,57 @@ |
9512 |
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' |
9513 |
# FIXME: Should let the user specify the lib program. |
9514 |
_LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' |
9515 |
- fix_srcfile_path='`cygpath -w "$srcfile"`' |
9516 |
+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' |
9517 |
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
9518 |
;; |
9519 |
|
9520 |
darwin* | rhapsody*) |
9521 |
- if test "$GXX" = yes ; then |
9522 |
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
9523 |
- case "$host_os" in |
9524 |
- rhapsody* | darwin1.[[012]]) |
9525 |
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' |
9526 |
- ;; |
9527 |
- *) # Darwin 1.3 on |
9528 |
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
9529 |
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' |
9530 |
- else |
9531 |
- case ${MACOSX_DEPLOYMENT_TARGET} in |
9532 |
- 10.[[012]]) |
9533 |
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' |
9534 |
- ;; |
9535 |
- 10.*) |
9536 |
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' |
9537 |
- ;; |
9538 |
- esac |
9539 |
- fi |
9540 |
- ;; |
9541 |
+ case $host_os in |
9542 |
+ rhapsody* | darwin1.[[012]]) |
9543 |
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' |
9544 |
+ ;; |
9545 |
+ *) # Darwin 1.3 on |
9546 |
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
9547 |
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
9548 |
+ else |
9549 |
+ case ${MACOSX_DEPLOYMENT_TARGET} in |
9550 |
+ 10.[[012]]) |
9551 |
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
9552 |
+ ;; |
9553 |
+ 10.*) |
9554 |
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' |
9555 |
+ ;; |
9556 |
+ esac |
9557 |
+ fi |
9558 |
+ ;; |
9559 |
esac |
9560 |
- lt_int_apple_cc_single_mod=no |
9561 |
- output_verbose_link_cmd='echo' |
9562 |
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then |
9563 |
- lt_int_apple_cc_single_mod=yes |
9564 |
- fi |
9565 |
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
9566 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
9567 |
- else |
9568 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
9569 |
- fi |
9570 |
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
9571 |
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
9572 |
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
9573 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
9574 |
- else |
9575 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
9576 |
- fi |
9577 |
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
9578 |
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
9579 |
_LT_AC_TAGVAR(hardcode_direct, $1)=no |
9580 |
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes |
9581 |
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
9582 |
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' |
9583 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' |
9584 |
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
9585 |
+ if test "$GCC" = yes ; then |
9586 |
+ output_verbose_link_cmd='echo' |
9587 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
9588 |
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
9589 |
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
9590 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
9591 |
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
9592 |
else |
9593 |
- _LT_AC_TAGVAR(ld_shlibs, $1)=no |
9594 |
+ case $cc_basename in |
9595 |
+ xlc*) |
9596 |
+ output_verbose_link_cmd='echo' |
9597 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' |
9598 |
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
9599 |
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
9600 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
9601 |
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
9602 |
+ ;; |
9603 |
+ *) |
9604 |
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no |
9605 |
+ ;; |
9606 |
+ esac |
9607 |
fi |
9608 |
;; |
9609 |
|
9610 |
@@ -6652,11 +7107,20 @@ |
9611 |
;; |
9612 |
|
9613 |
# FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
9614 |
- freebsd* | kfreebsd*-gnu) |
9615 |
+ freebsd* | dragonfly*) |
9616 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
9617 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
9618 |
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
9619 |
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
9620 |
+ ;; |
9621 |
+ |
9622 |
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries. |
9623 |
+ kfreebsd*-gnu) |
9624 |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
9625 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
9626 |
_LT_AC_TAGVAR(hardcode_direct, $1)=yes |
9627 |
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
9628 |
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no |
9629 |
;; |
9630 |
|
9631 |
hpux9*) |
9632 |
@@ -6675,47 +7139,62 @@ |
9633 |
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
9634 |
;; |
9635 |
|
9636 |
- hpux10* | hpux11*) |
9637 |
+ hpux10*) |
9638 |
if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
9639 |
- case "$host_cpu" in |
9640 |
- hppa*64*|ia64*) |
9641 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
9642 |
+ else |
9643 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
9644 |
+ fi |
9645 |
+ if test "$with_gnu_ld" = no; then |
9646 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
9647 |
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
9648 |
+ |
9649 |
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
9650 |
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
9651 |
+ |
9652 |
+ # hardcode_minus_L: Not really in the search PATH, |
9653 |
+ # but as the default location of the library. |
9654 |
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes |
9655 |
+ fi |
9656 |
+ ;; |
9657 |
+ |
9658 |
+ hpux11*) |
9659 |
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
9660 |
+ case $host_cpu in |
9661 |
+ hppa*64*) |
9662 |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
9663 |
;; |
9664 |
+ ia64*) |
9665 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
9666 |
+ ;; |
9667 |
*) |
9668 |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
9669 |
;; |
9670 |
esac |
9671 |
else |
9672 |
- case "$host_cpu" in |
9673 |
- hppa*64*|ia64*) |
9674 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' |
9675 |
+ case $host_cpu in |
9676 |
+ hppa*64*) |
9677 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
9678 |
+ ;; |
9679 |
+ ia64*) |
9680 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
9681 |
;; |
9682 |
*) |
9683 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
9684 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
9685 |
;; |
9686 |
esac |
9687 |
fi |
9688 |
if test "$with_gnu_ld" = no; then |
9689 |
- case "$host_cpu" in |
9690 |
- hppa*64*) |
9691 |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
9692 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
9693 |
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
9694 |
+ |
9695 |
+ case $host_cpu in |
9696 |
+ hppa*64*|ia64*) |
9697 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' |
9698 |
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
9699 |
_LT_AC_TAGVAR(hardcode_direct, $1)=no |
9700 |
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
9701 |
;; |
9702 |
- ia64*) |
9703 |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
9704 |
- _LT_AC_TAGVAR(hardcode_direct, $1)=no |
9705 |
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
9706 |
- |
9707 |
- # hardcode_minus_L: Not really in the search PATH, |
9708 |
- # but as the default location of the library. |
9709 |
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes |
9710 |
- ;; |
9711 |
*) |
9712 |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
9713 |
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
9714 |
_LT_AC_TAGVAR(hardcode_direct, $1)=yes |
9715 |
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
9716 |
|
9717 |
@@ -6763,6 +7242,7 @@ |
9718 |
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
9719 |
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
9720 |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
9721 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' |
9722 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
9723 |
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
9724 |
else |
9725 |
@@ -6808,7 +7288,7 @@ |
9726 |
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
9727 |
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
9728 |
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ |
9729 |
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' |
9730 |
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' |
9731 |
|
9732 |
# Both c and cxx compiler support -rpath directly |
9733 |
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
9734 |
@@ -6816,21 +7296,15 @@ |
9735 |
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
9736 |
;; |
9737 |
|
9738 |
- sco3.2v5*) |
9739 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' |
9740 |
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
9741 |
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' |
9742 |
- runpath_var=LD_RUN_PATH |
9743 |
- hardcode_runpath_var=yes |
9744 |
- ;; |
9745 |
- |
9746 |
solaris*) |
9747 |
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' |
9748 |
if test "$GCC" = yes; then |
9749 |
+ wlarc='${wl}' |
9750 |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
9751 |
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
9752 |
$CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' |
9753 |
else |
9754 |
+ wlarc='' |
9755 |
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
9756 |
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
9757 |
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' |
9758 |
@@ -6839,8 +7313,18 @@ |
9759 |
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
9760 |
case $host_os in |
9761 |
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; |
9762 |
- *) # Supported since Solaris 2.6 (maybe 2.5.1?) |
9763 |
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; |
9764 |
+ *) |
9765 |
+ # The compiler driver will combine linker options so we |
9766 |
+ # cannot just pass the convience library names through |
9767 |
+ # without $wl, iff we do not link with $LD. |
9768 |
+ # Luckily, gcc supports the same syntax we need for Sun Studio. |
9769 |
+ # Supported since Solaris 2.6 (maybe 2.5.1?) |
9770 |
+ case $wlarc in |
9771 |
+ '') |
9772 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; |
9773 |
+ *) |
9774 |
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; |
9775 |
+ esac ;; |
9776 |
esac |
9777 |
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
9778 |
;; |
9779 |
@@ -6897,36 +7381,45 @@ |
9780 |
fi |
9781 |
;; |
9782 |
|
9783 |
- sysv4.2uw2*) |
9784 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' |
9785 |
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
9786 |
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no |
9787 |
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) |
9788 |
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' |
9789 |
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
9790 |
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
9791 |
- hardcode_runpath_var=yes |
9792 |
- runpath_var=LD_RUN_PATH |
9793 |
- ;; |
9794 |
+ runpath_var='LD_RUN_PATH' |
9795 |
|
9796 |
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) |
9797 |
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' |
9798 |
if test "$GCC" = yes; then |
9799 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
9800 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
9801 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
9802 |
else |
9803 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
9804 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
9805 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
9806 |
fi |
9807 |
- runpath_var='LD_RUN_PATH' |
9808 |
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
9809 |
;; |
9810 |
|
9811 |
- sysv5*) |
9812 |
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' |
9813 |
- # $CC -shared without GNU ld will not create a library from C++ |
9814 |
- # object files and a static libstdc++, better avoid it by now |
9815 |
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
9816 |
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
9817 |
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' |
9818 |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= |
9819 |
+ sysv5* | sco3.2v5* | sco5v6*) |
9820 |
+ # Note: We can NOT use -z defs as we might desire, because we do not |
9821 |
+ # link with -lc, and that would cause any symbols used from libc to |
9822 |
+ # always be unresolved, which means just about no library would |
9823 |
+ # ever link correctly. If we're not using GNU ld we use -z text |
9824 |
+ # though, which does catch some bad symbols but isn't as heavy-handed |
9825 |
+ # as -z defs. |
9826 |
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' |
9827 |
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' |
9828 |
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
9829 |
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
9830 |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' |
9831 |
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' |
9832 |
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
9833 |
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' |
9834 |
runpath_var='LD_RUN_PATH' |
9835 |
+ |
9836 |
+ if test "$GCC" = yes; then |
9837 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
9838 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
9839 |
+ else |
9840 |
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
9841 |
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
9842 |
+ fi |
9843 |
;; |
9844 |
|
9845 |
uts4*) |
9846 |
@@ -6944,11 +7437,6 @@ |
9847 |
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) |
9848 |
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no |
9849 |
|
9850 |
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
9851 |
-if test "$GCC" = yes; then |
9852 |
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
9853 |
-fi |
9854 |
- |
9855 |
# |
9856 |
# Do we need to explicitly link libc? |
9857 |
# |
9858 |
@@ -6976,6 +7464,7 @@ |
9859 |
libobjs=conftest.$ac_objext |
9860 |
deplibs= |
9861 |
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) |
9862 |
+ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) |
9863 |
compiler_flags=-v |
9864 |
linker_flags=-v |
9865 |
verstring= |
9866 |
@@ -7101,7 +7590,7 @@ |
9867 |
# Add /usr/xpg4/bin/sed as it is typically found on Solaris |
9868 |
# along with /bin/sed that truncates output. |
9869 |
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do |
9870 |
- test ! -f $lt_ac_sed && break |
9871 |
+ test ! -f $lt_ac_sed && continue |
9872 |
cat /dev/null > conftest.in |
9873 |
lt_ac_count=0 |
9874 |
echo $ECHO_N "0123456789$ECHO_C" >conftest.in |
9875 |
@@ -7126,8 +7615,8 @@ |
9876 |
fi |
9877 |
done |
9878 |
done |
9879 |
-SED=$lt_cv_path_SED |
9880 |
]) |
9881 |
+SED=$lt_cv_path_SED |
9882 |
AC_MSG_RESULT([$SED]) |
9883 |
]) |
9884 |
|
9885 |
diff -uhrN WindowMaker-0.92.0/ChangeLog WindowMaker-CVS-20060123/ChangeLog |
9886 |
--- WindowMaker-0.92.0/ChangeLog 2005-07-03 19:36:39.000000000 +0200 |
9887 |
+++ WindowMaker-CVS-20060123/ChangeLog 2006-01-23 07:47:10.000000000 +0100 |
9888 |
@@ -1,3 +1,37 @@ |
9889 |
+Changes since version 0.92.0: |
9890 |
+............................. |
9891 |
+ |
9892 |
+- added check for --with-gnustepdir option to configure to verify that its |
9893 |
+ argument is an absolute path |
9894 |
+- updated german translations (Torsten Marek <shlomme@×××.net>) |
9895 |
+- fixed WPrefs.app to find its icons when not installed under GNUstep paths |
9896 |
+- fixed gcc-4 compilation issues (Vladimir Nadvornik <nadvornik@××××.cz>) |
9897 |
+- fixed amd64 compilation issues (Vladimir Nadvornik <nadvornik@××××.cz>) |
9898 |
+- eliminated gcc-4 compilation warnings |
9899 |
+- small fix for compilation in a different directory than the source |
9900 |
+ (Balaton Zoltan <balaton@×××××××.hu>) |
9901 |
+- fixed some warnings on 64bit platforms (Balaton Zoltan <balaton@×××××××.hu>) |
9902 |
+- fixed issue with invisible modal windows from Qt and Gtk applications |
9903 |
+ on 64bit platforms (Max Loparyev <max@××××××××××××.ru>) |
9904 |
+- fixed issue with icon colors on big endian platforms |
9905 |
+ (Max Loparyev <max@××××××××××××.ru>) |
9906 |
+- release colors to avoid issues with the reference count overflowing a |
9907 |
+ small integer and causing unexpected color releases that can crash |
9908 |
+ Window Maker (Martin Frydl <martin.frydl@××××××××.com>) |
9909 |
+- fixed a small memory leak in WINGs/wview.c caused by not releasing the |
9910 |
+ background color of a view (Martin Frydl <martin.frydl@××××××××.com>) |
9911 |
+- updated estonian translation (Ivar Smolin <okul@×××××.ee>) |
9912 |
+- updated the XDND code in WINGs to work with GDK based applications. |
9913 |
+ WINGs based applications should now work with both KDE and GNOME |
9914 |
+ applications (Sylvain Reynal <sreynal@×××××.net>) |
9915 |
+- better check for the XDND protocol version when interoperating with other |
9916 |
+ applications. As it seems xdnd version 3 (which WINGs supports) and newer |
9917 |
+ are not backward compatible with xdnd version 1 and 2. This is why WINGs |
9918 |
+ applications cannot interoperate with GNUstep applications (which uses |
9919 |
+ xdnd version 2). Xdnd version 4 and 5 are backwards compatible with |
9920 |
+ version 3 though. (Sylvain Reynal <sreynal@×××××.net>) |
9921 |
+ |
9922 |
+ |
9923 |
Changes since version 0.91.0: |
9924 |
............................. |
9925 |
|
9926 |
diff -uhrN WindowMaker-0.92.0/config.guess WindowMaker-CVS-20060123/config.guess |
9927 |
--- WindowMaker-0.92.0/config.guess 2005-06-19 05:22:56.000000000 +0200 |
9928 |
+++ WindowMaker-CVS-20060123/config.guess 2005-08-14 05:51:20.000000000 +0200 |
9929 |
@@ -3,7 +3,7 @@ |
9930 |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
9931 |
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
9932 |
|
9933 |
-timestamp='2005-04-22' |
9934 |
+timestamp='2005-08-03' |
9935 |
|
9936 |
# This file is free software; you can redistribute it and/or modify it |
9937 |
# under the terms of the GNU General Public License as published by |
9938 |
@@ -17,13 +17,15 @@ |
9939 |
# |
9940 |
# You should have received a copy of the GNU General Public License |
9941 |
# along with this program; if not, write to the Free Software |
9942 |
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
9943 |
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
9944 |
+# 02110-1301, USA. |
9945 |
# |
9946 |
# As a special exception to the GNU General Public License, if you |
9947 |
# distribute this file as part of a program that contains a |
9948 |
# configuration script generated by Autoconf, you may include it under |
9949 |
# the same distribution terms that you use for the rest of that program. |
9950 |
|
9951 |
+ |
9952 |
# Originally written by Per Bothner <per@×××××××.com>. |
9953 |
# Please send patches to <config-patches@×××.org>. Submit a context |
9954 |
# diff and a properly formatted ChangeLog entry. |
9955 |
@@ -66,11 +68,11 @@ |
9956 |
while test $# -gt 0 ; do |
9957 |
case $1 in |
9958 |
--time-stamp | --time* | -t ) |
9959 |
- echo "$timestamp" ; exit 0 ;; |
9960 |
+ echo "$timestamp" ; exit ;; |
9961 |
--version | -v ) |
9962 |
- echo "$version" ; exit 0 ;; |
9963 |
+ echo "$version" ; exit ;; |
9964 |
--help | --h* | -h ) |
9965 |
- echo "$usage"; exit 0 ;; |
9966 |
+ echo "$usage"; exit ;; |
9967 |
-- ) # Stop option processing |
9968 |
shift; break ;; |
9969 |
- ) # Use stdin as input. |
9970 |
@@ -123,7 +125,7 @@ |
9971 |
;; |
9972 |
,,*) CC_FOR_BUILD=$CC ;; |
9973 |
,*,*) CC_FOR_BUILD=$HOST_CC ;; |
9974 |
-esac ;' |
9975 |
+esac ; set_cc_for_build= ;' |
9976 |
|
9977 |
# This is needed to find uname on a Pyramid OSx when run in the BSD universe. |
9978 |
# (ghazi@×××××××××××.edu 1994-08-24) |
9979 |
@@ -196,55 +198,20 @@ |
9980 |
# contains redundant information, the shorter form: |
9981 |
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
9982 |
echo "${machine}-${os}${release}" |
9983 |
- exit 0 ;; |
9984 |
- amd64:OpenBSD:*:*) |
9985 |
- echo x86_64-unknown-openbsd${UNAME_RELEASE} |
9986 |
- exit 0 ;; |
9987 |
- amiga:OpenBSD:*:*) |
9988 |
- echo m68k-unknown-openbsd${UNAME_RELEASE} |
9989 |
- exit 0 ;; |
9990 |
- cats:OpenBSD:*:*) |
9991 |
- echo arm-unknown-openbsd${UNAME_RELEASE} |
9992 |
- exit 0 ;; |
9993 |
- hp300:OpenBSD:*:*) |
9994 |
- echo m68k-unknown-openbsd${UNAME_RELEASE} |
9995 |
- exit 0 ;; |
9996 |
- luna88k:OpenBSD:*:*) |
9997 |
- echo m88k-unknown-openbsd${UNAME_RELEASE} |
9998 |
- exit 0 ;; |
9999 |
- mac68k:OpenBSD:*:*) |
10000 |
- echo m68k-unknown-openbsd${UNAME_RELEASE} |
10001 |
- exit 0 ;; |
10002 |
- macppc:OpenBSD:*:*) |
10003 |
- echo powerpc-unknown-openbsd${UNAME_RELEASE} |
10004 |
- exit 0 ;; |
10005 |
- mvme68k:OpenBSD:*:*) |
10006 |
- echo m68k-unknown-openbsd${UNAME_RELEASE} |
10007 |
- exit 0 ;; |
10008 |
- mvme88k:OpenBSD:*:*) |
10009 |
- echo m88k-unknown-openbsd${UNAME_RELEASE} |
10010 |
- exit 0 ;; |
10011 |
- mvmeppc:OpenBSD:*:*) |
10012 |
- echo powerpc-unknown-openbsd${UNAME_RELEASE} |
10013 |
- exit 0 ;; |
10014 |
- sgi:OpenBSD:*:*) |
10015 |
- echo mips64-unknown-openbsd${UNAME_RELEASE} |
10016 |
- exit 0 ;; |
10017 |
- sun3:OpenBSD:*:*) |
10018 |
- echo m68k-unknown-openbsd${UNAME_RELEASE} |
10019 |
- exit 0 ;; |
10020 |
+ exit ;; |
10021 |
*:OpenBSD:*:*) |
10022 |
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} |
10023 |
- exit 0 ;; |
10024 |
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
10025 |
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} |
10026 |
+ exit ;; |
10027 |
*:ekkoBSD:*:*) |
10028 |
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} |
10029 |
- exit 0 ;; |
10030 |
+ exit ;; |
10031 |
macppc:MirBSD:*:*) |
10032 |
echo powerppc-unknown-mirbsd${UNAME_RELEASE} |
10033 |
- exit 0 ;; |
10034 |
+ exit ;; |
10035 |
*:MirBSD:*:*) |
10036 |
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} |
10037 |
- exit 0 ;; |
10038 |
+ exit ;; |
10039 |
alpha:OSF1:*:*) |
10040 |
case $UNAME_RELEASE in |
10041 |
*4.0) |
10042 |
@@ -297,40 +264,43 @@ |
10043 |
# A Xn.n version is an unreleased experimental baselevel. |
10044 |
# 1.2 uses "1.2" for uname -r. |
10045 |
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
10046 |
- exit 0 ;; |
10047 |
+ exit ;; |
10048 |
Alpha\ *:Windows_NT*:*) |
10049 |
# How do we know it's Interix rather than the generic POSIX subsystem? |
10050 |
# Should we change UNAME_MACHINE based on the output of uname instead |
10051 |
# of the specific Alpha model? |
10052 |
echo alpha-pc-interix |
10053 |
- exit 0 ;; |
10054 |
+ exit ;; |
10055 |
21064:Windows_NT:50:3) |
10056 |
echo alpha-dec-winnt3.5 |
10057 |
- exit 0 ;; |
10058 |
+ exit ;; |
10059 |
Amiga*:UNIX_System_V:4.0:*) |
10060 |
echo m68k-unknown-sysv4 |
10061 |
- exit 0;; |
10062 |
+ exit ;; |
10063 |
*:[Aa]miga[Oo][Ss]:*:*) |
10064 |
echo ${UNAME_MACHINE}-unknown-amigaos |
10065 |
- exit 0 ;; |
10066 |
+ exit ;; |
10067 |
*:[Mm]orph[Oo][Ss]:*:*) |
10068 |
echo ${UNAME_MACHINE}-unknown-morphos |
10069 |
- exit 0 ;; |
10070 |
+ exit ;; |
10071 |
*:OS/390:*:*) |
10072 |
echo i370-ibm-openedition |
10073 |
- exit 0 ;; |
10074 |
+ exit ;; |
10075 |
*:z/VM:*:*) |
10076 |
echo s390-ibm-zvmoe |
10077 |
- exit 0 ;; |
10078 |
+ exit ;; |
10079 |
*:OS400:*:*) |
10080 |
echo powerpc-ibm-os400 |
10081 |
- exit 0 ;; |
10082 |
+ exit ;; |
10083 |
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
10084 |
echo arm-acorn-riscix${UNAME_RELEASE} |
10085 |
- exit 0;; |
10086 |
+ exit ;; |
10087 |
+ arm:riscos:*:*|arm:RISCOS:*:*) |
10088 |
+ echo arm-unknown-riscos |
10089 |
+ exit ;; |
10090 |
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) |
10091 |
echo hppa1.1-hitachi-hiuxmpp |
10092 |
- exit 0;; |
10093 |
+ exit ;; |
10094 |
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) |
10095 |
# akee@××××××××××××××××.mil (Earle F. Ake) contributed MIS and NILE. |
10096 |
if test "`(/bin/universe) 2>/dev/null`" = att ; then |
10097 |
@@ -338,32 +308,32 @@ |
10098 |
else |
10099 |
echo pyramid-pyramid-bsd |
10100 |
fi |
10101 |
- exit 0 ;; |
10102 |
+ exit ;; |
10103 |
NILE*:*:*:dcosx) |
10104 |
echo pyramid-pyramid-svr4 |
10105 |
- exit 0 ;; |
10106 |
+ exit ;; |
10107 |
DRS?6000:unix:4.0:6*) |
10108 |
echo sparc-icl-nx6 |
10109 |
- exit 0 ;; |
10110 |
+ exit ;; |
10111 |
DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) |
10112 |
case `/usr/bin/uname -p` in |
10113 |
- sparc) echo sparc-icl-nx7 && exit 0 ;; |
10114 |
+ sparc) echo sparc-icl-nx7; exit ;; |
10115 |
esac ;; |
10116 |
sun4H:SunOS:5.*:*) |
10117 |
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
10118 |
- exit 0 ;; |
10119 |
+ exit ;; |
10120 |
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
10121 |
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
10122 |
- exit 0 ;; |
10123 |
+ exit ;; |
10124 |
i86pc:SunOS:5.*:*) |
10125 |
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
10126 |
- exit 0 ;; |
10127 |
+ exit ;; |
10128 |
sun4*:SunOS:6*:*) |
10129 |
# According to config.sub, this is the proper way to canonicalize |
10130 |
# SunOS6. Hard to guess exactly what SunOS6 will be like, but |
10131 |
# it's likely to be more like Solaris than SunOS4. |
10132 |
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
10133 |
- exit 0 ;; |
10134 |
+ exit ;; |
10135 |
sun4*:SunOS:*:*) |
10136 |
case "`/usr/bin/arch -k`" in |
10137 |
Series*|S4*) |
10138 |
@@ -372,10 +342,10 @@ |
10139 |
esac |
10140 |
# Japanese Language versions have a version number like `4.1.3-JL'. |
10141 |
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` |
10142 |
- exit 0 ;; |
10143 |
+ exit ;; |
10144 |
sun3*:SunOS:*:*) |
10145 |
echo m68k-sun-sunos${UNAME_RELEASE} |
10146 |
- exit 0 ;; |
10147 |
+ exit ;; |
10148 |
sun*:*:4.2BSD:*) |
10149 |
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` |
10150 |
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 |
10151 |
@@ -387,10 +357,10 @@ |
10152 |
echo sparc-sun-sunos${UNAME_RELEASE} |
10153 |
;; |
10154 |
esac |
10155 |
- exit 0 ;; |
10156 |
+ exit ;; |
10157 |
aushp:SunOS:*:*) |
10158 |
echo sparc-auspex-sunos${UNAME_RELEASE} |
10159 |
- exit 0 ;; |
10160 |
+ exit ;; |
10161 |
# The situation for MiNT is a little confusing. The machine name |
10162 |
# can be virtually everything (everything which is not |
10163 |
# "atarist" or "atariste" at least should have a processor |
10164 |
@@ -401,40 +371,40 @@ |
10165 |
# be no problem. |
10166 |
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
10167 |
echo m68k-atari-mint${UNAME_RELEASE} |
10168 |
- exit 0 ;; |
10169 |
+ exit ;; |
10170 |
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
10171 |
echo m68k-atari-mint${UNAME_RELEASE} |
10172 |
- exit 0 ;; |
10173 |
+ exit ;; |
10174 |
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
10175 |
echo m68k-atari-mint${UNAME_RELEASE} |
10176 |
- exit 0 ;; |
10177 |
+ exit ;; |
10178 |
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
10179 |
echo m68k-milan-mint${UNAME_RELEASE} |
10180 |
- exit 0 ;; |
10181 |
+ exit ;; |
10182 |
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
10183 |
echo m68k-hades-mint${UNAME_RELEASE} |
10184 |
- exit 0 ;; |
10185 |
+ exit ;; |
10186 |
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
10187 |
echo m68k-unknown-mint${UNAME_RELEASE} |
10188 |
- exit 0 ;; |
10189 |
+ exit ;; |
10190 |
m68k:machten:*:*) |
10191 |
echo m68k-apple-machten${UNAME_RELEASE} |
10192 |
- exit 0 ;; |
10193 |
+ exit ;; |
10194 |
powerpc:machten:*:*) |
10195 |
echo powerpc-apple-machten${UNAME_RELEASE} |
10196 |
- exit 0 ;; |
10197 |
+ exit ;; |
10198 |
RISC*:Mach:*:*) |
10199 |
echo mips-dec-mach_bsd4.3 |
10200 |
- exit 0 ;; |
10201 |
+ exit ;; |
10202 |
RISC*:ULTRIX:*:*) |
10203 |
echo mips-dec-ultrix${UNAME_RELEASE} |
10204 |
- exit 0 ;; |
10205 |
+ exit ;; |
10206 |
VAX*:ULTRIX*:*:*) |
10207 |
echo vax-dec-ultrix${UNAME_RELEASE} |
10208 |
- exit 0 ;; |
10209 |
+ exit ;; |
10210 |
2020:CLIX:*:* | 2430:CLIX:*:*) |
10211 |
echo clipper-intergraph-clix${UNAME_RELEASE} |
10212 |
- exit 0 ;; |
10213 |
+ exit ;; |
10214 |
mips:*:*:UMIPS | mips:*:*:RISCos) |
10215 |
eval $set_cc_for_build |
10216 |
sed 's/^ //' << EOF >$dummy.c |
10217 |
@@ -458,32 +428,33 @@ |
10218 |
exit (-1); |
10219 |
} |
10220 |
EOF |
10221 |
- $CC_FOR_BUILD -o $dummy $dummy.c \ |
10222 |
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ |
10223 |
- && exit 0 |
10224 |
+ $CC_FOR_BUILD -o $dummy $dummy.c && |
10225 |
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && |
10226 |
+ SYSTEM_NAME=`$dummy $dummyarg` && |
10227 |
+ { echo "$SYSTEM_NAME"; exit; } |
10228 |
echo mips-mips-riscos${UNAME_RELEASE} |
10229 |
- exit 0 ;; |
10230 |
+ exit ;; |
10231 |
Motorola:PowerMAX_OS:*:*) |
10232 |
echo powerpc-motorola-powermax |
10233 |
- exit 0 ;; |
10234 |
+ exit ;; |
10235 |
Motorola:*:4.3:PL8-*) |
10236 |
echo powerpc-harris-powermax |
10237 |
- exit 0 ;; |
10238 |
+ exit ;; |
10239 |
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) |
10240 |
echo powerpc-harris-powermax |
10241 |
- exit 0 ;; |
10242 |
+ exit ;; |
10243 |
Night_Hawk:Power_UNIX:*:*) |
10244 |
echo powerpc-harris-powerunix |
10245 |
- exit 0 ;; |
10246 |
+ exit ;; |
10247 |
m88k:CX/UX:7*:*) |
10248 |
echo m88k-harris-cxux7 |
10249 |
- exit 0 ;; |
10250 |
+ exit ;; |
10251 |
m88k:*:4*:R4*) |
10252 |
echo m88k-motorola-sysv4 |
10253 |
- exit 0 ;; |
10254 |
+ exit ;; |
10255 |
m88k:*:3*:R3*) |
10256 |
echo m88k-motorola-sysv3 |
10257 |
- exit 0 ;; |
10258 |
+ exit ;; |
10259 |
AViiON:dgux:*:*) |
10260 |
# DG/UX returns AViiON for all architectures |
10261 |
UNAME_PROCESSOR=`/usr/bin/uname -p` |
10262 |
@@ -499,29 +470,29 @@ |
10263 |
else |
10264 |
echo i586-dg-dgux${UNAME_RELEASE} |
10265 |
fi |
10266 |
- exit 0 ;; |
10267 |
+ exit ;; |
10268 |
M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
10269 |
echo m88k-dolphin-sysv3 |
10270 |
- exit 0 ;; |
10271 |
+ exit ;; |
10272 |
M88*:*:R3*:*) |
10273 |
# Delta 88k system running SVR3 |
10274 |
echo m88k-motorola-sysv3 |
10275 |
- exit 0 ;; |
10276 |
+ exit ;; |
10277 |
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) |
10278 |
echo m88k-tektronix-sysv3 |
10279 |
- exit 0 ;; |
10280 |
+ exit ;; |
10281 |
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) |
10282 |
echo m68k-tektronix-bsd |
10283 |
- exit 0 ;; |
10284 |
+ exit ;; |
10285 |
*:IRIX*:*:*) |
10286 |
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` |
10287 |
- exit 0 ;; |
10288 |
+ exit ;; |
10289 |
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. |
10290 |
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id |
10291 |
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' |
10292 |
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id |
10293 |
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' |
10294 |
i*86:AIX:*:*) |
10295 |
echo i386-ibm-aix |
10296 |
- exit 0 ;; |
10297 |
+ exit ;; |
10298 |
ia64:AIX:*:*) |
10299 |
if [ -x /usr/bin/oslevel ] ; then |
10300 |
IBM_REV=`/usr/bin/oslevel` |
10301 |
@@ -529,7 +500,7 @@ |
10302 |
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} |
10303 |
fi |
10304 |
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} |
10305 |
- exit 0 ;; |
10306 |
+ exit ;; |
10307 |
*:AIX:2:3) |
10308 |
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then |
10309 |
eval $set_cc_for_build |
10310 |
@@ -544,14 +515,18 @@ |
10311 |
exit(0); |
10312 |
} |
10313 |
EOF |
10314 |
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 |
10315 |
- echo rs6000-ibm-aix3.2.5 |
10316 |
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` |
10317 |
+ then |
10318 |
+ echo "$SYSTEM_NAME" |
10319 |
+ else |
10320 |
+ echo rs6000-ibm-aix3.2.5 |
10321 |
+ fi |
10322 |
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then |
10323 |
echo rs6000-ibm-aix3.2.4 |
10324 |
else |
10325 |
echo rs6000-ibm-aix3.2 |
10326 |
fi |
10327 |
- exit 0 ;; |
10328 |
+ exit ;; |
10329 |
*:AIX:*:[45]) |
10330 |
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
10331 |
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
10332 |
@@ -565,28 +540,28 @@ |
10333 |
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} |
10334 |
fi |
10335 |
echo ${IBM_ARCH}-ibm-aix${IBM_REV} |
10336 |
- exit 0 ;; |
10337 |
+ exit ;; |
10338 |
*:AIX:*:*) |
10339 |
echo rs6000-ibm-aix |
10340 |
- exit 0 ;; |
10341 |
+ exit ;; |
10342 |
ibmrt:4.4BSD:*|romp-ibm:BSD:*) |
10343 |
echo romp-ibm-bsd4.4 |
10344 |
- exit 0 ;; |
10345 |
+ exit ;; |
10346 |
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and |
10347 |
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to |
10348 |
- exit 0 ;; # report: romp-ibm BSD 4.3 |
10349 |
+ exit ;; # report: romp-ibm BSD 4.3 |
10350 |
*:BOSX:*:*) |
10351 |
echo rs6000-bull-bosx |
10352 |
- exit 0 ;; |
10353 |
+ exit ;; |
10354 |
DPX/2?00:B.O.S.:*:*) |
10355 |
echo m68k-bull-sysv3 |
10356 |
- exit 0 ;; |
10357 |
+ exit ;; |
10358 |
9000/[34]??:4.3bsd:1.*:*) |
10359 |
echo m68k-hp-bsd |
10360 |
- exit 0 ;; |
10361 |
+ exit ;; |
10362 |
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) |
10363 |
echo m68k-hp-bsd4.4 |
10364 |
- exit 0 ;; |
10365 |
+ exit ;; |
10366 |
9000/[34678]??:HP-UX:*:*) |
10367 |
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` |
10368 |
case "${UNAME_MACHINE}" in |
10369 |
@@ -648,9 +623,19 @@ |
10370 |
esac |
10371 |
if [ ${HP_ARCH} = "hppa2.0w" ] |
10372 |
then |
10373 |
- # avoid double evaluation of $set_cc_for_build |
10374 |
- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build |
10375 |
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null |
10376 |
+ eval $set_cc_for_build |
10377 |
+ |
10378 |
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating |
10379 |
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler |
10380 |
+ # generating 64-bit code. GNU and HP use different nomenclature: |
10381 |
+ # |
10382 |
+ # $ CC_FOR_BUILD=cc ./config.guess |
10383 |
+ # => hppa2.0w-hp-hpux11.23 |
10384 |
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess |
10385 |
+ # => hppa64-hp-hpux11.23 |
10386 |
+ |
10387 |
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | |
10388 |
+ grep __LP64__ >/dev/null |
10389 |
then |
10390 |
HP_ARCH="hppa2.0w" |
10391 |
else |
10392 |
@@ -658,11 +643,11 @@ |
10393 |
fi |
10394 |
fi |
10395 |
echo ${HP_ARCH}-hp-hpux${HPUX_REV} |
10396 |
- exit 0 ;; |
10397 |
+ exit ;; |
10398 |
ia64:HP-UX:*:*) |
10399 |
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` |
10400 |
echo ia64-hp-hpux${HPUX_REV} |
10401 |
- exit 0 ;; |
10402 |
+ exit ;; |
10403 |
3050*:HI-UX:*:*) |
10404 |
eval $set_cc_for_build |
10405 |
sed 's/^ //' << EOF >$dummy.c |
10406 |
@@ -690,161 +675,166 @@ |
10407 |
exit (0); |
10408 |
} |
10409 |
EOF |
10410 |
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 |
10411 |
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && |
10412 |
+ { echo "$SYSTEM_NAME"; exit; } |
10413 |
echo unknown-hitachi-hiuxwe2 |
10414 |
- exit 0 ;; |
10415 |
+ exit ;; |
10416 |
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) |
10417 |
echo hppa1.1-hp-bsd |
10418 |
- exit 0 ;; |
10419 |
+ exit ;; |
10420 |
9000/8??:4.3bsd:*:*) |
10421 |
echo hppa1.0-hp-bsd |
10422 |
- exit 0 ;; |
10423 |
+ exit ;; |
10424 |
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) |
10425 |
echo hppa1.0-hp-mpeix |
10426 |
- exit 0 ;; |
10427 |
+ exit ;; |
10428 |
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) |
10429 |
echo hppa1.1-hp-osf |
10430 |
- exit 0 ;; |
10431 |
+ exit ;; |
10432 |
hp8??:OSF1:*:*) |
10433 |
echo hppa1.0-hp-osf |
10434 |
- exit 0 ;; |
10435 |
+ exit ;; |
10436 |
i*86:OSF1:*:*) |
10437 |
if [ -x /usr/sbin/sysversion ] ; then |
10438 |
echo ${UNAME_MACHINE}-unknown-osf1mk |
10439 |
else |
10440 |
echo ${UNAME_MACHINE}-unknown-osf1 |
10441 |
fi |
10442 |
- exit 0 ;; |
10443 |
+ exit ;; |
10444 |
parisc*:Lites*:*:*) |
10445 |
echo hppa1.1-hp-lites |
10446 |
- exit 0 ;; |
10447 |
+ exit ;; |
10448 |
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
10449 |
echo c1-convex-bsd |
10450 |
- exit 0 ;; |
10451 |
+ exit ;; |
10452 |
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
10453 |
if getsysinfo -f scalar_acc |
10454 |
then echo c32-convex-bsd |
10455 |
else echo c2-convex-bsd |
10456 |
fi |
10457 |
- exit 0 ;; |
10458 |
+ exit ;; |
10459 |
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
10460 |
echo c34-convex-bsd |
10461 |
- exit 0 ;; |
10462 |
+ exit ;; |
10463 |
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
10464 |
echo c38-convex-bsd |
10465 |
- exit 0 ;; |
10466 |
+ exit ;; |
10467 |
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
10468 |
echo c4-convex-bsd |
10469 |
- exit 0 ;; |
10470 |
+ exit ;; |
10471 |
CRAY*Y-MP:*:*:*) |
10472 |
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
10473 |
- exit 0 ;; |
10474 |
+ exit ;; |
10475 |
CRAY*[A-Z]90:*:*:*) |
10476 |
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ |
10477 |
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ |
10478 |
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ |
10479 |
-e 's/\.[^.]*$/.X/' |
10480 |
- exit 0 ;; |
10481 |
+ exit ;; |
10482 |
CRAY*TS:*:*:*) |
10483 |
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
10484 |
- exit 0 ;; |
10485 |
+ exit ;; |
10486 |
CRAY*T3E:*:*:*) |
10487 |
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
10488 |
- exit 0 ;; |
10489 |
+ exit ;; |
10490 |
CRAY*SV1:*:*:*) |
10491 |
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
10492 |
- exit 0 ;; |
10493 |
+ exit ;; |
10494 |
*:UNICOS/mp:*:*) |
10495 |
echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
10496 |
- exit 0 ;; |
10497 |
+ exit ;; |
10498 |
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
10499 |
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
10500 |
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
10501 |
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
10502 |
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
10503 |
- exit 0 ;; |
10504 |
+ exit ;; |
10505 |
5000:UNIX_System_V:4.*:*) |
10506 |
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
10507 |
FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
10508 |
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
10509 |
- exit 0 ;; |
10510 |
+ exit ;; |
10511 |
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
10512 |
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
10513 |
- exit 0 ;; |
10514 |
+ exit ;; |
10515 |
sparc*:BSD/OS:*:*) |
10516 |
echo sparc-unknown-bsdi${UNAME_RELEASE} |
10517 |
- exit 0 ;; |
10518 |
+ exit ;; |
10519 |
*:BSD/OS:*:*) |
10520 |
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
10521 |
- exit 0 ;; |
10522 |
+ exit ;; |
10523 |
*:FreeBSD:*:*) |
10524 |
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
10525 |
- exit 0 ;; |
10526 |
+ exit ;; |
10527 |
i*:CYGWIN*:*) |
10528 |
echo ${UNAME_MACHINE}-pc-cygwin |
10529 |
- exit 0 ;; |
10530 |
+ exit ;; |
10531 |
i*:MINGW*:*) |
10532 |
echo ${UNAME_MACHINE}-pc-mingw32 |
10533 |
- exit 0 ;; |
10534 |
+ exit ;; |
10535 |
+ i*:windows32*:*) |
10536 |
+ # uname -m includes "-pc" on this system. |
10537 |
+ echo ${UNAME_MACHINE}-mingw32 |
10538 |
+ exit ;; |
10539 |
i*:PW*:*) |
10540 |
echo ${UNAME_MACHINE}-pc-pw32 |
10541 |
- exit 0 ;; |
10542 |
+ exit ;; |
10543 |
x86:Interix*:[34]*) |
10544 |
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' |
10545 |
- exit 0 ;; |
10546 |
+ exit ;; |
10547 |
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
10548 |
echo i${UNAME_MACHINE}-pc-mks |
10549 |
- exit 0 ;; |
10550 |
+ exit ;; |
10551 |
i*:Windows_NT*:* | Pentium*:Windows_NT*:*) |
10552 |
# How do we know it's Interix rather than the generic POSIX subsystem? |
10553 |
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we |
10554 |
# UNAME_MACHINE based on the output of uname instead of i386? |
10555 |
echo i586-pc-interix |
10556 |
- exit 0 ;; |
10557 |
+ exit ;; |
10558 |
i*:UWIN*:*) |
10559 |
echo ${UNAME_MACHINE}-pc-uwin |
10560 |
- exit 0 ;; |
10561 |
- amd64:CYGWIN*:*:*) |
10562 |
+ exit ;; |
10563 |
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) |
10564 |
echo x86_64-unknown-cygwin |
10565 |
- exit 0 ;; |
10566 |
+ exit ;; |
10567 |
p*:CYGWIN*:*) |
10568 |
echo powerpcle-unknown-cygwin |
10569 |
- exit 0 ;; |
10570 |
+ exit ;; |
10571 |
prep*:SunOS:5.*:*) |
10572 |
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
10573 |
- exit 0 ;; |
10574 |
+ exit ;; |
10575 |
*:GNU:*:*) |
10576 |
# the GNU system |
10577 |
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
10578 |
- exit 0 ;; |
10579 |
+ exit ;; |
10580 |
*:GNU/*:*:*) |
10581 |
# other systems with GNU libc and userland |
10582 |
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu |
10583 |
- exit 0 ;; |
10584 |
+ exit ;; |
10585 |
i*86:Minix:*:*) |
10586 |
echo ${UNAME_MACHINE}-pc-minix |
10587 |
- exit 0 ;; |
10588 |
+ exit ;; |
10589 |
arm*:Linux:*:*) |
10590 |
echo ${UNAME_MACHINE}-unknown-linux-gnu |
10591 |
- exit 0 ;; |
10592 |
+ exit ;; |
10593 |
cris:Linux:*:*) |
10594 |
echo cris-axis-linux-gnu |
10595 |
- exit 0 ;; |
10596 |
+ exit ;; |
10597 |
crisv32:Linux:*:*) |
10598 |
echo crisv32-axis-linux-gnu |
10599 |
- exit 0 ;; |
10600 |
+ exit ;; |
10601 |
frv:Linux:*:*) |
10602 |
echo frv-unknown-linux-gnu |
10603 |
- exit 0 ;; |
10604 |
+ exit ;; |
10605 |
ia64:Linux:*:*) |
10606 |
echo ${UNAME_MACHINE}-unknown-linux-gnu |
10607 |
- exit 0 ;; |
10608 |
+ exit ;; |
10609 |
m32r*:Linux:*:*) |
10610 |
echo ${UNAME_MACHINE}-unknown-linux-gnu |
10611 |
- exit 0 ;; |
10612 |
+ exit ;; |
10613 |
m68*:Linux:*:*) |
10614 |
echo ${UNAME_MACHINE}-unknown-linux-gnu |
10615 |
- exit 0 ;; |
10616 |
+ exit ;; |
10617 |
mips:Linux:*:*) |
10618 |
eval $set_cc_for_build |
10619 |
sed 's/^ //' << EOF >$dummy.c |
10620 |
@@ -862,7 +852,7 @@ |
10621 |
#endif |
10622 |
EOF |
10623 |
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` |
10624 |
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 |
10625 |
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
10626 |
;; |
10627 |
mips64:Linux:*:*) |
10628 |
eval $set_cc_for_build |
10629 |
@@ -881,14 +871,17 @@ |
10630 |
#endif |
10631 |
EOF |
10632 |
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` |
10633 |
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 |
10634 |
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
10635 |
;; |
10636 |
+ or32:Linux:*:*) |
10637 |
+ echo or32-unknown-linux-gnu |
10638 |
+ exit ;; |
10639 |
ppc:Linux:*:*) |
10640 |
echo powerpc-unknown-linux-gnu |
10641 |
- exit 0 ;; |
10642 |
+ exit ;; |
10643 |
ppc64:Linux:*:*) |
10644 |
echo powerpc64-unknown-linux-gnu |
10645 |
- exit 0 ;; |
10646 |
+ exit ;; |
10647 |
alpha:Linux:*:*) |
10648 |
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
10649 |
EV5) UNAME_MACHINE=alphaev5 ;; |
10650 |
@@ -902,7 +895,7 @@ |
10651 |
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null |
10652 |
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
10653 |
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
10654 |
- exit 0 ;; |
10655 |
+ exit ;; |
10656 |
parisc:Linux:*:* | hppa:Linux:*:*) |
10657 |
# Look for CPU level |
10658 |
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
10659 |
@@ -910,25 +903,25 @@ |
10660 |
PA8*) echo hppa2.0-unknown-linux-gnu ;; |
10661 |
*) echo hppa-unknown-linux-gnu ;; |
10662 |
esac |
10663 |
- exit 0 ;; |
10664 |
+ exit ;; |
10665 |
parisc64:Linux:*:* | hppa64:Linux:*:*) |
10666 |
echo hppa64-unknown-linux-gnu |
10667 |
- exit 0 ;; |
10668 |
+ exit ;; |
10669 |
s390:Linux:*:* | s390x:Linux:*:*) |
10670 |
echo ${UNAME_MACHINE}-ibm-linux |
10671 |
- exit 0 ;; |
10672 |
+ exit ;; |
10673 |
sh64*:Linux:*:*) |
10674 |
echo ${UNAME_MACHINE}-unknown-linux-gnu |
10675 |
- exit 0 ;; |
10676 |
+ exit ;; |
10677 |
sh*:Linux:*:*) |
10678 |
echo ${UNAME_MACHINE}-unknown-linux-gnu |
10679 |
- exit 0 ;; |
10680 |
+ exit ;; |
10681 |
sparc:Linux:*:* | sparc64:Linux:*:*) |
10682 |
echo ${UNAME_MACHINE}-unknown-linux-gnu |
10683 |
- exit 0 ;; |
10684 |
+ exit ;; |
10685 |
x86_64:Linux:*:*) |
10686 |
echo x86_64-unknown-linux-gnu |
10687 |
- exit 0 ;; |
10688 |
+ exit ;; |
10689 |
i*86:Linux:*:*) |
10690 |
# The BFD linker knows what the default object file format is, so |
10691 |
# first see if it will tell us. cd to the root directory to prevent |
10692 |
@@ -946,15 +939,15 @@ |
10693 |
;; |
10694 |
a.out-i386-linux) |
10695 |
echo "${UNAME_MACHINE}-pc-linux-gnuaout" |
10696 |
- exit 0 ;; |
10697 |
+ exit ;; |
10698 |
coff-i386) |
10699 |
echo "${UNAME_MACHINE}-pc-linux-gnucoff" |
10700 |
- exit 0 ;; |
10701 |
+ exit ;; |
10702 |
"") |
10703 |
# Either a pre-BFD a.out linker (linux-gnuoldld) or |
10704 |
# one that does not give us useful --help. |
10705 |
echo "${UNAME_MACHINE}-pc-linux-gnuoldld" |
10706 |
- exit 0 ;; |
10707 |
+ exit ;; |
10708 |
esac |
10709 |
# Determine whether the default compiler is a.out or elf |
10710 |
eval $set_cc_for_build |
10711 |
@@ -982,15 +975,18 @@ |
10712 |
#endif |
10713 |
EOF |
10714 |
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` |
10715 |
- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 |
10716 |
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 |
10717 |
+ test x"${LIBC}" != x && { |
10718 |
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
10719 |
+ exit |
10720 |
+ } |
10721 |
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } |
10722 |
;; |
10723 |
i*86:DYNIX/ptx:4*:*) |
10724 |
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
10725 |
# earlier versions are messed up and put the nodename in both |
10726 |
# sysname and nodename. |
10727 |
echo i386-sequent-sysv4 |
10728 |
- exit 0 ;; |
10729 |
+ exit ;; |
10730 |
i*86:UNIX_SV:4.2MP:2.*) |
10731 |
# Unixware is an offshoot of SVR4, but it has its own version |
10732 |
# number series starting with 2... |
10733 |
@@ -998,27 +994,27 @@ |
10734 |
# I just have to hope. -- rms. |
10735 |
# Use sysv4.2uw... so that sysv4* matches it. |
10736 |
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
10737 |
- exit 0 ;; |
10738 |
+ exit ;; |
10739 |
i*86:OS/2:*:*) |
10740 |
# If we were able to find `uname', then EMX Unix compatibility |
10741 |
# is probably installed. |
10742 |
echo ${UNAME_MACHINE}-pc-os2-emx |
10743 |
- exit 0 ;; |
10744 |
+ exit ;; |
10745 |
i*86:XTS-300:*:STOP) |
10746 |
echo ${UNAME_MACHINE}-unknown-stop |
10747 |
- exit 0 ;; |
10748 |
+ exit ;; |
10749 |
i*86:atheos:*:*) |
10750 |
echo ${UNAME_MACHINE}-unknown-atheos |
10751 |
- exit 0 ;; |
10752 |
- i*86:syllable:*:*) |
10753 |
+ exit ;; |
10754 |
+ i*86:syllable:*:*) |
10755 |
echo ${UNAME_MACHINE}-pc-syllable |
10756 |
- exit 0 ;; |
10757 |
+ exit ;; |
10758 |
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) |
10759 |
echo i386-unknown-lynxos${UNAME_RELEASE} |
10760 |
- exit 0 ;; |
10761 |
+ exit ;; |
10762 |
i*86:*DOS:*:*) |
10763 |
echo ${UNAME_MACHINE}-pc-msdosdjgpp |
10764 |
- exit 0 ;; |
10765 |
+ exit ;; |
10766 |
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) |
10767 |
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` |
10768 |
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then |
10769 |
@@ -1026,15 +1022,16 @@ |
10770 |
else |
10771 |
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} |
10772 |
fi |
10773 |
- exit 0 ;; |
10774 |
- i*86:*:5:[78]*) |
10775 |
+ exit ;; |
10776 |
+ i*86:*:5:[678]*) |
10777 |
+ # UnixWare 7.x, OpenUNIX and OpenServer 6. |
10778 |
case `/bin/uname -X | grep "^Machine"` in |
10779 |
*486*) UNAME_MACHINE=i486 ;; |
10780 |
*Pentium) UNAME_MACHINE=i586 ;; |
10781 |
*Pent*|*Celeron) UNAME_MACHINE=i686 ;; |
10782 |
esac |
10783 |
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} |
10784 |
- exit 0 ;; |
10785 |
+ exit ;; |
10786 |
i*86:*:3.2:*) |
10787 |
if test -f /usr/options/cb.name; then |
10788 |
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` |
10789 |
@@ -1052,73 +1049,73 @@ |
10790 |
else |
10791 |
echo ${UNAME_MACHINE}-pc-sysv32 |
10792 |
fi |
10793 |
- exit 0 ;; |
10794 |
+ exit ;; |
10795 |
pc:*:*:*) |
10796 |
# Left here for compatibility: |
10797 |
# uname -m prints for DJGPP always 'pc', but it prints nothing about |
10798 |
# the processor, so we play safe by assuming i386. |
10799 |
echo i386-pc-msdosdjgpp |
10800 |
- exit 0 ;; |
10801 |
+ exit ;; |
10802 |
Intel:Mach:3*:*) |
10803 |
echo i386-pc-mach3 |
10804 |
- exit 0 ;; |
10805 |
+ exit ;; |
10806 |
paragon:*:*:*) |
10807 |
echo i860-intel-osf1 |
10808 |
- exit 0 ;; |
10809 |
+ exit ;; |
10810 |
i860:*:4.*:*) # i860-SVR4 |
10811 |
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then |
10812 |
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 |
10813 |
else # Add other i860-SVR4 vendors below as they are discovered. |
10814 |
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 |
10815 |
fi |
10816 |
- exit 0 ;; |
10817 |
+ exit ;; |
10818 |
mini*:CTIX:SYS*5:*) |
10819 |
# "miniframe" |
10820 |
echo m68010-convergent-sysv |
10821 |
- exit 0 ;; |
10822 |
+ exit ;; |
10823 |
mc68k:UNIX:SYSTEM5:3.51m) |
10824 |
echo m68k-convergent-sysv |
10825 |
- exit 0 ;; |
10826 |
+ exit ;; |
10827 |
M680?0:D-NIX:5.3:*) |
10828 |
echo m68k-diab-dnix |
10829 |
- exit 0 ;; |
10830 |
+ exit ;; |
10831 |
M68*:*:R3V[5678]*:*) |
10832 |
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; |
10833 |
+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; |
10834 |
3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) |
10835 |
OS_REL='' |
10836 |
test -r /etc/.relid \ |
10837 |
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
10838 |
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
10839 |
- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 |
10840 |
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } |
10841 |
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
10842 |
- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; |
10843 |
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
10844 |
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
10845 |
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
10846 |
- && echo i486-ncr-sysv4 && exit 0 ;; |
10847 |
+ && { echo i486-ncr-sysv4; exit; } ;; |
10848 |
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) |
10849 |
echo m68k-unknown-lynxos${UNAME_RELEASE} |
10850 |
- exit 0 ;; |
10851 |
+ exit ;; |
10852 |
mc68030:UNIX_System_V:4.*:*) |
10853 |
echo m68k-atari-sysv4 |
10854 |
- exit 0 ;; |
10855 |
+ exit ;; |
10856 |
TSUNAMI:LynxOS:2.*:*) |
10857 |
echo sparc-unknown-lynxos${UNAME_RELEASE} |
10858 |
- exit 0 ;; |
10859 |
+ exit ;; |
10860 |
rs6000:LynxOS:2.*:*) |
10861 |
echo rs6000-unknown-lynxos${UNAME_RELEASE} |
10862 |
- exit 0 ;; |
10863 |
+ exit ;; |
10864 |
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) |
10865 |
echo powerpc-unknown-lynxos${UNAME_RELEASE} |
10866 |
- exit 0 ;; |
10867 |
+ exit ;; |
10868 |
SM[BE]S:UNIX_SV:*:*) |
10869 |
echo mips-dde-sysv${UNAME_RELEASE} |
10870 |
- exit 0 ;; |
10871 |
+ exit ;; |
10872 |
RM*:ReliantUNIX-*:*:*) |
10873 |
echo mips-sni-sysv4 |
10874 |
- exit 0 ;; |
10875 |
+ exit ;; |
10876 |
RM*:SINIX-*:*:*) |
10877 |
echo mips-sni-sysv4 |
10878 |
- exit 0 ;; |
10879 |
+ exit ;; |
10880 |
*:SINIX-*:*:*) |
10881 |
if uname -p 2>/dev/null >/dev/null ; then |
10882 |
UNAME_MACHINE=`(uname -p) 2>/dev/null` |
10883 |
@@ -1126,65 +1123,65 @@ |
10884 |
else |
10885 |
echo ns32k-sni-sysv |
10886 |
fi |
10887 |
- exit 0 ;; |
10888 |
+ exit ;; |
10889 |
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
10890 |
# says <Richard.M.Bartel@×××××××××××××.GOV> |
10891 |
echo i586-unisys-sysv4 |
10892 |
- exit 0 ;; |
10893 |
+ exit ;; |
10894 |
*:UNIX_System_V:4*:FTX*) |
10895 |
# From Gerald Hewes <hewes@××××××××××.com>. |
10896 |
# How about differentiating between stratus architectures? -djm |
10897 |
echo hppa1.1-stratus-sysv4 |
10898 |
- exit 0 ;; |
10899 |
+ exit ;; |
10900 |
*:*:*:FTX*) |
10901 |
# From seanf@××××××××××××.com. |
10902 |
echo i860-stratus-sysv4 |
10903 |
- exit 0 ;; |
10904 |
+ exit ;; |
10905 |
i*86:VOS:*:*) |
10906 |
# From Paul.Green@×××××××.com. |
10907 |
echo ${UNAME_MACHINE}-stratus-vos |
10908 |
- exit 0 ;; |
10909 |
+ exit ;; |
10910 |
*:VOS:*:*) |
10911 |
# From Paul.Green@×××××××.com. |
10912 |
echo hppa1.1-stratus-vos |
10913 |
- exit 0 ;; |
10914 |
+ exit ;; |
10915 |
mc68*:A/UX:*:*) |
10916 |
echo m68k-apple-aux${UNAME_RELEASE} |
10917 |
- exit 0 ;; |
10918 |
+ exit ;; |
10919 |
news*:NEWS-OS:6*:*) |
10920 |
echo mips-sony-newsos6 |
10921 |
- exit 0 ;; |
10922 |
+ exit ;; |
10923 |
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
10924 |
if [ -d /usr/nec ]; then |
10925 |
echo mips-nec-sysv${UNAME_RELEASE} |
10926 |
else |
10927 |
echo mips-unknown-sysv${UNAME_RELEASE} |
10928 |
fi |
10929 |
- exit 0 ;; |
10930 |
+ exit ;; |
10931 |
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
10932 |
echo powerpc-be-beos |
10933 |
- exit 0 ;; |
10934 |
+ exit ;; |
10935 |
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. |
10936 |
echo powerpc-apple-beos |
10937 |
- exit 0 ;; |
10938 |
+ exit ;; |
10939 |
BePC:BeOS:*:*) # BeOS running on Intel PC compatible. |
10940 |
echo i586-pc-beos |
10941 |
- exit 0 ;; |
10942 |
+ exit ;; |
10943 |
SX-4:SUPER-UX:*:*) |
10944 |
echo sx4-nec-superux${UNAME_RELEASE} |
10945 |
- exit 0 ;; |
10946 |
+ exit ;; |
10947 |
SX-5:SUPER-UX:*:*) |
10948 |
echo sx5-nec-superux${UNAME_RELEASE} |
10949 |
- exit 0 ;; |
10950 |
+ exit ;; |
10951 |
SX-6:SUPER-UX:*:*) |
10952 |
echo sx6-nec-superux${UNAME_RELEASE} |
10953 |
- exit 0 ;; |
10954 |
+ exit ;; |
10955 |
Power*:Rhapsody:*:*) |
10956 |
echo powerpc-apple-rhapsody${UNAME_RELEASE} |
10957 |
- exit 0 ;; |
10958 |
+ exit ;; |
10959 |
*:Rhapsody:*:*) |
10960 |
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} |
10961 |
- exit 0 ;; |
10962 |
+ exit ;; |
10963 |
*:Darwin:*:*) |
10964 |
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
10965 |
case $UNAME_PROCESSOR in |
10966 |
@@ -1192,7 +1189,7 @@ |
10967 |
unknown) UNAME_PROCESSOR=powerpc ;; |
10968 |
esac |
10969 |
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
10970 |
- exit 0 ;; |
10971 |
+ exit ;; |
10972 |
*:procnto*:*:* | *:QNX:[0123456789]*:*) |
10973 |
UNAME_PROCESSOR=`uname -p` |
10974 |
if test "$UNAME_PROCESSOR" = "x86"; then |
10975 |
@@ -1200,25 +1197,25 @@ |
10976 |
UNAME_MACHINE=pc |
10977 |
fi |
10978 |
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} |
10979 |
- exit 0 ;; |
10980 |
+ exit ;; |
10981 |
*:QNX:*:4*) |
10982 |
echo i386-pc-qnx |
10983 |
- exit 0 ;; |
10984 |
+ exit ;; |
10985 |
NSE-?:NONSTOP_KERNEL:*:*) |
10986 |
echo nse-tandem-nsk${UNAME_RELEASE} |
10987 |
- exit 0 ;; |
10988 |
+ exit ;; |
10989 |
NSR-?:NONSTOP_KERNEL:*:*) |
10990 |
echo nsr-tandem-nsk${UNAME_RELEASE} |
10991 |
- exit 0 ;; |
10992 |
+ exit ;; |
10993 |
*:NonStop-UX:*:*) |
10994 |
echo mips-compaq-nonstopux |
10995 |
- exit 0 ;; |
10996 |
+ exit ;; |
10997 |
BS2000:POSIX*:*:*) |
10998 |
echo bs2000-siemens-sysv |
10999 |
- exit 0 ;; |
11000 |
+ exit ;; |
11001 |
DS/*:UNIX_System_V:*:*) |
11002 |
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} |
11003 |
- exit 0 ;; |
11004 |
+ exit ;; |
11005 |
*:Plan9:*:*) |
11006 |
# "uname -m" is not consistent, so use $cputype instead. 386 |
11007 |
# is converted to i386 for consistency with other x86 |
11008 |
@@ -1229,41 +1226,44 @@ |
11009 |
UNAME_MACHINE="$cputype" |
11010 |
fi |
11011 |
echo ${UNAME_MACHINE}-unknown-plan9 |
11012 |
- exit 0 ;; |
11013 |
+ exit ;; |
11014 |
*:TOPS-10:*:*) |
11015 |
echo pdp10-unknown-tops10 |
11016 |
- exit 0 ;; |
11017 |
+ exit ;; |
11018 |
*:TENEX:*:*) |
11019 |
echo pdp10-unknown-tenex |
11020 |
- exit 0 ;; |
11021 |
+ exit ;; |
11022 |
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) |
11023 |
echo pdp10-dec-tops20 |
11024 |
- exit 0 ;; |
11025 |
+ exit ;; |
11026 |
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) |
11027 |
echo pdp10-xkl-tops20 |
11028 |
- exit 0 ;; |
11029 |
+ exit ;; |
11030 |
*:TOPS-20:*:*) |
11031 |
echo pdp10-unknown-tops20 |
11032 |
- exit 0 ;; |
11033 |
+ exit ;; |
11034 |
*:ITS:*:*) |
11035 |
echo pdp10-unknown-its |
11036 |
- exit 0 ;; |
11037 |
+ exit ;; |
11038 |
SEI:*:*:SEIUX) |
11039 |
echo mips-sei-seiux${UNAME_RELEASE} |
11040 |
- exit 0 ;; |
11041 |
+ exit ;; |
11042 |
*:DragonFly:*:*) |
11043 |
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
11044 |
- exit 0 ;; |
11045 |
+ exit ;; |
11046 |
*:*VMS:*:*) |
11047 |
UNAME_MACHINE=`(uname -p) 2>/dev/null` |
11048 |
case "${UNAME_MACHINE}" in |
11049 |
- A*) echo alpha-dec-vms && exit 0 ;; |
11050 |
- I*) echo ia64-dec-vms && exit 0 ;; |
11051 |
- V*) echo vax-dec-vms && exit 0 ;; |
11052 |
+ A*) echo alpha-dec-vms ; exit ;; |
11053 |
+ I*) echo ia64-dec-vms ; exit ;; |
11054 |
+ V*) echo vax-dec-vms ; exit ;; |
11055 |
esac ;; |
11056 |
*:XENIX:*:SysV) |
11057 |
echo i386-pc-xenix |
11058 |
- exit 0 ;; |
11059 |
+ exit ;; |
11060 |
+ i*86:skyos:*:*) |
11061 |
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' |
11062 |
+ exit ;; |
11063 |
esac |
11064 |
|
11065 |
#echo '(No uname command or uname output not recognized.)' 1>&2 |
11066 |
@@ -1295,7 +1295,7 @@ |
11067 |
#endif |
11068 |
|
11069 |
#if defined (__arm) && defined (__acorn) && defined (__unix) |
11070 |
- printf ("arm-acorn-riscix"); exit (0); |
11071 |
+ printf ("arm-acorn-riscix\n"); exit (0); |
11072 |
#endif |
11073 |
|
11074 |
#if defined (hp300) && !defined (hpux) |
11075 |
@@ -1384,11 +1384,12 @@ |
11076 |
} |
11077 |
EOF |
11078 |
|
11079 |
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 |
11080 |
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && |
11081 |
+ { echo "$SYSTEM_NAME"; exit; } |
11082 |
|
11083 |
# Apollos put the system type in the environment. |
11084 |
|
11085 |
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } |
11086 |
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } |
11087 |
|
11088 |
# Convex versions that predate uname can use getsysinfo(1) |
11089 |
|
11090 |
@@ -1397,22 +1398,22 @@ |
11091 |
case `getsysinfo -f cpu_type` in |
11092 |
c1*) |
11093 |
echo c1-convex-bsd |
11094 |
- exit 0 ;; |
11095 |
+ exit ;; |
11096 |
c2*) |
11097 |
if getsysinfo -f scalar_acc |
11098 |
then echo c32-convex-bsd |
11099 |
else echo c2-convex-bsd |
11100 |
fi |
11101 |
- exit 0 ;; |
11102 |
+ exit ;; |
11103 |
c34*) |
11104 |
echo c34-convex-bsd |
11105 |
- exit 0 ;; |
11106 |
+ exit ;; |
11107 |
c38*) |
11108 |
echo c38-convex-bsd |
11109 |
- exit 0 ;; |
11110 |
+ exit ;; |
11111 |
c4*) |
11112 |
echo c4-convex-bsd |
11113 |
- exit 0 ;; |
11114 |
+ exit ;; |
11115 |
esac |
11116 |
fi |
11117 |
|
11118 |
diff -uhrN WindowMaker-0.92.0/config.sub WindowMaker-CVS-20060123/config.sub |
11119 |
--- WindowMaker-0.92.0/config.sub 2005-06-19 05:22:56.000000000 +0200 |
11120 |
+++ WindowMaker-CVS-20060123/config.sub 2005-08-14 05:51:20.000000000 +0200 |
11121 |
@@ -3,7 +3,7 @@ |
11122 |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
11123 |
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
11124 |
|
11125 |
-timestamp='2005-04-22' |
11126 |
+timestamp='2005-07-08' |
11127 |
|
11128 |
# This file is (in principle) common to ALL GNU software. |
11129 |
# The presence of a machine in this file suggests that SOME GNU software |
11130 |
@@ -21,14 +21,15 @@ |
11131 |
# |
11132 |
# You should have received a copy of the GNU General Public License |
11133 |
# along with this program; if not, write to the Free Software |
11134 |
-# Foundation, Inc., 59 Temple Place - Suite 330, |
11135 |
-# Boston, MA 02111-1307, USA. |
11136 |
- |
11137 |
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
11138 |
+# 02110-1301, USA. |
11139 |
+# |
11140 |
# As a special exception to the GNU General Public License, if you |
11141 |
# distribute this file as part of a program that contains a |
11142 |
# configuration script generated by Autoconf, you may include it under |
11143 |
# the same distribution terms that you use for the rest of that program. |
11144 |
|
11145 |
+ |
11146 |
# Please send patches to <config-patches@×××.org>. Submit a context |
11147 |
# diff and a properly formatted ChangeLog entry. |
11148 |
# |
11149 |
@@ -83,11 +84,11 @@ |
11150 |
while test $# -gt 0 ; do |
11151 |
case $1 in |
11152 |
--time-stamp | --time* | -t ) |
11153 |
- echo "$timestamp" ; exit 0 ;; |
11154 |
+ echo "$timestamp" ; exit ;; |
11155 |
--version | -v ) |
11156 |
- echo "$version" ; exit 0 ;; |
11157 |
+ echo "$version" ; exit ;; |
11158 |
--help | --h* | -h ) |
11159 |
- echo "$usage"; exit 0 ;; |
11160 |
+ echo "$usage"; exit ;; |
11161 |
-- ) # Stop option processing |
11162 |
shift; break ;; |
11163 |
- ) # Use stdin as input. |
11164 |
@@ -99,7 +100,7 @@ |
11165 |
*local*) |
11166 |
# First pass through any local machine types. |
11167 |
echo $1 |
11168 |
- exit 0;; |
11169 |
+ exit ;; |
11170 |
|
11171 |
* ) |
11172 |
break ;; |
11173 |
@@ -247,6 +248,7 @@ |
11174 |
| mips64vr4100 | mips64vr4100el \ |
11175 |
| mips64vr4300 | mips64vr4300el \ |
11176 |
| mips64vr5000 | mips64vr5000el \ |
11177 |
+ | mips64vr5900 | mips64vr5900el \ |
11178 |
| mipsisa32 | mipsisa32el \ |
11179 |
| mipsisa32r2 | mipsisa32r2el \ |
11180 |
| mipsisa64 | mipsisa64el \ |
11181 |
@@ -255,13 +257,14 @@ |
11182 |
| mipsisa64sr71k | mipsisa64sr71kel \ |
11183 |
| mipstx39 | mipstx39el \ |
11184 |
| mn10200 | mn10300 \ |
11185 |
+ | ms1 \ |
11186 |
| msp430 \ |
11187 |
| ns16k | ns32k \ |
11188 |
- | openrisc | or32 \ |
11189 |
+ | or32 \ |
11190 |
| pdp10 | pdp11 | pj | pjl \ |
11191 |
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
11192 |
| pyramid \ |
11193 |
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ |
11194 |
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ |
11195 |
| sh64 | sh64le \ |
11196 |
| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ |
11197 |
| sparcv8 | sparcv9 | sparcv9b \ |
11198 |
@@ -273,6 +276,9 @@ |
11199 |
| z8k) |
11200 |
basic_machine=$basic_machine-unknown |
11201 |
;; |
11202 |
+ m32c) |
11203 |
+ basic_machine=$basic_machine-unknown |
11204 |
+ ;; |
11205 |
m6811 | m68hc11 | m6812 | m68hc12) |
11206 |
# Motorola 68HC11/12. |
11207 |
basic_machine=$basic_machine-unknown |
11208 |
@@ -321,6 +327,7 @@ |
11209 |
| mips64vr4100-* | mips64vr4100el-* \ |
11210 |
| mips64vr4300-* | mips64vr4300el-* \ |
11211 |
| mips64vr5000-* | mips64vr5000el-* \ |
11212 |
+ | mips64vr5900-* | mips64vr5900el-* \ |
11213 |
| mipsisa32-* | mipsisa32el-* \ |
11214 |
| mipsisa32r2-* | mipsisa32r2el-* \ |
11215 |
| mipsisa64-* | mipsisa64el-* \ |
11216 |
@@ -329,6 +336,7 @@ |
11217 |
| mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
11218 |
| mipstx39-* | mipstx39el-* \ |
11219 |
| mmix-* \ |
11220 |
+ | ms1-* \ |
11221 |
| msp430-* \ |
11222 |
| none-* | np1-* | ns16k-* | ns32k-* \ |
11223 |
| orion-* \ |
11224 |
@@ -336,7 +344,7 @@ |
11225 |
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
11226 |
| pyramid-* \ |
11227 |
| romp-* | rs6000-* \ |
11228 |
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ |
11229 |
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ |
11230 |
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
11231 |
| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ |
11232 |
| sparclite-* \ |
11233 |
@@ -351,6 +359,8 @@ |
11234 |
| ymp-* \ |
11235 |
| z8k-*) |
11236 |
;; |
11237 |
+ m32c-*) |
11238 |
+ ;; |
11239 |
# Recognize the various machine names and aliases which stand |
11240 |
# for a CPU type and a company and sometimes even an OS. |
11241 |
386bsd) |
11242 |
@@ -761,9 +771,8 @@ |
11243 |
basic_machine=hppa1.1-oki |
11244 |
os=-proelf |
11245 |
;; |
11246 |
- or32 | or32-*) |
11247 |
+ openrisc | openrisc-*) |
11248 |
basic_machine=or32-unknown |
11249 |
- os=-coff |
11250 |
;; |
11251 |
os400) |
11252 |
basic_machine=powerpc-ibm |
11253 |
@@ -1089,12 +1098,9 @@ |
11254 |
we32k) |
11255 |
basic_machine=we32k-att |
11256 |
;; |
11257 |
- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) |
11258 |
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) |
11259 |
basic_machine=sh-unknown |
11260 |
;; |
11261 |
- sh64) |
11262 |
- basic_machine=sh64-unknown |
11263 |
- ;; |
11264 |
sparc | sparcv8 | sparcv9 | sparcv9b) |
11265 |
basic_machine=sparc-sun |
11266 |
;; |
11267 |
@@ -1181,7 +1187,8 @@ |
11268 |
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
11269 |
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
11270 |
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
11271 |
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) |
11272 |
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
11273 |
+ | -skyos* | -haiku*) |
11274 |
# Remember, each alternative MUST END IN *, to match a version number. |
11275 |
;; |
11276 |
-qnx*) |
11277 |
@@ -1199,7 +1206,7 @@ |
11278 |
os=`echo $os | sed -e 's|nto|nto-qnx|'` |
11279 |
;; |
11280 |
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ |
11281 |
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ |
11282 |
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ |
11283 |
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) |
11284 |
;; |
11285 |
-mac*) |
11286 |
@@ -1388,6 +1395,9 @@ |
11287 |
*-be) |
11288 |
os=-beos |
11289 |
;; |
11290 |
+ *-haiku) |
11291 |
+ os=-haiku |
11292 |
+ ;; |
11293 |
*-ibm) |
11294 |
os=-aix |
11295 |
;; |
11296 |
@@ -1559,7 +1569,7 @@ |
11297 |
esac |
11298 |
|
11299 |
echo $basic_machine$os |
11300 |
-exit 0 |
11301 |
+exit |
11302 |
|
11303 |
# Local variables: |
11304 |
# eval: (add-hook 'write-file-hooks 'time-stamp) |
11305 |
diff -uhrN WindowMaker-0.92.0/configure WindowMaker-CVS-20060123/configure |
11306 |
--- WindowMaker-0.92.0/configure 2005-06-19 05:23:02.000000000 +0200 |
11307 |
+++ WindowMaker-CVS-20060123/configure 2006-01-22 21:33:55.000000000 +0100 |
11308 |
@@ -278,15 +278,15 @@ |
11309 |
|
11310 |
# The HP-UX ksh and POSIX shell print the target directory to stdout |
11311 |
# if CDPATH is set. |
11312 |
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi |
11313 |
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
11314 |
|
11315 |
if test -z "$ECHO"; then |
11316 |
if test "X${echo_test_string+set}" != Xset; then |
11317 |
# find a string as large as possible, as long as the shell can cope with it |
11318 |
for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do |
11319 |
# expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
11320 |
- if (echo_test_string="`eval $cmd`") 2>/dev/null && |
11321 |
- echo_test_string="`eval $cmd`" && |
11322 |
+ if (echo_test_string=`eval $cmd`) 2>/dev/null && |
11323 |
+ echo_test_string=`eval $cmd` && |
11324 |
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null |
11325 |
then |
11326 |
break |
11327 |
@@ -2885,7 +2885,7 @@ |
11328 |
# Add /usr/xpg4/bin/sed as it is typically found on Solaris |
11329 |
# along with /bin/sed that truncates output. |
11330 |
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do |
11331 |
- test ! -f $lt_ac_sed && break |
11332 |
+ test ! -f $lt_ac_sed && continue |
11333 |
cat /dev/null > conftest.in |
11334 |
lt_ac_count=0 |
11335 |
echo $ECHO_N "0123456789$ECHO_C" >conftest.in |
11336 |
@@ -2910,10 +2910,10 @@ |
11337 |
fi |
11338 |
done |
11339 |
done |
11340 |
-SED=$lt_cv_path_SED |
11341 |
|
11342 |
fi |
11343 |
|
11344 |
+SED=$lt_cv_path_SED |
11345 |
echo "$as_me:$LINENO: result: $SED" >&5 |
11346 |
echo "${ECHO_T}$SED" >&6 |
11347 |
|
11348 |
@@ -2990,7 +2990,7 @@ |
11349 |
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
11350 |
lt_cv_path_LD="$ac_dir/$ac_prog" |
11351 |
# Check to see if the program is GNU ld. I'd rather use --version, |
11352 |
- # but apparently some GNU ld's only accept -v. |
11353 |
+ # but apparently some variants of GNU ld only accept -v. |
11354 |
# Break only if it was the GNU/non-GNU ld that we prefer. |
11355 |
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in |
11356 |
*GNU* | *'with BFD'*) |
11357 |
@@ -3024,7 +3024,7 @@ |
11358 |
if test "${lt_cv_prog_gnu_ld+set}" = set; then |
11359 |
echo $ECHO_N "(cached) $ECHO_C" >&6 |
11360 |
else |
11361 |
- # I'd rather use --version here, but apparently some GNU ld's only accept -v. |
11362 |
+ # I'd rather use --version here, but apparently some GNU lds only accept -v. |
11363 |
case `$LD -v 2>&1 </dev/null` in |
11364 |
*GNU* | *'with BFD'*) |
11365 |
lt_cv_prog_gnu_ld=yes |
11366 |
@@ -3054,6 +3054,15 @@ |
11367 |
*) reload_flag=" $reload_flag" ;; |
11368 |
esac |
11369 |
reload_cmds='$LD$reload_flag -o $output$reload_objs' |
11370 |
+case $host_os in |
11371 |
+ darwin*) |
11372 |
+ if test "$GCC" = yes; then |
11373 |
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
11374 |
+ else |
11375 |
+ reload_cmds='$LD$reload_flag -o $output$reload_objs' |
11376 |
+ fi |
11377 |
+ ;; |
11378 |
+esac |
11379 |
|
11380 |
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 |
11381 |
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 |
11382 |
@@ -3064,36 +3073,43 @@ |
11383 |
# Let the user override the test. |
11384 |
lt_cv_path_NM="$NM" |
11385 |
else |
11386 |
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
11387 |
- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do |
11388 |
- IFS="$lt_save_ifs" |
11389 |
- test -z "$ac_dir" && ac_dir=. |
11390 |
- tmp_nm="$ac_dir/${ac_tool_prefix}nm" |
11391 |
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then |
11392 |
- # Check to see if the nm accepts a BSD-compat flag. |
11393 |
- # Adding the `sed 1q' prevents false positives on HP-UX, which says: |
11394 |
- # nm: unknown option "B" ignored |
11395 |
- # Tru64's nm complains that /dev/null is an invalid object file |
11396 |
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in |
11397 |
- */dev/null* | *'Invalid file or object type'*) |
11398 |
- lt_cv_path_NM="$tmp_nm -B" |
11399 |
- break |
11400 |
- ;; |
11401 |
- *) |
11402 |
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in |
11403 |
- */dev/null*) |
11404 |
- lt_cv_path_NM="$tmp_nm -p" |
11405 |
+ lt_nm_to_check="${ac_tool_prefix}nm" |
11406 |
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then |
11407 |
+ lt_nm_to_check="$lt_nm_to_check nm" |
11408 |
+ fi |
11409 |
+ for lt_tmp_nm in $lt_nm_to_check; do |
11410 |
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
11411 |
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do |
11412 |
+ IFS="$lt_save_ifs" |
11413 |
+ test -z "$ac_dir" && ac_dir=. |
11414 |
+ tmp_nm="$ac_dir/$lt_tmp_nm" |
11415 |
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then |
11416 |
+ # Check to see if the nm accepts a BSD-compat flag. |
11417 |
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: |
11418 |
+ # nm: unknown option "B" ignored |
11419 |
+ # Tru64's nm complains that /dev/null is an invalid object file |
11420 |
+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in |
11421 |
+ */dev/null* | *'Invalid file or object type'*) |
11422 |
+ lt_cv_path_NM="$tmp_nm -B" |
11423 |
break |
11424 |
;; |
11425 |
*) |
11426 |
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but |
11427 |
- continue # so that we can try to find one that supports BSD flags |
11428 |
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in |
11429 |
+ */dev/null*) |
11430 |
+ lt_cv_path_NM="$tmp_nm -p" |
11431 |
+ break |
11432 |
+ ;; |
11433 |
+ *) |
11434 |
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but |
11435 |
+ continue # so that we can try to find one that supports BSD flags |
11436 |
+ ;; |
11437 |
+ esac |
11438 |
;; |
11439 |
esac |
11440 |
- esac |
11441 |
- fi |
11442 |
+ fi |
11443 |
+ done |
11444 |
+ IFS="$lt_save_ifs" |
11445 |
done |
11446 |
- IFS="$lt_save_ifs" |
11447 |
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm |
11448 |
fi |
11449 |
fi |
11450 |
@@ -3140,7 +3156,7 @@ |
11451 |
lt_cv_deplibs_check_method=pass_all |
11452 |
;; |
11453 |
|
11454 |
-bsdi4*) |
11455 |
+bsdi[45]*) |
11456 |
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' |
11457 |
lt_cv_file_magic_cmd='/usr/bin/file -L' |
11458 |
lt_cv_file_magic_test_file=/shlib/libc.so |
11459 |
@@ -3163,13 +3179,13 @@ |
11460 |
lt_cv_deplibs_check_method=pass_all |
11461 |
;; |
11462 |
|
11463 |
-freebsd* | kfreebsd*-gnu) |
11464 |
+freebsd* | kfreebsd*-gnu | dragonfly*) |
11465 |
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
11466 |
case $host_cpu in |
11467 |
i*86 ) |
11468 |
# Not sure whether the presence of OpenBSD here was a mistake. |
11469 |
# Let's accept both of them until this is cleared up. |
11470 |
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' |
11471 |
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' |
11472 |
lt_cv_file_magic_cmd=/usr/bin/file |
11473 |
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` |
11474 |
;; |
11475 |
@@ -3185,7 +3201,7 @@ |
11476 |
|
11477 |
hpux10.20* | hpux11*) |
11478 |
lt_cv_file_magic_cmd=/usr/bin/file |
11479 |
- case "$host_cpu" in |
11480 |
+ case $host_cpu in |
11481 |
ia64*) |
11482 |
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' |
11483 |
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
11484 |
@@ -3201,6 +3217,11 @@ |
11485 |
esac |
11486 |
;; |
11487 |
|
11488 |
+interix3*) |
11489 |
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here |
11490 |
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' |
11491 |
+ ;; |
11492 |
+ |
11493 |
irix5* | irix6* | nonstopux*) |
11494 |
case $LD in |
11495 |
*-32|*"-32 ") libmagic=32-bit;; |
11496 |
@@ -3235,12 +3256,10 @@ |
11497 |
;; |
11498 |
|
11499 |
openbsd*) |
11500 |
- lt_cv_file_magic_cmd=/usr/bin/file |
11501 |
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` |
11502 |
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
11503 |
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' |
11504 |
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' |
11505 |
else |
11506 |
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' |
11507 |
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
11508 |
fi |
11509 |
;; |
11510 |
|
11511 |
@@ -3248,15 +3267,11 @@ |
11512 |
lt_cv_deplibs_check_method=pass_all |
11513 |
;; |
11514 |
|
11515 |
-sco3.2v5*) |
11516 |
- lt_cv_deplibs_check_method=pass_all |
11517 |
- ;; |
11518 |
- |
11519 |
solaris*) |
11520 |
lt_cv_deplibs_check_method=pass_all |
11521 |
;; |
11522 |
|
11523 |
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
11524 |
+sysv4 | sysv4.3*) |
11525 |
case $host_vendor in |
11526 |
motorola) |
11527 |
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' |
11528 |
@@ -3277,10 +3292,13 @@ |
11529 |
siemens) |
11530 |
lt_cv_deplibs_check_method=pass_all |
11531 |
;; |
11532 |
+ pc) |
11533 |
+ lt_cv_deplibs_check_method=pass_all |
11534 |
+ ;; |
11535 |
esac |
11536 |
;; |
11537 |
|
11538 |
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*) |
11539 |
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
11540 |
lt_cv_deplibs_check_method=pass_all |
11541 |
;; |
11542 |
esac |
11543 |
@@ -3298,6 +3316,9 @@ |
11544 |
# If no C compiler was specified, use CC. |
11545 |
LTCC=${LTCC-"$CC"} |
11546 |
|
11547 |
+# If no C compiler flags were specified, use CFLAGS. |
11548 |
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} |
11549 |
+ |
11550 |
# Allow CC to be a program name with arguments. |
11551 |
compiler=$CC |
11552 |
|
11553 |
@@ -3333,7 +3354,7 @@ |
11554 |
;; |
11555 |
*-*-irix6*) |
11556 |
# Find out which ABI we are using. |
11557 |
- echo '#line 3336 "configure"' > conftest.$ac_ext |
11558 |
+ echo '#line 3357 "configure"' > conftest.$ac_ext |
11559 |
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11560 |
(eval $ac_compile) 2>&5 |
11561 |
ac_status=$? |
11562 |
@@ -3376,7 +3397,7 @@ |
11563 |
ac_status=$? |
11564 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11565 |
(exit $ac_status); }; then |
11566 |
- case "`/usr/bin/file conftest.o`" in |
11567 |
+ case `/usr/bin/file conftest.o` in |
11568 |
*32-bit*) |
11569 |
case $host in |
11570 |
x86_64-*linux*) |
11571 |
@@ -3488,6 +3509,26 @@ |
11572 |
CFLAGS="$SAVE_CFLAGS" |
11573 |
fi |
11574 |
;; |
11575 |
+sparc*-*solaris*) |
11576 |
+ # Find out which ABI we are using. |
11577 |
+ echo 'int i;' > conftest.$ac_ext |
11578 |
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11579 |
+ (eval $ac_compile) 2>&5 |
11580 |
+ ac_status=$? |
11581 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11582 |
+ (exit $ac_status); }; then |
11583 |
+ case `/usr/bin/file conftest.o` in |
11584 |
+ *64-bit*) |
11585 |
+ case $lt_cv_prog_gnu_ld in |
11586 |
+ yes*) LD="${LD-ld} -m elf64_sparc" ;; |
11587 |
+ *) LD="${LD-ld} -64" ;; |
11588 |
+ esac |
11589 |
+ ;; |
11590 |
+ esac |
11591 |
+ fi |
11592 |
+ rm -rf conftest* |
11593 |
+ ;; |
11594 |
+ |
11595 |
|
11596 |
esac |
11597 |
|
11598 |
@@ -4465,7 +4506,12 @@ |
11599 |
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
11600 |
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
11601 |
|
11602 |
-ac_ext=cc |
11603 |
+ |
11604 |
+ |
11605 |
+if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
11606 |
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
11607 |
+ (test "X$CXX" != "Xg++"))) ; then |
11608 |
+ ac_ext=cc |
11609 |
ac_cpp='$CXXCPP $CPPFLAGS' |
11610 |
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
11611 |
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
11612 |
@@ -4695,6 +4741,8 @@ |
11613 |
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
11614 |
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
11615 |
|
11616 |
+fi |
11617 |
+ |
11618 |
|
11619 |
ac_ext=f |
11620 |
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' |
11621 |
@@ -4788,7 +4836,7 @@ |
11622 |
|
11623 |
|
11624 |
# Provide some information about the compiler. |
11625 |
-echo "$as_me:4791:" \ |
11626 |
+echo "$as_me:4839:" \ |
11627 |
"checking for Fortran 77 compiler version" >&5 |
11628 |
ac_compiler=`set X $ac_compile; echo $2` |
11629 |
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 |
11630 |
@@ -4976,11 +5024,55 @@ |
11631 |
lt_cv_sys_max_cmd_len=8192; |
11632 |
;; |
11633 |
|
11634 |
- *) |
11635 |
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) |
11636 |
+ # This has been around since 386BSD, at least. Likely further. |
11637 |
+ if test -x /sbin/sysctl; then |
11638 |
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` |
11639 |
+ elif test -x /usr/sbin/sysctl; then |
11640 |
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` |
11641 |
+ else |
11642 |
+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs |
11643 |
+ fi |
11644 |
+ # And add a safety zone |
11645 |
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
11646 |
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
11647 |
+ ;; |
11648 |
+ |
11649 |
+ interix*) |
11650 |
+ # We know the value 262144 and hardcode it with a safety zone (like BSD) |
11651 |
+ lt_cv_sys_max_cmd_len=196608 |
11652 |
+ ;; |
11653 |
+ |
11654 |
+ osf*) |
11655 |
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
11656 |
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
11657 |
+ # nice to cause kernel panics so lets avoid the loop below. |
11658 |
+ # First set a reasonable default. |
11659 |
+ lt_cv_sys_max_cmd_len=16384 |
11660 |
+ # |
11661 |
+ if test -x /sbin/sysconfig; then |
11662 |
+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in |
11663 |
+ *1*) lt_cv_sys_max_cmd_len=-1 ;; |
11664 |
+ esac |
11665 |
+ fi |
11666 |
+ ;; |
11667 |
+ sco3.2v5*) |
11668 |
+ lt_cv_sys_max_cmd_len=102400 |
11669 |
+ ;; |
11670 |
+ sysv5* | sco5v6* | sysv4.2uw2*) |
11671 |
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` |
11672 |
+ if test -n "$kargmax"; then |
11673 |
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` |
11674 |
+ else |
11675 |
+ lt_cv_sys_max_cmd_len=32768 |
11676 |
+ fi |
11677 |
+ ;; |
11678 |
+ *) |
11679 |
# If test is not a shell built-in, we'll probably end up computing a |
11680 |
# maximum length that is only half of the actual maximum length, but |
11681 |
# we can't tell. |
11682 |
- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ |
11683 |
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} |
11684 |
+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ |
11685 |
= "XX$teststring") >/dev/null 2>&1 && |
11686 |
new_result=`expr "X$teststring" : ".*" 2>&1` && |
11687 |
lt_cv_sys_max_cmd_len=$new_result && |
11688 |
@@ -5026,9 +5118,6 @@ |
11689 |
# Regexp to match symbols that can be accessed directly from C. |
11690 |
sympat='\([_A-Za-z][_A-Za-z0-9]*\)' |
11691 |
|
11692 |
-# Transform the above into a raw symbol and a C symbol. |
11693 |
-symxfrm='\1 \2\3 \3' |
11694 |
- |
11695 |
# Transform an extracted symbol line into a proper C declaration |
11696 |
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" |
11697 |
|
11698 |
@@ -5050,15 +5139,31 @@ |
11699 |
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
11700 |
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" |
11701 |
;; |
11702 |
+linux*) |
11703 |
+ if test "$host_cpu" = ia64; then |
11704 |
+ symcode='[ABCDGIRSTW]' |
11705 |
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
11706 |
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" |
11707 |
+ fi |
11708 |
+ ;; |
11709 |
irix* | nonstopux*) |
11710 |
symcode='[BCDEGRST]' |
11711 |
;; |
11712 |
osf*) |
11713 |
symcode='[BCDEGQRST]' |
11714 |
;; |
11715 |
-solaris* | sysv5*) |
11716 |
+solaris*) |
11717 |
symcode='[BDRT]' |
11718 |
;; |
11719 |
+sco3.2v5*) |
11720 |
+ symcode='[DT]' |
11721 |
+ ;; |
11722 |
+sysv4.2uw2*) |
11723 |
+ symcode='[DT]' |
11724 |
+ ;; |
11725 |
+sysv5* | sco5v6* | unixware* | OpenUNIX*) |
11726 |
+ symcode='[ABDT]' |
11727 |
+ ;; |
11728 |
sysv4) |
11729 |
symcode='[DFNSTU]' |
11730 |
;; |
11731 |
@@ -5081,8 +5186,11 @@ |
11732 |
# Try without a prefix undercore, then with it. |
11733 |
for ac_symprfx in "" "_"; do |
11734 |
|
11735 |
+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. |
11736 |
+ symxfrm="\\1 $ac_symprfx\\2 \\2" |
11737 |
+ |
11738 |
# Write the raw and C identifiers. |
11739 |
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" |
11740 |
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
11741 |
|
11742 |
# Check to see that the pipe works correctly. |
11743 |
pipe_works=no |
11744 |
@@ -5244,7 +5352,7 @@ |
11745 |
|
11746 |
# Sed substitution that helps us do robust quoting. It backslashifies |
11747 |
# metacharacters that are still active within double-quoted strings. |
11748 |
-Xsed='sed -e s/^X//' |
11749 |
+Xsed='sed -e 1s/^X//' |
11750 |
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' |
11751 |
|
11752 |
# Same as above, but do not quote variable references. |
11753 |
@@ -5264,7 +5372,7 @@ |
11754 |
default_ofile=libtool |
11755 |
can_build_shared=yes |
11756 |
|
11757 |
-# All known linkers require a `.a' archive for static linking (except M$VC, |
11758 |
+# All known linkers require a `.a' archive for static linking (except MSVC, |
11759 |
# which needs '.lib'). |
11760 |
libext=a |
11761 |
ltmain="$ac_aux_dir/ltmain.sh" |
11762 |
@@ -5521,6 +5629,7 @@ |
11763 |
test -z "$AS" && AS=as |
11764 |
test -z "$CC" && CC=cc |
11765 |
test -z "$LTCC" && LTCC=$CC |
11766 |
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS |
11767 |
test -z "$DLLTOOL" && DLLTOOL=dlltool |
11768 |
test -z "$LD" && LD=ld |
11769 |
test -z "$LN_S" && LN_S="ln -s" |
11770 |
@@ -5540,15 +5649,26 @@ |
11771 |
if test -n "$RANLIB"; then |
11772 |
case $host_os in |
11773 |
openbsd*) |
11774 |
- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" |
11775 |
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
11776 |
;; |
11777 |
*) |
11778 |
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" |
11779 |
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
11780 |
;; |
11781 |
esac |
11782 |
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
11783 |
fi |
11784 |
|
11785 |
+for cc_temp in $compiler""; do |
11786 |
+ case $cc_temp in |
11787 |
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; |
11788 |
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; |
11789 |
+ \-*) ;; |
11790 |
+ *) break;; |
11791 |
+ esac |
11792 |
+done |
11793 |
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
11794 |
+ |
11795 |
+ |
11796 |
# Only perform the check for file, if the check method requires it |
11797 |
case $deplibs_check_method in |
11798 |
file_magic*) |
11799 |
@@ -5574,7 +5694,7 @@ |
11800 |
if test -n "$file_magic_test_file"; then |
11801 |
case $deplibs_check_method in |
11802 |
"file_magic "*) |
11803 |
- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" |
11804 |
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` |
11805 |
MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
11806 |
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | |
11807 |
$EGREP "$file_magic_regex" > /dev/null; then |
11808 |
@@ -5636,7 +5756,7 @@ |
11809 |
if test -n "$file_magic_test_file"; then |
11810 |
case $deplibs_check_method in |
11811 |
"file_magic "*) |
11812 |
- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" |
11813 |
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` |
11814 |
MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
11815 |
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | |
11816 |
$EGREP "$file_magic_regex" > /dev/null; then |
11817 |
@@ -5731,68 +5851,25 @@ |
11818 |
# If no C compiler was specified, use CC. |
11819 |
LTCC=${LTCC-"$CC"} |
11820 |
|
11821 |
+# If no C compiler flags were specified, use CFLAGS. |
11822 |
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} |
11823 |
+ |
11824 |
# Allow CC to be a program name with arguments. |
11825 |
compiler=$CC |
11826 |
|
11827 |
|
11828 |
-# |
11829 |
-# Check for any special shared library compilation flags. |
11830 |
-# |
11831 |
-lt_prog_cc_shlib= |
11832 |
-if test "$GCC" = no; then |
11833 |
- case $host_os in |
11834 |
- sco3.2v5*) |
11835 |
- lt_prog_cc_shlib='-belf' |
11836 |
- ;; |
11837 |
- esac |
11838 |
-fi |
11839 |
-if test -n "$lt_prog_cc_shlib"; then |
11840 |
- { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5 |
11841 |
-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;} |
11842 |
- if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then : |
11843 |
- else |
11844 |
- { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 |
11845 |
-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} |
11846 |
- lt_cv_prog_cc_can_build_shared=no |
11847 |
- fi |
11848 |
-fi |
11849 |
- |
11850 |
- |
11851 |
-# |
11852 |
-# Check to make sure the static flag actually works. |
11853 |
-# |
11854 |
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5 |
11855 |
-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6 |
11856 |
-if test "${lt_prog_compiler_static_works+set}" = set; then |
11857 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
11858 |
-else |
11859 |
- lt_prog_compiler_static_works=no |
11860 |
- save_LDFLAGS="$LDFLAGS" |
11861 |
- LDFLAGS="$LDFLAGS $lt_prog_compiler_static" |
11862 |
- printf "$lt_simple_link_test_code" > conftest.$ac_ext |
11863 |
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
11864 |
- # The compiler can only warn and ignore the option if not recognized |
11865 |
- # So say no if there are warnings |
11866 |
- if test -s conftest.err; then |
11867 |
- # Append any errors to the config.log. |
11868 |
- cat conftest.err 1>&5 |
11869 |
- else |
11870 |
- lt_prog_compiler_static_works=yes |
11871 |
- fi |
11872 |
- fi |
11873 |
- $rm conftest* |
11874 |
- LDFLAGS="$save_LDFLAGS" |
11875 |
- |
11876 |
-fi |
11877 |
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 |
11878 |
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 |
11879 |
- |
11880 |
-if test x"$lt_prog_compiler_static_works" = xyes; then |
11881 |
- : |
11882 |
-else |
11883 |
- lt_prog_compiler_static= |
11884 |
-fi |
11885 |
- |
11886 |
+# save warnings/boilerplate of simple test code |
11887 |
+ac_outfile=conftest.$ac_objext |
11888 |
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext |
11889 |
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
11890 |
+_lt_compiler_boilerplate=`cat conftest.err` |
11891 |
+$rm conftest* |
11892 |
+ |
11893 |
+ac_outfile=conftest.$ac_objext |
11894 |
+printf "$lt_simple_link_test_code" >conftest.$ac_ext |
11895 |
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
11896 |
+_lt_linker_boilerplate=`cat conftest.err` |
11897 |
+$rm conftest* |
11898 |
|
11899 |
|
11900 |
|
11901 |
@@ -5817,18 +5894,20 @@ |
11902 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
11903 |
# The option is referenced via a variable to avoid confusing sed. |
11904 |
lt_compile=`echo "$ac_compile" | $SED \ |
11905 |
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
11906 |
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
11907 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
11908 |
-e 's:$: $lt_compiler_flag:'` |
11909 |
- (eval echo "\"\$as_me:5823: $lt_compile\"" >&5) |
11910 |
+ (eval echo "\"\$as_me:5900: $lt_compile\"" >&5) |
11911 |
(eval "$lt_compile" 2>conftest.err) |
11912 |
ac_status=$? |
11913 |
cat conftest.err >&5 |
11914 |
- echo "$as_me:5827: \$? = $ac_status" >&5 |
11915 |
+ echo "$as_me:5904: \$? = $ac_status" >&5 |
11916 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
11917 |
# The compiler can only warn and ignore the option if not recognized |
11918 |
- # So say no if there are warnings |
11919 |
- if test ! -s conftest.err; then |
11920 |
+ # So say no if there are warnings other than the usual output. |
11921 |
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
11922 |
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
11923 |
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
11924 |
lt_cv_prog_compiler_rtti_exceptions=yes |
11925 |
fi |
11926 |
fi |
11927 |
@@ -5889,6 +5968,11 @@ |
11928 |
lt_prog_compiler_pic='-fno-common' |
11929 |
;; |
11930 |
|
11931 |
+ interix3*) |
11932 |
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
11933 |
+ # Instead, we relocate shared libraries at runtime. |
11934 |
+ ;; |
11935 |
+ |
11936 |
msdosdjgpp*) |
11937 |
# Just because we use GCC doesn't mean we suddenly get shared libraries |
11938 |
# on systems that don't support them. |
11939 |
@@ -5905,7 +5989,7 @@ |
11940 |
hpux*) |
11941 |
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
11942 |
# not for PA HP-UX. |
11943 |
- case "$host_cpu" in |
11944 |
+ case $host_cpu in |
11945 |
hppa*64*|ia64*) |
11946 |
# +Z the default |
11947 |
;; |
11948 |
@@ -5931,6 +6015,16 @@ |
11949 |
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' |
11950 |
fi |
11951 |
;; |
11952 |
+ darwin*) |
11953 |
+ # PIC is the default on this platform |
11954 |
+ # Common symbols not allowed in MH_DYLIB files |
11955 |
+ case $cc_basename in |
11956 |
+ xlc*) |
11957 |
+ lt_prog_compiler_pic='-qnocommon' |
11958 |
+ lt_prog_compiler_wl='-Wl,' |
11959 |
+ ;; |
11960 |
+ esac |
11961 |
+ ;; |
11962 |
|
11963 |
mingw* | pw32* | os2*) |
11964 |
# This hack is so that the source file can tell whether it is being |
11965 |
@@ -5942,7 +6036,7 @@ |
11966 |
lt_prog_compiler_wl='-Wl,' |
11967 |
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
11968 |
# not for PA HP-UX. |
11969 |
- case "$host_cpu" in |
11970 |
+ case $host_cpu in |
11971 |
hppa*64*|ia64*) |
11972 |
# +Z the default |
11973 |
;; |
11974 |
@@ -5966,12 +6060,19 @@ |
11975 |
;; |
11976 |
|
11977 |
linux*) |
11978 |
- case $CC in |
11979 |
+ case $cc_basename in |
11980 |
icc* | ecc*) |
11981 |
lt_prog_compiler_wl='-Wl,' |
11982 |
lt_prog_compiler_pic='-KPIC' |
11983 |
lt_prog_compiler_static='-static' |
11984 |
;; |
11985 |
+ pgcc* | pgf77* | pgf90* | pgf95*) |
11986 |
+ # Portland Group compilers (*not* the Pentium gcc compiler, |
11987 |
+ # which looks to be a dead project) |
11988 |
+ lt_prog_compiler_wl='-Wl,' |
11989 |
+ lt_prog_compiler_pic='-fpic' |
11990 |
+ lt_prog_compiler_static='-Bstatic' |
11991 |
+ ;; |
11992 |
ccc*) |
11993 |
lt_prog_compiler_wl='-Wl,' |
11994 |
# All Alpha code is PIC. |
11995 |
@@ -5986,15 +6087,15 @@ |
11996 |
lt_prog_compiler_static='-non_shared' |
11997 |
;; |
11998 |
|
11999 |
- sco3.2v5*) |
12000 |
- lt_prog_compiler_pic='-Kpic' |
12001 |
- lt_prog_compiler_static='-dn' |
12002 |
- ;; |
12003 |
- |
12004 |
solaris*) |
12005 |
- lt_prog_compiler_wl='-Wl,' |
12006 |
lt_prog_compiler_pic='-KPIC' |
12007 |
lt_prog_compiler_static='-Bstatic' |
12008 |
+ case $cc_basename in |
12009 |
+ f77* | f90* | f95*) |
12010 |
+ lt_prog_compiler_wl='-Qoption ld ';; |
12011 |
+ *) |
12012 |
+ lt_prog_compiler_wl='-Wl,';; |
12013 |
+ esac |
12014 |
;; |
12015 |
|
12016 |
sunos4*) |
12017 |
@@ -6003,7 +6104,7 @@ |
12018 |
lt_prog_compiler_static='-Bstatic' |
12019 |
;; |
12020 |
|
12021 |
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
12022 |
+ sysv4 | sysv4.2uw2* | sysv4.3*) |
12023 |
lt_prog_compiler_wl='-Wl,' |
12024 |
lt_prog_compiler_pic='-KPIC' |
12025 |
lt_prog_compiler_static='-Bstatic' |
12026 |
@@ -6016,6 +6117,17 @@ |
12027 |
fi |
12028 |
;; |
12029 |
|
12030 |
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) |
12031 |
+ lt_prog_compiler_wl='-Wl,' |
12032 |
+ lt_prog_compiler_pic='-KPIC' |
12033 |
+ lt_prog_compiler_static='-Bstatic' |
12034 |
+ ;; |
12035 |
+ |
12036 |
+ unicos*) |
12037 |
+ lt_prog_compiler_wl='-Wl,' |
12038 |
+ lt_prog_compiler_can_build_shared=no |
12039 |
+ ;; |
12040 |
+ |
12041 |
uts4*) |
12042 |
lt_prog_compiler_pic='-pic' |
12043 |
lt_prog_compiler_static='-Bstatic' |
12044 |
@@ -6050,18 +6162,20 @@ |
12045 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
12046 |
# The option is referenced via a variable to avoid confusing sed. |
12047 |
lt_compile=`echo "$ac_compile" | $SED \ |
12048 |
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
12049 |
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
12050 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
12051 |
-e 's:$: $lt_compiler_flag:'` |
12052 |
- (eval echo "\"\$as_me:6056: $lt_compile\"" >&5) |
12053 |
+ (eval echo "\"\$as_me:6168: $lt_compile\"" >&5) |
12054 |
(eval "$lt_compile" 2>conftest.err) |
12055 |
ac_status=$? |
12056 |
cat conftest.err >&5 |
12057 |
- echo "$as_me:6060: \$? = $ac_status" >&5 |
12058 |
+ echo "$as_me:6172: \$? = $ac_status" >&5 |
12059 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
12060 |
# The compiler can only warn and ignore the option if not recognized |
12061 |
- # So say no if there are warnings |
12062 |
- if test ! -s conftest.err; then |
12063 |
+ # So say no if there are warnings other than the usual output. |
12064 |
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
12065 |
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
12066 |
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
12067 |
lt_prog_compiler_pic_works=yes |
12068 |
fi |
12069 |
fi |
12070 |
@@ -6082,7 +6196,7 @@ |
12071 |
fi |
12072 |
|
12073 |
fi |
12074 |
-case "$host_os" in |
12075 |
+case $host_os in |
12076 |
# For platforms which do not support PIC, -DPIC is meaningless: |
12077 |
*djgpp*) |
12078 |
lt_prog_compiler_pic= |
12079 |
@@ -6092,6 +6206,48 @@ |
12080 |
;; |
12081 |
esac |
12082 |
|
12083 |
+# |
12084 |
+# Check to make sure the static flag actually works. |
12085 |
+# |
12086 |
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" |
12087 |
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
12088 |
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 |
12089 |
+if test "${lt_prog_compiler_static_works+set}" = set; then |
12090 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
12091 |
+else |
12092 |
+ lt_prog_compiler_static_works=no |
12093 |
+ save_LDFLAGS="$LDFLAGS" |
12094 |
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" |
12095 |
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext |
12096 |
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
12097 |
+ # The linker can only warn and ignore the option if not recognized |
12098 |
+ # So say no if there are warnings |
12099 |
+ if test -s conftest.err; then |
12100 |
+ # Append any errors to the config.log. |
12101 |
+ cat conftest.err 1>&5 |
12102 |
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
12103 |
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
12104 |
+ if diff conftest.exp conftest.er2 >/dev/null; then |
12105 |
+ lt_prog_compiler_static_works=yes |
12106 |
+ fi |
12107 |
+ else |
12108 |
+ lt_prog_compiler_static_works=yes |
12109 |
+ fi |
12110 |
+ fi |
12111 |
+ $rm conftest* |
12112 |
+ LDFLAGS="$save_LDFLAGS" |
12113 |
+ |
12114 |
+fi |
12115 |
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 |
12116 |
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 |
12117 |
+ |
12118 |
+if test x"$lt_prog_compiler_static_works" = xyes; then |
12119 |
+ : |
12120 |
+else |
12121 |
+ lt_prog_compiler_static= |
12122 |
+fi |
12123 |
+ |
12124 |
+ |
12125 |
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
12126 |
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 |
12127 |
if test "${lt_cv_prog_compiler_c_o+set}" = set; then |
12128 |
@@ -6110,23 +6266,25 @@ |
12129 |
# Note that $ac_compile itself does not contain backslashes and begins |
12130 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
12131 |
lt_compile=`echo "$ac_compile" | $SED \ |
12132 |
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
12133 |
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
12134 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
12135 |
-e 's:$: $lt_compiler_flag:'` |
12136 |
- (eval echo "\"\$as_me:6116: $lt_compile\"" >&5) |
12137 |
+ (eval echo "\"\$as_me:6272: $lt_compile\"" >&5) |
12138 |
(eval "$lt_compile" 2>out/conftest.err) |
12139 |
ac_status=$? |
12140 |
cat out/conftest.err >&5 |
12141 |
- echo "$as_me:6120: \$? = $ac_status" >&5 |
12142 |
+ echo "$as_me:6276: \$? = $ac_status" >&5 |
12143 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext |
12144 |
then |
12145 |
# The compiler can only warn and ignore the option if not recognized |
12146 |
# So say no if there are warnings |
12147 |
- if test ! -s out/conftest.err; then |
12148 |
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
12149 |
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
12150 |
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
12151 |
lt_cv_prog_compiler_c_o=yes |
12152 |
fi |
12153 |
fi |
12154 |
- chmod u+w . |
12155 |
+ chmod u+w . 2>&5 |
12156 |
$rm conftest* |
12157 |
# SGI C++ compiler will create directory out/ii_files/ for |
12158 |
# template instantiation |
12159 |
@@ -6202,6 +6360,16 @@ |
12160 |
# rely on this symbol name, it's probably fine to never include it in |
12161 |
# preloaded symbol tables. |
12162 |
extract_expsyms_cmds= |
12163 |
+ # Just being paranoid about ensuring that cc_basename is set. |
12164 |
+ for cc_temp in $compiler""; do |
12165 |
+ case $cc_temp in |
12166 |
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; |
12167 |
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; |
12168 |
+ \-*) ;; |
12169 |
+ *) break;; |
12170 |
+ esac |
12171 |
+done |
12172 |
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
12173 |
|
12174 |
case $host_os in |
12175 |
cygwin* | mingw* | pw32*) |
12176 |
@@ -6212,6 +6380,10 @@ |
12177 |
with_gnu_ld=no |
12178 |
fi |
12179 |
;; |
12180 |
+ interix*) |
12181 |
+ # we just hope/assume this is gcc and not c89 (= MSVC++) |
12182 |
+ with_gnu_ld=yes |
12183 |
+ ;; |
12184 |
openbsd*) |
12185 |
with_gnu_ld=no |
12186 |
;; |
12187 |
@@ -6222,6 +6394,27 @@ |
12188 |
# If archive_cmds runs LD, not CC, wlarc should be empty |
12189 |
wlarc='${wl}' |
12190 |
|
12191 |
+ # Set some defaults for GNU ld with shared library support. These |
12192 |
+ # are reset later if shared libraries are not supported. Putting them |
12193 |
+ # here allows them to be overridden if necessary. |
12194 |
+ runpath_var=LD_RUN_PATH |
12195 |
+ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' |
12196 |
+ export_dynamic_flag_spec='${wl}--export-dynamic' |
12197 |
+ # ancient GNU ld didn't support --whole-archive et. al. |
12198 |
+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then |
12199 |
+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
12200 |
+ else |
12201 |
+ whole_archive_flag_spec= |
12202 |
+ fi |
12203 |
+ supports_anon_versioning=no |
12204 |
+ case `$LD -v 2>/dev/null` in |
12205 |
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 |
12206 |
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
12207 |
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
12208 |
+ *\ 2.11.*) ;; # other 2.11 versions |
12209 |
+ *) supports_anon_versioning=yes ;; |
12210 |
+ esac |
12211 |
+ |
12212 |
# See if GNU ld supports shared libraries. |
12213 |
case $host_os in |
12214 |
aix3* | aix4* | aix5*) |
12215 |
@@ -6272,10 +6465,10 @@ |
12216 |
allow_undefined_flag=unsupported |
12217 |
always_export_symbols=no |
12218 |
enable_shared_with_static_runtimes=yes |
12219 |
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' |
12220 |
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' |
12221 |
|
12222 |
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then |
12223 |
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
12224 |
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
12225 |
# If the export-symbols file already is a .def file (1st line |
12226 |
# is EXPORTS), use it as is; otherwise, prepend... |
12227 |
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
12228 |
@@ -6284,7 +6477,54 @@ |
12229 |
echo EXPORTS > $output_objdir/$soname.def; |
12230 |
cat $export_symbols >> $output_objdir/$soname.def; |
12231 |
fi~ |
12232 |
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
12233 |
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
12234 |
+ else |
12235 |
+ ld_shlibs=no |
12236 |
+ fi |
12237 |
+ ;; |
12238 |
+ |
12239 |
+ interix3*) |
12240 |
+ hardcode_direct=no |
12241 |
+ hardcode_shlibpath_var=no |
12242 |
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' |
12243 |
+ export_dynamic_flag_spec='${wl}-E' |
12244 |
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. |
12245 |
+ # Instead, shared libraries are loaded at an image base (0x10000000 by |
12246 |
+ # default) and relocated if they conflict, which is a slow very memory |
12247 |
+ # consuming and fragmenting process. To avoid this, we pick a random, |
12248 |
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link |
12249 |
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. |
12250 |
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
12251 |
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
12252 |
+ ;; |
12253 |
+ |
12254 |
+ linux*) |
12255 |
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
12256 |
+ tmp_addflag= |
12257 |
+ case $cc_basename,$host_cpu in |
12258 |
+ pgcc*) # Portland Group C compiler |
12259 |
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
12260 |
+ tmp_addflag=' $pic_flag' |
12261 |
+ ;; |
12262 |
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
12263 |
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
12264 |
+ tmp_addflag=' $pic_flag -Mnomain' ;; |
12265 |
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
12266 |
+ tmp_addflag=' -i_dynamic' ;; |
12267 |
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 |
12268 |
+ tmp_addflag=' -i_dynamic -nofor_main' ;; |
12269 |
+ ifc* | ifort*) # Intel Fortran compiler |
12270 |
+ tmp_addflag=' -nofor_main' ;; |
12271 |
+ esac |
12272 |
+ archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
12273 |
+ |
12274 |
+ if test $supports_anon_versioning = yes; then |
12275 |
+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ |
12276 |
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
12277 |
+ $echo "local: *; };" >> $output_objdir/$libname.ver~ |
12278 |
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
12279 |
+ fi |
12280 |
+ link_all_deplibs=no |
12281 |
else |
12282 |
ld_shlibs=no |
12283 |
fi |
12284 |
@@ -6300,7 +6540,7 @@ |
12285 |
fi |
12286 |
;; |
12287 |
|
12288 |
- solaris* | sysv5*) |
12289 |
+ solaris*) |
12290 |
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then |
12291 |
ld_shlibs=no |
12292 |
cat <<EOF 1>&2 |
12293 |
@@ -6321,6 +6561,33 @@ |
12294 |
fi |
12295 |
;; |
12296 |
|
12297 |
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) |
12298 |
+ case `$LD -v 2>&1` in |
12299 |
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) |
12300 |
+ ld_shlibs=no |
12301 |
+ cat <<_LT_EOF 1>&2 |
12302 |
+ |
12303 |
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not |
12304 |
+*** reliably create shared libraries on SCO systems. Therefore, libtool |
12305 |
+*** is disabling shared libraries support. We urge you to upgrade GNU |
12306 |
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify |
12307 |
+*** your PATH or compiler configuration so that the native linker is |
12308 |
+*** used, and then restart. |
12309 |
+ |
12310 |
+_LT_EOF |
12311 |
+ ;; |
12312 |
+ *) |
12313 |
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
12314 |
+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' |
12315 |
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' |
12316 |
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' |
12317 |
+ else |
12318 |
+ ld_shlibs=no |
12319 |
+ fi |
12320 |
+ ;; |
12321 |
+ esac |
12322 |
+ ;; |
12323 |
+ |
12324 |
sunos4*) |
12325 |
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
12326 |
wlarc= |
12327 |
@@ -6328,32 +6595,6 @@ |
12328 |
hardcode_shlibpath_var=no |
12329 |
;; |
12330 |
|
12331 |
- linux*) |
12332 |
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
12333 |
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
12334 |
- archive_cmds="$tmp_archive_cmds" |
12335 |
- supports_anon_versioning=no |
12336 |
- case `$LD -v 2>/dev/null` in |
12337 |
- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 |
12338 |
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
12339 |
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
12340 |
- *\ 2.11.*) ;; # other 2.11 versions |
12341 |
- *) supports_anon_versioning=yes ;; |
12342 |
- esac |
12343 |
- if test $supports_anon_versioning = yes; then |
12344 |
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ |
12345 |
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
12346 |
-$echo "local: *; };" >> $output_objdir/$libname.ver~ |
12347 |
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
12348 |
- else |
12349 |
- archive_expsym_cmds="$tmp_archive_cmds" |
12350 |
- fi |
12351 |
- link_all_deplibs=no |
12352 |
- else |
12353 |
- ld_shlibs=no |
12354 |
- fi |
12355 |
- ;; |
12356 |
- |
12357 |
*) |
12358 |
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
12359 |
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
12360 |
@@ -6364,16 +6605,11 @@ |
12361 |
;; |
12362 |
esac |
12363 |
|
12364 |
- if test "$ld_shlibs" = yes; then |
12365 |
- runpath_var=LD_RUN_PATH |
12366 |
- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' |
12367 |
- export_dynamic_flag_spec='${wl}--export-dynamic' |
12368 |
- # ancient GNU ld didn't support --whole-archive et. al. |
12369 |
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then |
12370 |
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
12371 |
- else |
12372 |
- whole_archive_flag_spec= |
12373 |
- fi |
12374 |
+ if test "$ld_shlibs" = no; then |
12375 |
+ runpath_var= |
12376 |
+ hardcode_libdir_flag_spec= |
12377 |
+ export_dynamic_flag_spec= |
12378 |
+ whole_archive_flag_spec= |
12379 |
fi |
12380 |
else |
12381 |
# PORTME fill in a description of your system's linker (not GNU ld) |
12382 |
@@ -6385,7 +6621,7 @@ |
12383 |
# Note: this linker hardcodes the directories in LIBPATH if there |
12384 |
# are no directories specified by -L. |
12385 |
hardcode_minus_L=yes |
12386 |
- if test "$GCC" = yes && test -z "$link_static_flag"; then |
12387 |
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then |
12388 |
# Neither direct hardcoding nor static linking is supported with a |
12389 |
# broken collect2. |
12390 |
hardcode_direct=unsupported |
12391 |
@@ -6419,6 +6655,7 @@ |
12392 |
break |
12393 |
fi |
12394 |
done |
12395 |
+ ;; |
12396 |
esac |
12397 |
|
12398 |
exp_sym_flag='-bexport' |
12399 |
@@ -6437,7 +6674,7 @@ |
12400 |
link_all_deplibs=yes |
12401 |
|
12402 |
if test "$GCC" = yes; then |
12403 |
- case $host_os in aix4.012|aix4.012.*) |
12404 |
+ case $host_os in aix4.[012]|aix4.[012].*) |
12405 |
# We only want to do this on AIX 4.2 and lower, the check |
12406 |
# below for broken collect2 doesn't work under 4.3+ |
12407 |
collect2name=`${CC} -print-prog-name=collect2` |
12408 |
@@ -6456,8 +6693,12 @@ |
12409 |
hardcode_libdir_flag_spec='-L$libdir' |
12410 |
hardcode_libdir_separator= |
12411 |
fi |
12412 |
+ ;; |
12413 |
esac |
12414 |
shared_flag='-shared' |
12415 |
+ if test "$aix_use_runtimelinking" = yes; then |
12416 |
+ shared_flag="$shared_flag "'${wl}-G' |
12417 |
+ fi |
12418 |
else |
12419 |
# not using gcc |
12420 |
if test "$host_cpu" = ia64; then |
12421 |
@@ -6465,11 +6706,11 @@ |
12422 |
# chokes on -Wl,-G. The following line is correct: |
12423 |
shared_flag='-G' |
12424 |
else |
12425 |
- if test "$aix_use_runtimelinking" = yes; then |
12426 |
+ if test "$aix_use_runtimelinking" = yes; then |
12427 |
shared_flag='${wl}-G' |
12428 |
else |
12429 |
shared_flag='${wl}-bM:SRE' |
12430 |
- fi |
12431 |
+ fi |
12432 |
fi |
12433 |
fi |
12434 |
|
12435 |
@@ -6533,12 +6774,12 @@ |
12436 |
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
12437 |
|
12438 |
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
12439 |
- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
12440 |
+ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
12441 |
else |
12442 |
if test "$host_cpu" = ia64; then |
12443 |
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
12444 |
allow_undefined_flag="-z nodefs" |
12445 |
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" |
12446 |
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" |
12447 |
else |
12448 |
# Determine the default libpath from the value encoded in an empty executable. |
12449 |
cat >conftest.$ac_ext <<_ACEOF |
12450 |
@@ -6597,13 +6838,11 @@ |
12451 |
# -berok will link without error, but may produce a broken library. |
12452 |
no_undefined_flag=' ${wl}-bernotok' |
12453 |
allow_undefined_flag=' ${wl}-berok' |
12454 |
- # -bexpall does not export symbols beginning with underscore (_) |
12455 |
- always_export_symbols=yes |
12456 |
# Exported symbols can be pulled into shared objects from archives |
12457 |
- whole_archive_flag_spec=' ' |
12458 |
+ whole_archive_flag_spec='$convenience' |
12459 |
archive_cmds_need_lc=yes |
12460 |
- # This is similar to how AIX traditionally builds it's shared libraries. |
12461 |
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
12462 |
+ # This is similar to how AIX traditionally builds its shared libraries. |
12463 |
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
12464 |
fi |
12465 |
fi |
12466 |
;; |
12467 |
@@ -6616,7 +6855,7 @@ |
12468 |
ld_shlibs=no |
12469 |
;; |
12470 |
|
12471 |
- bsdi4*) |
12472 |
+ bsdi[45]*) |
12473 |
export_dynamic_flag_spec=-rdynamic |
12474 |
;; |
12475 |
|
12476 |
@@ -6642,52 +6881,52 @@ |
12477 |
;; |
12478 |
|
12479 |
darwin* | rhapsody*) |
12480 |
- if test "$GXX" = yes ; then |
12481 |
- archive_cmds_need_lc=no |
12482 |
- case "$host_os" in |
12483 |
- rhapsody* | darwin1.[012]) |
12484 |
- allow_undefined_flag='-undefined suppress' |
12485 |
- ;; |
12486 |
- *) # Darwin 1.3 on |
12487 |
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
12488 |
- allow_undefined_flag='-flat_namespace -undefined suppress' |
12489 |
- else |
12490 |
- case ${MACOSX_DEPLOYMENT_TARGET} in |
12491 |
- 10.[012]) |
12492 |
- allow_undefined_flag='-flat_namespace -undefined suppress' |
12493 |
- ;; |
12494 |
- 10.*) |
12495 |
- allow_undefined_flag='-undefined dynamic_lookup' |
12496 |
- ;; |
12497 |
- esac |
12498 |
- fi |
12499 |
- ;; |
12500 |
+ case $host_os in |
12501 |
+ rhapsody* | darwin1.[012]) |
12502 |
+ allow_undefined_flag='${wl}-undefined ${wl}suppress' |
12503 |
+ ;; |
12504 |
+ *) # Darwin 1.3 on |
12505 |
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
12506 |
+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
12507 |
+ else |
12508 |
+ case ${MACOSX_DEPLOYMENT_TARGET} in |
12509 |
+ 10.[012]) |
12510 |
+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
12511 |
+ ;; |
12512 |
+ 10.*) |
12513 |
+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' |
12514 |
+ ;; |
12515 |
+ esac |
12516 |
+ fi |
12517 |
+ ;; |
12518 |
esac |
12519 |
- lt_int_apple_cc_single_mod=no |
12520 |
- output_verbose_link_cmd='echo' |
12521 |
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then |
12522 |
- lt_int_apple_cc_single_mod=yes |
12523 |
- fi |
12524 |
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
12525 |
- archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
12526 |
- else |
12527 |
- archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
12528 |
- fi |
12529 |
- module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
12530 |
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
12531 |
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
12532 |
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
12533 |
- else |
12534 |
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
12535 |
- fi |
12536 |
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
12537 |
+ archive_cmds_need_lc=no |
12538 |
hardcode_direct=no |
12539 |
hardcode_automatic=yes |
12540 |
hardcode_shlibpath_var=unsupported |
12541 |
- whole_archive_flag_spec='-all_load $convenience' |
12542 |
+ whole_archive_flag_spec='' |
12543 |
link_all_deplibs=yes |
12544 |
+ if test "$GCC" = yes ; then |
12545 |
+ output_verbose_link_cmd='echo' |
12546 |
+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
12547 |
+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
12548 |
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
12549 |
+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
12550 |
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
12551 |
else |
12552 |
- ld_shlibs=no |
12553 |
+ case $cc_basename in |
12554 |
+ xlc*) |
12555 |
+ output_verbose_link_cmd='echo' |
12556 |
+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' |
12557 |
+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
12558 |
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
12559 |
+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
12560 |
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
12561 |
+ ;; |
12562 |
+ *) |
12563 |
+ ld_shlibs=no |
12564 |
+ ;; |
12565 |
+ esac |
12566 |
fi |
12567 |
;; |
12568 |
|
12569 |
@@ -6721,11 +6960,20 @@ |
12570 |
;; |
12571 |
|
12572 |
# FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
12573 |
- freebsd* | kfreebsd*-gnu) |
12574 |
+ freebsd* | dragonfly*) |
12575 |
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
12576 |
+ hardcode_libdir_flag_spec='-R$libdir' |
12577 |
+ hardcode_direct=yes |
12578 |
+ hardcode_shlibpath_var=no |
12579 |
+ ;; |
12580 |
+ |
12581 |
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries. |
12582 |
+ kfreebsd*-gnu) |
12583 |
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
12584 |
hardcode_libdir_flag_spec='-R$libdir' |
12585 |
hardcode_direct=yes |
12586 |
hardcode_shlibpath_var=no |
12587 |
+ link_all_deplibs=no |
12588 |
;; |
12589 |
|
12590 |
hpux9*) |
12591 |
@@ -6744,47 +6992,62 @@ |
12592 |
export_dynamic_flag_spec='${wl}-E' |
12593 |
;; |
12594 |
|
12595 |
- hpux10* | hpux11*) |
12596 |
+ hpux10*) |
12597 |
if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
12598 |
- case "$host_cpu" in |
12599 |
- hppa*64*|ia64*) |
12600 |
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
12601 |
+ else |
12602 |
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
12603 |
+ fi |
12604 |
+ if test "$with_gnu_ld" = no; then |
12605 |
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
12606 |
+ hardcode_libdir_separator=: |
12607 |
+ |
12608 |
+ hardcode_direct=yes |
12609 |
+ export_dynamic_flag_spec='${wl}-E' |
12610 |
+ |
12611 |
+ # hardcode_minus_L: Not really in the search PATH, |
12612 |
+ # but as the default location of the library. |
12613 |
+ hardcode_minus_L=yes |
12614 |
+ fi |
12615 |
+ ;; |
12616 |
+ |
12617 |
+ hpux11*) |
12618 |
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
12619 |
+ case $host_cpu in |
12620 |
+ hppa*64*) |
12621 |
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
12622 |
;; |
12623 |
+ ia64*) |
12624 |
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
12625 |
+ ;; |
12626 |
*) |
12627 |
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
12628 |
;; |
12629 |
esac |
12630 |
else |
12631 |
- case "$host_cpu" in |
12632 |
- hppa*64*|ia64*) |
12633 |
- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' |
12634 |
+ case $host_cpu in |
12635 |
+ hppa*64*) |
12636 |
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
12637 |
+ ;; |
12638 |
+ ia64*) |
12639 |
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
12640 |
;; |
12641 |
*) |
12642 |
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
12643 |
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
12644 |
;; |
12645 |
esac |
12646 |
fi |
12647 |
if test "$with_gnu_ld" = no; then |
12648 |
- case "$host_cpu" in |
12649 |
- hppa*64*) |
12650 |
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
12651 |
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
12652 |
+ hardcode_libdir_separator=: |
12653 |
+ |
12654 |
+ case $host_cpu in |
12655 |
+ hppa*64*|ia64*) |
12656 |
hardcode_libdir_flag_spec_ld='+b $libdir' |
12657 |
- hardcode_libdir_separator=: |
12658 |
- hardcode_direct=no |
12659 |
- hardcode_shlibpath_var=no |
12660 |
- ;; |
12661 |
- ia64*) |
12662 |
- hardcode_libdir_flag_spec='-L$libdir' |
12663 |
hardcode_direct=no |
12664 |
hardcode_shlibpath_var=no |
12665 |
- |
12666 |
- # hardcode_minus_L: Not really in the search PATH, |
12667 |
- # but as the default location of the library. |
12668 |
- hardcode_minus_L=yes |
12669 |
;; |
12670 |
*) |
12671 |
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
12672 |
- hardcode_libdir_separator=: |
12673 |
hardcode_direct=yes |
12674 |
export_dynamic_flag_spec='${wl}-E' |
12675 |
|
12676 |
@@ -6832,6 +7095,7 @@ |
12677 |
hardcode_shlibpath_var=no |
12678 |
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
12679 |
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
12680 |
+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' |
12681 |
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' |
12682 |
export_dynamic_flag_spec='${wl}-E' |
12683 |
else |
12684 |
@@ -6877,7 +7141,7 @@ |
12685 |
allow_undefined_flag=' -expect_unresolved \*' |
12686 |
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
12687 |
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ |
12688 |
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' |
12689 |
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' |
12690 |
|
12691 |
# Both c and cxx compiler support -rpath directly |
12692 |
hardcode_libdir_flag_spec='-rpath $libdir' |
12693 |
@@ -6885,21 +7149,15 @@ |
12694 |
hardcode_libdir_separator=: |
12695 |
;; |
12696 |
|
12697 |
- sco3.2v5*) |
12698 |
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' |
12699 |
- hardcode_shlibpath_var=no |
12700 |
- export_dynamic_flag_spec='${wl}-Bexport' |
12701 |
- runpath_var=LD_RUN_PATH |
12702 |
- hardcode_runpath_var=yes |
12703 |
- ;; |
12704 |
- |
12705 |
solaris*) |
12706 |
no_undefined_flag=' -z text' |
12707 |
if test "$GCC" = yes; then |
12708 |
+ wlarc='${wl}' |
12709 |
archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
12710 |
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
12711 |
$CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' |
12712 |
else |
12713 |
+ wlarc='' |
12714 |
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
12715 |
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
12716 |
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' |
12717 |
@@ -6908,8 +7166,18 @@ |
12718 |
hardcode_shlibpath_var=no |
12719 |
case $host_os in |
12720 |
solaris2.[0-5] | solaris2.[0-5].*) ;; |
12721 |
- *) # Supported since Solaris 2.6 (maybe 2.5.1?) |
12722 |
- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; |
12723 |
+ *) |
12724 |
+ # The compiler driver will combine linker options so we |
12725 |
+ # cannot just pass the convience library names through |
12726 |
+ # without $wl, iff we do not link with $LD. |
12727 |
+ # Luckily, gcc supports the same syntax we need for Sun Studio. |
12728 |
+ # Supported since Solaris 2.6 (maybe 2.5.1?) |
12729 |
+ case $wlarc in |
12730 |
+ '') |
12731 |
+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; |
12732 |
+ *) |
12733 |
+ whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; |
12734 |
+ esac ;; |
12735 |
esac |
12736 |
link_all_deplibs=yes |
12737 |
;; |
12738 |
@@ -6966,36 +7234,45 @@ |
12739 |
fi |
12740 |
;; |
12741 |
|
12742 |
- sysv4.2uw2*) |
12743 |
- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' |
12744 |
- hardcode_direct=yes |
12745 |
- hardcode_minus_L=no |
12746 |
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) |
12747 |
+ no_undefined_flag='${wl}-z,text' |
12748 |
+ archive_cmds_need_lc=no |
12749 |
hardcode_shlibpath_var=no |
12750 |
- hardcode_runpath_var=yes |
12751 |
- runpath_var=LD_RUN_PATH |
12752 |
- ;; |
12753 |
+ runpath_var='LD_RUN_PATH' |
12754 |
|
12755 |
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) |
12756 |
- no_undefined_flag='${wl}-z ${wl}text' |
12757 |
if test "$GCC" = yes; then |
12758 |
- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
12759 |
+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
12760 |
+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
12761 |
else |
12762 |
- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
12763 |
+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
12764 |
+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
12765 |
fi |
12766 |
- runpath_var='LD_RUN_PATH' |
12767 |
- hardcode_shlibpath_var=no |
12768 |
;; |
12769 |
|
12770 |
- sysv5*) |
12771 |
- no_undefined_flag=' -z text' |
12772 |
- # $CC -shared without GNU ld will not create a library from C++ |
12773 |
- # object files and a static libstdc++, better avoid it by now |
12774 |
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
12775 |
- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
12776 |
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' |
12777 |
- hardcode_libdir_flag_spec= |
12778 |
+ sysv5* | sco3.2v5* | sco5v6*) |
12779 |
+ # Note: We can NOT use -z defs as we might desire, because we do not |
12780 |
+ # link with -lc, and that would cause any symbols used from libc to |
12781 |
+ # always be unresolved, which means just about no library would |
12782 |
+ # ever link correctly. If we're not using GNU ld we use -z text |
12783 |
+ # though, which does catch some bad symbols but isn't as heavy-handed |
12784 |
+ # as -z defs. |
12785 |
+ no_undefined_flag='${wl}-z,text' |
12786 |
+ allow_undefined_flag='${wl}-z,nodefs' |
12787 |
+ archive_cmds_need_lc=no |
12788 |
hardcode_shlibpath_var=no |
12789 |
+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' |
12790 |
+ hardcode_libdir_separator=':' |
12791 |
+ link_all_deplibs=yes |
12792 |
+ export_dynamic_flag_spec='${wl}-Bexport' |
12793 |
runpath_var='LD_RUN_PATH' |
12794 |
+ |
12795 |
+ if test "$GCC" = yes; then |
12796 |
+ archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
12797 |
+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
12798 |
+ else |
12799 |
+ archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
12800 |
+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
12801 |
+ fi |
12802 |
;; |
12803 |
|
12804 |
uts4*) |
12805 |
@@ -7014,11 +7291,6 @@ |
12806 |
echo "${ECHO_T}$ld_shlibs" >&6 |
12807 |
test "$ld_shlibs" = no && can_build_shared=no |
12808 |
|
12809 |
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
12810 |
-if test "$GCC" = yes; then |
12811 |
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
12812 |
-fi |
12813 |
- |
12814 |
# |
12815 |
# Do we need to explicitly link libc? |
12816 |
# |
12817 |
@@ -7051,6 +7323,7 @@ |
12818 |
libobjs=conftest.$ac_objext |
12819 |
deplibs= |
12820 |
wl=$lt_prog_compiler_wl |
12821 |
+ pic_flag=$lt_prog_compiler_pic |
12822 |
compiler_flags=-v |
12823 |
linker_flags=-v |
12824 |
verstring= |
12825 |
@@ -7183,7 +7456,7 @@ |
12826 |
shlibpath_var=LIBRARY_PATH |
12827 |
;; |
12828 |
|
12829 |
-bsdi4*) |
12830 |
+bsdi[45]*) |
12831 |
version_type=linux |
12832 |
need_version=no |
12833 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
12834 |
@@ -7211,7 +7484,8 @@ |
12835 |
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ |
12836 |
dldir=$destdir/`dirname \$dlpath`~ |
12837 |
test -d \$dldir || mkdir -p \$dldir~ |
12838 |
- $install_prog $dir/$dlname \$dldir/$dlname' |
12839 |
+ $install_prog $dir/$dlname \$dldir/$dlname~ |
12840 |
+ chmod a+x \$dldir/$dlname' |
12841 |
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
12842 |
dlpath=$dir/\$dldll~ |
12843 |
$rm \$dlpath' |
12844 |
@@ -7241,7 +7515,7 @@ |
12845 |
;; |
12846 |
pw32*) |
12847 |
# pw32 DLLs use 'pw' prefix rather than 'lib' |
12848 |
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' |
12849 |
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
12850 |
;; |
12851 |
esac |
12852 |
;; |
12853 |
@@ -7264,7 +7538,7 @@ |
12854 |
soname_spec='${libname}${release}${major}$shared_ext' |
12855 |
shlibpath_overrides_runpath=yes |
12856 |
shlibpath_var=DYLD_LIBRARY_PATH |
12857 |
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' |
12858 |
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
12859 |
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
12860 |
if test "$GCC" = yes; then |
12861 |
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` |
12862 |
@@ -7299,8 +7573,17 @@ |
12863 |
dynamic_linker='GNU ld.so' |
12864 |
;; |
12865 |
|
12866 |
-freebsd*) |
12867 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
12868 |
+freebsd* | dragonfly*) |
12869 |
+ # DragonFly does not have aout. When/if they implement a new |
12870 |
+ # versioning mechanism, adjust this. |
12871 |
+ if test -x /usr/bin/objformat; then |
12872 |
+ objformat=`/usr/bin/objformat` |
12873 |
+ else |
12874 |
+ case $host_os in |
12875 |
+ freebsd[123]*) objformat=aout ;; |
12876 |
+ *) objformat=elf ;; |
12877 |
+ esac |
12878 |
+ fi |
12879 |
version_type=freebsd-$objformat |
12880 |
case $version_type in |
12881 |
freebsd-elf*) |
12882 |
@@ -7318,14 +7601,19 @@ |
12883 |
freebsd2*) |
12884 |
shlibpath_overrides_runpath=yes |
12885 |
;; |
12886 |
- freebsd3.01* | freebsdelf3.01*) |
12887 |
+ freebsd3.[01]* | freebsdelf3.[01]*) |
12888 |
shlibpath_overrides_runpath=yes |
12889 |
hardcode_into_libs=yes |
12890 |
;; |
12891 |
- *) # from 3.2 on |
12892 |
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ |
12893 |
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) |
12894 |
shlibpath_overrides_runpath=no |
12895 |
hardcode_into_libs=yes |
12896 |
;; |
12897 |
+ freebsd*) # from 4.6 on |
12898 |
+ shlibpath_overrides_runpath=yes |
12899 |
+ hardcode_into_libs=yes |
12900 |
+ ;; |
12901 |
esac |
12902 |
;; |
12903 |
|
12904 |
@@ -7345,7 +7633,7 @@ |
12905 |
version_type=sunos |
12906 |
need_lib_prefix=no |
12907 |
need_version=no |
12908 |
- case "$host_cpu" in |
12909 |
+ case $host_cpu in |
12910 |
ia64*) |
12911 |
shrext_cmds='.so' |
12912 |
hardcode_into_libs=yes |
12913 |
@@ -7385,6 +7673,18 @@ |
12914 |
postinstall_cmds='chmod 555 $lib' |
12915 |
;; |
12916 |
|
12917 |
+interix3*) |
12918 |
+ version_type=linux |
12919 |
+ need_lib_prefix=no |
12920 |
+ need_version=no |
12921 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
12922 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
12923 |
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' |
12924 |
+ shlibpath_var=LD_LIBRARY_PATH |
12925 |
+ shlibpath_overrides_runpath=no |
12926 |
+ hardcode_into_libs=yes |
12927 |
+ ;; |
12928 |
+ |
12929 |
irix5* | irix6* | nonstopux*) |
12930 |
case $host_os in |
12931 |
nonstopux*) version_type=nonstopux ;; |
12932 |
@@ -7444,7 +7744,7 @@ |
12933 |
|
12934 |
# Append ld.so.conf contents to the search path |
12935 |
if test -f /etc/ld.so.conf; then |
12936 |
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` |
12937 |
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
12938 |
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
12939 |
fi |
12940 |
|
12941 |
@@ -7518,8 +7818,13 @@ |
12942 |
|
12943 |
openbsd*) |
12944 |
version_type=sunos |
12945 |
+ sys_lib_dlsearch_path_spec="/usr/lib" |
12946 |
need_lib_prefix=no |
12947 |
- need_version=yes |
12948 |
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. |
12949 |
+ case $host_os in |
12950 |
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; |
12951 |
+ *) need_version=no ;; |
12952 |
+ esac |
12953 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
12954 |
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
12955 |
shlibpath_var=LD_LIBRARY_PATH |
12956 |
@@ -7557,13 +7862,6 @@ |
12957 |
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" |
12958 |
;; |
12959 |
|
12960 |
-sco3.2v5*) |
12961 |
- version_type=osf |
12962 |
- soname_spec='${libname}${release}${shared_ext}$major' |
12963 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
12964 |
- shlibpath_var=LD_LIBRARY_PATH |
12965 |
- ;; |
12966 |
- |
12967 |
solaris*) |
12968 |
version_type=linux |
12969 |
need_lib_prefix=no |
12970 |
@@ -7589,7 +7887,7 @@ |
12971 |
need_version=yes |
12972 |
;; |
12973 |
|
12974 |
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
12975 |
+sysv4 | sysv4.3*) |
12976 |
version_type=linux |
12977 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
12978 |
soname_spec='${libname}${release}${shared_ext}$major' |
12979 |
@@ -7622,6 +7920,29 @@ |
12980 |
fi |
12981 |
;; |
12982 |
|
12983 |
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
12984 |
+ version_type=freebsd-elf |
12985 |
+ need_lib_prefix=no |
12986 |
+ need_version=no |
12987 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
12988 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
12989 |
+ shlibpath_var=LD_LIBRARY_PATH |
12990 |
+ hardcode_into_libs=yes |
12991 |
+ if test "$with_gnu_ld" = yes; then |
12992 |
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' |
12993 |
+ shlibpath_overrides_runpath=no |
12994 |
+ else |
12995 |
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' |
12996 |
+ shlibpath_overrides_runpath=yes |
12997 |
+ case $host_os in |
12998 |
+ sco3.2v5*) |
12999 |
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" |
13000 |
+ ;; |
13001 |
+ esac |
13002 |
+ fi |
13003 |
+ sys_lib_dlsearch_path_spec='/usr/lib' |
13004 |
+ ;; |
13005 |
+ |
13006 |
uts4*) |
13007 |
version_type=linux |
13008 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
13009 |
@@ -7637,12 +7958,17 @@ |
13010 |
echo "${ECHO_T}$dynamic_linker" >&6 |
13011 |
test "$dynamic_linker" = no && can_build_shared=no |
13012 |
|
13013 |
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
13014 |
+if test "$GCC" = yes; then |
13015 |
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
13016 |
+fi |
13017 |
+ |
13018 |
echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
13019 |
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 |
13020 |
hardcode_action= |
13021 |
if test -n "$hardcode_libdir_flag_spec" || \ |
13022 |
- test -n "$runpath_var " || \ |
13023 |
- test "X$hardcode_automatic"="Xyes" ; then |
13024 |
+ test -n "$runpath_var" || \ |
13025 |
+ test "X$hardcode_automatic" = "Xyes" ; then |
13026 |
|
13027 |
# We can hardcode non-existant directories. |
13028 |
if test "$hardcode_direct" != no && |
13029 |
@@ -8285,7 +8611,7 @@ |
13030 |
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" |
13031 |
|
13032 |
save_LDFLAGS="$LDFLAGS" |
13033 |
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" |
13034 |
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" |
13035 |
|
13036 |
save_LIBS="$LIBS" |
13037 |
LIBS="$lt_cv_dlopen_libs $LIBS" |
13038 |
@@ -8301,7 +8627,7 @@ |
13039 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
13040 |
lt_status=$lt_dlunknown |
13041 |
cat > conftest.$ac_ext <<EOF |
13042 |
-#line 8304 "configure" |
13043 |
+#line 8630 "configure" |
13044 |
#include "confdefs.h" |
13045 |
|
13046 |
#if HAVE_DLFCN_H |
13047 |
@@ -8358,6 +8684,8 @@ |
13048 |
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
13049 |
/* dlclose (self); */ |
13050 |
} |
13051 |
+ else |
13052 |
+ puts (dlerror ()); |
13053 |
|
13054 |
exit (status); |
13055 |
} |
13056 |
@@ -8367,12 +8695,12 @@ |
13057 |
ac_status=$? |
13058 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
13059 |
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then |
13060 |
- (./conftest; exit; ) 2>/dev/null |
13061 |
+ (./conftest; exit; ) >&5 2>/dev/null |
13062 |
lt_status=$? |
13063 |
case x$lt_status in |
13064 |
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; |
13065 |
x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; |
13066 |
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; |
13067 |
+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; |
13068 |
esac |
13069 |
else : |
13070 |
# compilation failed |
13071 |
@@ -8387,7 +8715,7 @@ |
13072 |
echo "${ECHO_T}$lt_cv_dlopen_self" >&6 |
13073 |
|
13074 |
if test "x$lt_cv_dlopen_self" = xyes; then |
13075 |
- LDFLAGS="$LDFLAGS $link_static_flag" |
13076 |
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" |
13077 |
echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 |
13078 |
echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 |
13079 |
if test "${lt_cv_dlopen_self_static+set}" = set; then |
13080 |
@@ -8399,7 +8727,7 @@ |
13081 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
13082 |
lt_status=$lt_dlunknown |
13083 |
cat > conftest.$ac_ext <<EOF |
13084 |
-#line 8402 "configure" |
13085 |
+#line 8730 "configure" |
13086 |
#include "confdefs.h" |
13087 |
|
13088 |
#if HAVE_DLFCN_H |
13089 |
@@ -8456,6 +8784,8 @@ |
13090 |
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
13091 |
/* dlclose (self); */ |
13092 |
} |
13093 |
+ else |
13094 |
+ puts (dlerror ()); |
13095 |
|
13096 |
exit (status); |
13097 |
} |
13098 |
@@ -8465,12 +8795,12 @@ |
13099 |
ac_status=$? |
13100 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
13101 |
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then |
13102 |
- (./conftest; exit; ) 2>/dev/null |
13103 |
+ (./conftest; exit; ) >&5 2>/dev/null |
13104 |
lt_status=$? |
13105 |
case x$lt_status in |
13106 |
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; |
13107 |
x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; |
13108 |
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; |
13109 |
+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; |
13110 |
esac |
13111 |
else : |
13112 |
# compilation failed |
13113 |
@@ -8503,7 +8833,7 @@ |
13114 |
fi |
13115 |
|
13116 |
|
13117 |
-# Report which librarie types wil actually be built |
13118 |
+# Report which library types will actually be built |
13119 |
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 |
13120 |
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 |
13121 |
echo "$as_me:$LINENO: result: $can_build_shared" >&5 |
13122 |
@@ -8515,7 +8845,7 @@ |
13123 |
|
13124 |
# On AIX, shared libraries and static libraries use the same namespace, and |
13125 |
# are all built from PIC. |
13126 |
-case "$host_os" in |
13127 |
+case $host_os in |
13128 |
aix3*) |
13129 |
test "$enable_shared" = yes && enable_static=no |
13130 |
if test -n "$RANLIB"; then |
13131 |
@@ -8528,43 +8858,6 @@ |
13132 |
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then |
13133 |
test "$enable_shared" = yes && enable_static=no |
13134 |
fi |
13135 |
- ;; |
13136 |
- darwin* | rhapsody*) |
13137 |
- if test "$GCC" = yes; then |
13138 |
- archive_cmds_need_lc=no |
13139 |
- case "$host_os" in |
13140 |
- rhapsody* | darwin1.[012]) |
13141 |
- allow_undefined_flag='-undefined suppress' |
13142 |
- ;; |
13143 |
- *) # Darwin 1.3 on |
13144 |
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
13145 |
- allow_undefined_flag='-flat_namespace -undefined suppress' |
13146 |
- else |
13147 |
- case ${MACOSX_DEPLOYMENT_TARGET} in |
13148 |
- 10.[012]) |
13149 |
- allow_undefined_flag='-flat_namespace -undefined suppress' |
13150 |
- ;; |
13151 |
- 10.*) |
13152 |
- allow_undefined_flag='-undefined dynamic_lookup' |
13153 |
- ;; |
13154 |
- esac |
13155 |
- fi |
13156 |
- ;; |
13157 |
- esac |
13158 |
- output_verbose_link_cmd='echo' |
13159 |
- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' |
13160 |
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
13161 |
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
13162 |
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
13163 |
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
13164 |
- hardcode_direct=no |
13165 |
- hardcode_automatic=yes |
13166 |
- hardcode_shlibpath_var=unsupported |
13167 |
- whole_archive_flag_spec='-all_load $convenience' |
13168 |
- link_all_deplibs=yes |
13169 |
- else |
13170 |
- ld_shlibs=no |
13171 |
- fi |
13172 |
;; |
13173 |
esac |
13174 |
echo "$as_me:$LINENO: result: $enable_shared" >&5 |
13175 |
@@ -8590,7 +8883,7 @@ |
13176 |
# Now quote all the things that may contain metacharacters while being |
13177 |
# careful not to overquote the AC_SUBSTed values. We take copies of the |
13178 |
# variables and quote the copies for generation of the libtool script. |
13179 |
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ |
13180 |
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ |
13181 |
SED SHELL STRIP \ |
13182 |
libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
13183 |
old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
13184 |
@@ -8694,7 +8987,7 @@ |
13185 |
# |
13186 |
# You should have received a copy of the GNU General Public License |
13187 |
# along with this program; if not, write to the Free Software |
13188 |
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
13189 |
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
13190 |
# |
13191 |
# As a special exception to the GNU General Public License, if you |
13192 |
# distribute this file as part of a program that contains a |
13193 |
@@ -8705,11 +8998,11 @@ |
13194 |
SED=$lt_SED |
13195 |
|
13196 |
# Sed that helps us avoid accidentally triggering echo(1) options like -n. |
13197 |
-Xsed="$SED -e s/^X//" |
13198 |
+Xsed="$SED -e 1s/^X//" |
13199 |
|
13200 |
# The HP-UX ksh and POSIX shell print the target directory to stdout |
13201 |
# if CDPATH is set. |
13202 |
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi |
13203 |
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
13204 |
|
13205 |
# The names of the tagged configurations supported by this script. |
13206 |
available_tags= |
13207 |
@@ -8739,6 +9032,12 @@ |
13208 |
# The host system. |
13209 |
host_alias=$host_alias |
13210 |
host=$host |
13211 |
+host_os=$host_os |
13212 |
+ |
13213 |
+# The build system. |
13214 |
+build_alias=$build_alias |
13215 |
+build=$build |
13216 |
+build_os=$build_os |
13217 |
|
13218 |
# An echo program that does not interpret backslashes. |
13219 |
echo=$lt_echo |
13220 |
@@ -8750,6 +9049,9 @@ |
13221 |
# A C compiler. |
13222 |
LTCC=$lt_LTCC |
13223 |
|
13224 |
+# LTCC compiler flags. |
13225 |
+LTCFLAGS=$lt_LTCFLAGS |
13226 |
+ |
13227 |
# A language-specific compiler. |
13228 |
CC=$lt_compiler |
13229 |
|
13230 |
@@ -8815,7 +9117,7 @@ |
13231 |
# Does compiler simultaneously support -c and -o options? |
13232 |
compiler_c_o=$lt_lt_cv_prog_compiler_c_o |
13233 |
|
13234 |
-# Must we lock files when doing compilation ? |
13235 |
+# Must we lock files when doing compilation? |
13236 |
need_locks=$lt_need_locks |
13237 |
|
13238 |
# Do we need the lib prefix for modules? |
13239 |
@@ -9080,6 +9382,9 @@ |
13240 |
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} |
13241 |
fi |
13242 |
fi |
13243 |
+ if test -z "$LTCFLAGS"; then |
13244 |
+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" |
13245 |
+ fi |
13246 |
|
13247 |
# Extract list of available tagged configurations in $ofile. |
13248 |
# Note that this assumes the entire list is on one line. |
13249 |
@@ -9110,7 +9415,9 @@ |
13250 |
|
13251 |
case $tagname in |
13252 |
CXX) |
13253 |
- if test -n "$CXX" && test "X$CXX" != "Xno"; then |
13254 |
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
13255 |
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
13256 |
+ (test "X$CXX" != "Xg++"))) ; then |
13257 |
ac_ext=cc |
13258 |
ac_cpp='$CXXCPP $CPPFLAGS' |
13259 |
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
13260 |
@@ -9130,6 +9437,7 @@ |
13261 |
hardcode_libdir_flag_spec_ld_CXX= |
13262 |
hardcode_libdir_separator_CXX= |
13263 |
hardcode_minus_L_CXX=no |
13264 |
+hardcode_shlibpath_var_CXX=unsupported |
13265 |
hardcode_automatic_CXX=no |
13266 |
module_cmds_CXX= |
13267 |
module_expsym_cmds_CXX= |
13268 |
@@ -9147,7 +9455,7 @@ |
13269 |
compiler_lib_search_path_CXX= |
13270 |
|
13271 |
# Source file extension for C++ test sources. |
13272 |
-ac_ext=cc |
13273 |
+ac_ext=cpp |
13274 |
|
13275 |
# Object file extension for compiled C++ test sources. |
13276 |
objext=o |
13277 |
@@ -9157,17 +9465,34 @@ |
13278 |
lt_simple_compile_test_code="int some_variable = 0;\n" |
13279 |
|
13280 |
# Code to be used in simple link tests |
13281 |
-lt_simple_link_test_code='int main(int, char *) { return(0); }\n' |
13282 |
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' |
13283 |
|
13284 |
# ltmain only uses $CC for tagged configurations so make sure $CC is set. |
13285 |
|
13286 |
# If no C compiler was specified, use CC. |
13287 |
LTCC=${LTCC-"$CC"} |
13288 |
|
13289 |
+# If no C compiler flags were specified, use CFLAGS. |
13290 |
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} |
13291 |
+ |
13292 |
# Allow CC to be a program name with arguments. |
13293 |
compiler=$CC |
13294 |
|
13295 |
|
13296 |
+# save warnings/boilerplate of simple test code |
13297 |
+ac_outfile=conftest.$ac_objext |
13298 |
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext |
13299 |
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
13300 |
+_lt_compiler_boilerplate=`cat conftest.err` |
13301 |
+$rm conftest* |
13302 |
+ |
13303 |
+ac_outfile=conftest.$ac_objext |
13304 |
+printf "$lt_simple_link_test_code" >conftest.$ac_ext |
13305 |
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
13306 |
+_lt_linker_boilerplate=`cat conftest.err` |
13307 |
+$rm conftest* |
13308 |
+ |
13309 |
+ |
13310 |
# Allow CC to be a program name with arguments. |
13311 |
lt_save_CC=$CC |
13312 |
lt_save_LD=$LD |
13313 |
@@ -9178,18 +9503,27 @@ |
13314 |
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then |
13315 |
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx |
13316 |
else |
13317 |
- unset lt_cv_prog_gnu_ld |
13318 |
+ $as_unset lt_cv_prog_gnu_ld |
13319 |
fi |
13320 |
if test -n "${lt_cv_path_LDCXX+set}"; then |
13321 |
lt_cv_path_LD=$lt_cv_path_LDCXX |
13322 |
else |
13323 |
- unset lt_cv_path_LD |
13324 |
+ $as_unset lt_cv_path_LD |
13325 |
fi |
13326 |
test -z "${LDCXX+set}" || LD=$LDCXX |
13327 |
CC=${CXX-"c++"} |
13328 |
compiler=$CC |
13329 |
compiler_CXX=$CC |
13330 |
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` |
13331 |
+for cc_temp in $compiler""; do |
13332 |
+ case $cc_temp in |
13333 |
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; |
13334 |
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; |
13335 |
+ \-*) ;; |
13336 |
+ *) break;; |
13337 |
+ esac |
13338 |
+done |
13339 |
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
13340 |
+ |
13341 |
|
13342 |
# We don't want -fno-exception wen compiling C++ code, so set the |
13343 |
# no_builtin_flag separately |
13344 |
@@ -9260,7 +9594,7 @@ |
13345 |
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
13346 |
lt_cv_path_LD="$ac_dir/$ac_prog" |
13347 |
# Check to see if the program is GNU ld. I'd rather use --version, |
13348 |
- # but apparently some GNU ld's only accept -v. |
13349 |
+ # but apparently some variants of GNU ld only accept -v. |
13350 |
# Break only if it was the GNU/non-GNU ld that we prefer. |
13351 |
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in |
13352 |
*GNU* | *'with BFD'*) |
13353 |
@@ -9294,7 +9628,7 @@ |
13354 |
if test "${lt_cv_prog_gnu_ld+set}" = set; then |
13355 |
echo $ECHO_N "(cached) $ECHO_C" >&6 |
13356 |
else |
13357 |
- # I'd rather use --version here, but apparently some GNU ld's only accept -v. |
13358 |
+ # I'd rather use --version here, but apparently some GNU lds only accept -v. |
13359 |
case `$LD -v 2>&1 </dev/null` in |
13360 |
*GNU* | *'with BFD'*) |
13361 |
lt_cv_prog_gnu_ld=yes |
13362 |
@@ -9385,6 +9719,7 @@ |
13363 |
;; |
13364 |
esac |
13365 |
done |
13366 |
+ ;; |
13367 |
esac |
13368 |
|
13369 |
exp_sym_flag='-bexport' |
13370 |
@@ -9403,7 +9738,7 @@ |
13371 |
link_all_deplibs_CXX=yes |
13372 |
|
13373 |
if test "$GXX" = yes; then |
13374 |
- case $host_os in aix4.012|aix4.012.*) |
13375 |
+ case $host_os in aix4.[012]|aix4.[012].*) |
13376 |
# We only want to do this on AIX 4.2 and lower, the check |
13377 |
# below for broken collect2 doesn't work under 4.3+ |
13378 |
collect2name=`${CC} -print-prog-name=collect2` |
13379 |
@@ -9422,8 +9757,12 @@ |
13380 |
hardcode_libdir_flag_spec_CXX='-L$libdir' |
13381 |
hardcode_libdir_separator_CXX= |
13382 |
fi |
13383 |
+ ;; |
13384 |
esac |
13385 |
shared_flag='-shared' |
13386 |
+ if test "$aix_use_runtimelinking" = yes; then |
13387 |
+ shared_flag="$shared_flag "'${wl}-G' |
13388 |
+ fi |
13389 |
else |
13390 |
# not using gcc |
13391 |
if test "$host_cpu" = ia64; then |
13392 |
@@ -9500,12 +9839,12 @@ |
13393 |
|
13394 |
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
13395 |
|
13396 |
- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
13397 |
+ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
13398 |
else |
13399 |
if test "$host_cpu" = ia64; then |
13400 |
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' |
13401 |
allow_undefined_flag_CXX="-z nodefs" |
13402 |
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" |
13403 |
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" |
13404 |
else |
13405 |
# Determine the default libpath from the value encoded in an empty executable. |
13406 |
cat >conftest.$ac_ext <<_ACEOF |
13407 |
@@ -9564,16 +9903,26 @@ |
13408 |
# -berok will link without error, but may produce a broken library. |
13409 |
no_undefined_flag_CXX=' ${wl}-bernotok' |
13410 |
allow_undefined_flag_CXX=' ${wl}-berok' |
13411 |
- # -bexpall does not export symbols beginning with underscore (_) |
13412 |
- always_export_symbols_CXX=yes |
13413 |
# Exported symbols can be pulled into shared objects from archives |
13414 |
- whole_archive_flag_spec_CXX=' ' |
13415 |
+ whole_archive_flag_spec_CXX='$convenience' |
13416 |
archive_cmds_need_lc_CXX=yes |
13417 |
- # This is similar to how AIX traditionally builds it's shared libraries. |
13418 |
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
13419 |
+ # This is similar to how AIX traditionally builds its shared libraries. |
13420 |
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
13421 |
fi |
13422 |
fi |
13423 |
;; |
13424 |
+ |
13425 |
+ beos*) |
13426 |
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
13427 |
+ allow_undefined_flag_CXX=unsupported |
13428 |
+ # Joseph Beckenbach <jrb3@××××.com> says some releases of gcc |
13429 |
+ # support --undefined. This deserves some investigation. FIXME |
13430 |
+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
13431 |
+ else |
13432 |
+ ld_shlibs_CXX=no |
13433 |
+ fi |
13434 |
+ ;; |
13435 |
+ |
13436 |
chorus*) |
13437 |
case $cc_basename in |
13438 |
*) |
13439 |
@@ -9592,7 +9941,7 @@ |
13440 |
enable_shared_with_static_runtimes_CXX=yes |
13441 |
|
13442 |
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then |
13443 |
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
13444 |
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
13445 |
# If the export-symbols file already is a .def file (1st line |
13446 |
# is EXPORTS), use it as is; otherwise, prepend... |
13447 |
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
13448 |
@@ -9601,70 +9950,81 @@ |
13449 |
echo EXPORTS > $output_objdir/$soname.def; |
13450 |
cat $export_symbols >> $output_objdir/$soname.def; |
13451 |
fi~ |
13452 |
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
13453 |
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
13454 |
else |
13455 |
ld_shlibs_CXX=no |
13456 |
fi |
13457 |
;; |
13458 |
- |
13459 |
- darwin* | rhapsody*) |
13460 |
- if test "$GXX" = yes; then |
13461 |
- archive_cmds_need_lc_CXX=no |
13462 |
- case "$host_os" in |
13463 |
- rhapsody* | darwin1.[012]) |
13464 |
- allow_undefined_flag_CXX='-undefined suppress' |
13465 |
- ;; |
13466 |
- *) # Darwin 1.3 on |
13467 |
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
13468 |
- allow_undefined_flag_CXX='-flat_namespace -undefined suppress' |
13469 |
- else |
13470 |
- case ${MACOSX_DEPLOYMENT_TARGET} in |
13471 |
- 10.[012]) |
13472 |
- allow_undefined_flag_CXX='-flat_namespace -undefined suppress' |
13473 |
- ;; |
13474 |
- 10.*) |
13475 |
- allow_undefined_flag_CXX='-undefined dynamic_lookup' |
13476 |
- ;; |
13477 |
+ darwin* | rhapsody*) |
13478 |
+ case $host_os in |
13479 |
+ rhapsody* | darwin1.[012]) |
13480 |
+ allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' |
13481 |
+ ;; |
13482 |
+ *) # Darwin 1.3 on |
13483 |
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
13484 |
+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
13485 |
+ else |
13486 |
+ case ${MACOSX_DEPLOYMENT_TARGET} in |
13487 |
+ 10.[012]) |
13488 |
+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
13489 |
+ ;; |
13490 |
+ 10.*) |
13491 |
+ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' |
13492 |
+ ;; |
13493 |
+ esac |
13494 |
+ fi |
13495 |
+ ;; |
13496 |
esac |
13497 |
- fi |
13498 |
- ;; |
13499 |
- esac |
13500 |
- lt_int_apple_cc_single_mod=no |
13501 |
- output_verbose_link_cmd='echo' |
13502 |
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then |
13503 |
- lt_int_apple_cc_single_mod=yes |
13504 |
- fi |
13505 |
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
13506 |
- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
13507 |
- else |
13508 |
- archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
13509 |
- fi |
13510 |
- module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
13511 |
+ archive_cmds_need_lc_CXX=no |
13512 |
+ hardcode_direct_CXX=no |
13513 |
+ hardcode_automatic_CXX=yes |
13514 |
+ hardcode_shlibpath_var_CXX=unsupported |
13515 |
+ whole_archive_flag_spec_CXX='' |
13516 |
+ link_all_deplibs_CXX=yes |
13517 |
|
13518 |
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
13519 |
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
13520 |
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
13521 |
- else |
13522 |
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
13523 |
- fi |
13524 |
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
13525 |
- hardcode_direct_CXX=no |
13526 |
- hardcode_automatic_CXX=yes |
13527 |
- hardcode_shlibpath_var_CXX=unsupported |
13528 |
- whole_archive_flag_spec_CXX='-all_load $convenience' |
13529 |
- link_all_deplibs_CXX=yes |
13530 |
- else |
13531 |
- ld_shlibs_CXX=no |
13532 |
- fi |
13533 |
- ;; |
13534 |
+ if test "$GXX" = yes ; then |
13535 |
+ lt_int_apple_cc_single_mod=no |
13536 |
+ output_verbose_link_cmd='echo' |
13537 |
+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then |
13538 |
+ lt_int_apple_cc_single_mod=yes |
13539 |
+ fi |
13540 |
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
13541 |
+ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
13542 |
+ else |
13543 |
+ archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
13544 |
+ fi |
13545 |
+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
13546 |
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
13547 |
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
13548 |
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
13549 |
+ else |
13550 |
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
13551 |
+ fi |
13552 |
+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
13553 |
+ else |
13554 |
+ case $cc_basename in |
13555 |
+ xlc*) |
13556 |
+ output_verbose_link_cmd='echo' |
13557 |
+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' |
13558 |
+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
13559 |
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
13560 |
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
13561 |
+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
13562 |
+ ;; |
13563 |
+ *) |
13564 |
+ ld_shlibs_CXX=no |
13565 |
+ ;; |
13566 |
+ esac |
13567 |
+ fi |
13568 |
+ ;; |
13569 |
|
13570 |
dgux*) |
13571 |
case $cc_basename in |
13572 |
- ec++) |
13573 |
+ ec++*) |
13574 |
# FIXME: insert proper C++ library support |
13575 |
ld_shlibs_CXX=no |
13576 |
;; |
13577 |
- ghcx) |
13578 |
+ ghcx*) |
13579 |
# Green Hills C++ Compiler |
13580 |
# FIXME: insert proper C++ library support |
13581 |
ld_shlibs_CXX=no |
13582 |
@@ -9675,14 +10035,14 @@ |
13583 |
;; |
13584 |
esac |
13585 |
;; |
13586 |
- freebsd12*) |
13587 |
+ freebsd[12]*) |
13588 |
# C++ shared libraries reported to be fairly broken before switch to ELF |
13589 |
ld_shlibs_CXX=no |
13590 |
;; |
13591 |
freebsd-elf*) |
13592 |
archive_cmds_need_lc_CXX=no |
13593 |
;; |
13594 |
- freebsd* | kfreebsd*-gnu) |
13595 |
+ freebsd* | kfreebsd*-gnu | dragonfly*) |
13596 |
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF |
13597 |
# conventions |
13598 |
ld_shlibs_CXX=yes |
13599 |
@@ -9699,11 +10059,11 @@ |
13600 |
# location of the library. |
13601 |
|
13602 |
case $cc_basename in |
13603 |
- CC) |
13604 |
+ CC*) |
13605 |
# FIXME: insert proper C++ library support |
13606 |
ld_shlibs_CXX=no |
13607 |
;; |
13608 |
- aCC) |
13609 |
+ aCC*) |
13610 |
archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
13611 |
# Commands to make compiler produce verbose output that lists |
13612 |
# what "hidden" libraries, object files and flags are used when |
13613 |
@@ -9713,7 +10073,7 @@ |
13614 |
# explicitly linking system object files so we need to strip them |
13615 |
# from the output so that they don't get included in the library |
13616 |
# dependencies. |
13617 |
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' |
13618 |
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' |
13619 |
;; |
13620 |
*) |
13621 |
if test "$GXX" = yes; then |
13622 |
@@ -9727,33 +10087,22 @@ |
13623 |
;; |
13624 |
hpux10*|hpux11*) |
13625 |
if test $with_gnu_ld = no; then |
13626 |
- case "$host_cpu" in |
13627 |
- hppa*64*) |
13628 |
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' |
13629 |
+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' |
13630 |
+ hardcode_libdir_separator_CXX=: |
13631 |
+ |
13632 |
+ case $host_cpu in |
13633 |
+ hppa*64*|ia64*) |
13634 |
hardcode_libdir_flag_spec_ld_CXX='+b $libdir' |
13635 |
- hardcode_libdir_separator_CXX=: |
13636 |
- ;; |
13637 |
- ia64*) |
13638 |
- hardcode_libdir_flag_spec_CXX='-L$libdir' |
13639 |
;; |
13640 |
*) |
13641 |
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' |
13642 |
- hardcode_libdir_separator_CXX=: |
13643 |
export_dynamic_flag_spec_CXX='${wl}-E' |
13644 |
;; |
13645 |
esac |
13646 |
fi |
13647 |
- case "$host_cpu" in |
13648 |
- hppa*64*) |
13649 |
- hardcode_direct_CXX=no |
13650 |
- hardcode_shlibpath_var_CXX=no |
13651 |
- ;; |
13652 |
- ia64*) |
13653 |
+ case $host_cpu in |
13654 |
+ hppa*64*|ia64*) |
13655 |
hardcode_direct_CXX=no |
13656 |
hardcode_shlibpath_var_CXX=no |
13657 |
- hardcode_minus_L_CXX=yes # Not in the search PATH, |
13658 |
- # but as the default |
13659 |
- # location of the library. |
13660 |
;; |
13661 |
*) |
13662 |
hardcode_direct_CXX=yes |
13663 |
@@ -9764,14 +10113,17 @@ |
13664 |
esac |
13665 |
|
13666 |
case $cc_basename in |
13667 |
- CC) |
13668 |
+ CC*) |
13669 |
# FIXME: insert proper C++ library support |
13670 |
ld_shlibs_CXX=no |
13671 |
;; |
13672 |
- aCC) |
13673 |
- case "$host_cpu" in |
13674 |
- hppa*64*|ia64*) |
13675 |
- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' |
13676 |
+ aCC*) |
13677 |
+ case $host_cpu in |
13678 |
+ hppa*64*) |
13679 |
+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
13680 |
+ ;; |
13681 |
+ ia64*) |
13682 |
+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
13683 |
;; |
13684 |
*) |
13685 |
archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
13686 |
@@ -9790,9 +10142,12 @@ |
13687 |
*) |
13688 |
if test "$GXX" = yes; then |
13689 |
if test $with_gnu_ld = no; then |
13690 |
- case "$host_cpu" in |
13691 |
- ia64*|hppa*64*) |
13692 |
- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' |
13693 |
+ case $host_cpu in |
13694 |
+ hppa*64*) |
13695 |
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
13696 |
+ ;; |
13697 |
+ ia64*) |
13698 |
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
13699 |
;; |
13700 |
*) |
13701 |
archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
13702 |
@@ -9806,11 +10161,25 @@ |
13703 |
;; |
13704 |
esac |
13705 |
;; |
13706 |
+ interix3*) |
13707 |
+ hardcode_direct_CXX=no |
13708 |
+ hardcode_shlibpath_var_CXX=no |
13709 |
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' |
13710 |
+ export_dynamic_flag_spec_CXX='${wl}-E' |
13711 |
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. |
13712 |
+ # Instead, shared libraries are loaded at an image base (0x10000000 by |
13713 |
+ # default) and relocated if they conflict, which is a slow very memory |
13714 |
+ # consuming and fragmenting process. To avoid this, we pick a random, |
13715 |
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link |
13716 |
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. |
13717 |
+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
13718 |
+ archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
13719 |
+ ;; |
13720 |
irix5* | irix6*) |
13721 |
case $cc_basename in |
13722 |
- CC) |
13723 |
+ CC*) |
13724 |
# SGI C++ |
13725 |
- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' |
13726 |
+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
13727 |
|
13728 |
# Archives containing C++ object files must be created using |
13729 |
# "CC -ar", where "CC" is the IRIX C++ compiler. This is |
13730 |
@@ -9821,7 +10190,7 @@ |
13731 |
*) |
13732 |
if test "$GXX" = yes; then |
13733 |
if test "$with_gnu_ld" = no; then |
13734 |
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' |
13735 |
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
13736 |
else |
13737 |
archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' |
13738 |
fi |
13739 |
@@ -9834,7 +10203,7 @@ |
13740 |
;; |
13741 |
linux*) |
13742 |
case $cc_basename in |
13743 |
- KCC) |
13744 |
+ KCC*) |
13745 |
# Kuck and Associates, Inc. (KAI) C++ Compiler |
13746 |
|
13747 |
# KCC will only create a shared library if the output file |
13748 |
@@ -9859,17 +10228,41 @@ |
13749 |
# "CC -Bstatic", where "CC" is the KAI C++ compiler. |
13750 |
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' |
13751 |
;; |
13752 |
- icpc) |
13753 |
+ icpc*) |
13754 |
# Intel C++ |
13755 |
with_gnu_ld=yes |
13756 |
+ # version 8.0 and above of icpc choke on multiply defined symbols |
13757 |
+ # if we add $predep_objects and $postdep_objects, however 7.1 and |
13758 |
+ # earlier do not add the objects themselves. |
13759 |
+ case `$CC -V 2>&1` in |
13760 |
+ *"Version 7."*) |
13761 |
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
13762 |
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
13763 |
+ ;; |
13764 |
+ *) # Version 8.0 or newer |
13765 |
+ tmp_idyn= |
13766 |
+ case $host_cpu in |
13767 |
+ ia64*) tmp_idyn=' -i_dynamic';; |
13768 |
+ esac |
13769 |
+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
13770 |
+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
13771 |
+ ;; |
13772 |
+ esac |
13773 |
archive_cmds_need_lc_CXX=no |
13774 |
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
13775 |
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
13776 |
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' |
13777 |
export_dynamic_flag_spec_CXX='${wl}--export-dynamic' |
13778 |
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
13779 |
;; |
13780 |
- cxx) |
13781 |
+ pgCC*) |
13782 |
+ # Portland Group C++ compiler |
13783 |
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
13784 |
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
13785 |
+ |
13786 |
+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' |
13787 |
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' |
13788 |
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
13789 |
+ ;; |
13790 |
+ cxx*) |
13791 |
# Compaq C++ |
13792 |
archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
13793 |
archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' |
13794 |
@@ -9900,7 +10293,7 @@ |
13795 |
;; |
13796 |
mvs*) |
13797 |
case $cc_basename in |
13798 |
- cxx) |
13799 |
+ cxx*) |
13800 |
# FIXME: insert proper C++ library support |
13801 |
ld_shlibs_CXX=no |
13802 |
;; |
13803 |
@@ -9921,9 +10314,25 @@ |
13804 |
# Workaround some broken pre-1.5 toolchains |
13805 |
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' |
13806 |
;; |
13807 |
+ openbsd2*) |
13808 |
+ # C++ shared libraries are fairly broken |
13809 |
+ ld_shlibs_CXX=no |
13810 |
+ ;; |
13811 |
+ openbsd*) |
13812 |
+ hardcode_direct_CXX=yes |
13813 |
+ hardcode_shlibpath_var_CXX=no |
13814 |
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' |
13815 |
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' |
13816 |
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
13817 |
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' |
13818 |
+ export_dynamic_flag_spec_CXX='${wl}-E' |
13819 |
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
13820 |
+ fi |
13821 |
+ output_verbose_link_cmd='echo' |
13822 |
+ ;; |
13823 |
osf3*) |
13824 |
case $cc_basename in |
13825 |
- KCC) |
13826 |
+ KCC*) |
13827 |
# Kuck and Associates, Inc. (KAI) C++ Compiler |
13828 |
|
13829 |
# KCC will only create a shared library if the output file |
13830 |
@@ -9939,14 +10348,14 @@ |
13831 |
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' |
13832 |
|
13833 |
;; |
13834 |
- RCC) |
13835 |
+ RCC*) |
13836 |
# Rational C++ 2.4.1 |
13837 |
# FIXME: insert proper C++ library support |
13838 |
ld_shlibs_CXX=no |
13839 |
;; |
13840 |
- cxx) |
13841 |
+ cxx*) |
13842 |
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' |
13843 |
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' |
13844 |
+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
13845 |
|
13846 |
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' |
13847 |
hardcode_libdir_separator_CXX=: |
13848 |
@@ -9964,7 +10373,7 @@ |
13849 |
*) |
13850 |
if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
13851 |
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' |
13852 |
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' |
13853 |
+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
13854 |
|
13855 |
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' |
13856 |
hardcode_libdir_separator_CXX=: |
13857 |
@@ -9983,7 +10392,7 @@ |
13858 |
;; |
13859 |
osf4* | osf5*) |
13860 |
case $cc_basename in |
13861 |
- KCC) |
13862 |
+ KCC*) |
13863 |
# Kuck and Associates, Inc. (KAI) C++ Compiler |
13864 |
|
13865 |
# KCC will only create a shared library if the output file |
13866 |
@@ -9998,17 +10407,17 @@ |
13867 |
# the KAI C++ compiler. |
13868 |
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' |
13869 |
;; |
13870 |
- RCC) |
13871 |
+ RCC*) |
13872 |
# Rational C++ 2.4.1 |
13873 |
# FIXME: insert proper C++ library support |
13874 |
ld_shlibs_CXX=no |
13875 |
;; |
13876 |
- cxx) |
13877 |
+ cxx*) |
13878 |
allow_undefined_flag_CXX=' -expect_unresolved \*' |
13879 |
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' |
13880 |
+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
13881 |
archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ |
13882 |
echo "-hidden">> $lib.exp~ |
13883 |
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ |
13884 |
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ |
13885 |
$rm $lib.exp' |
13886 |
|
13887 |
hardcode_libdir_flag_spec_CXX='-rpath $libdir' |
13888 |
@@ -10027,7 +10436,7 @@ |
13889 |
*) |
13890 |
if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
13891 |
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' |
13892 |
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' |
13893 |
+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
13894 |
|
13895 |
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' |
13896 |
hardcode_libdir_separator_CXX=: |
13897 |
@@ -10048,27 +10457,14 @@ |
13898 |
# FIXME: insert proper C++ library support |
13899 |
ld_shlibs_CXX=no |
13900 |
;; |
13901 |
- sco*) |
13902 |
- archive_cmds_need_lc_CXX=no |
13903 |
- case $cc_basename in |
13904 |
- CC) |
13905 |
- # FIXME: insert proper C++ library support |
13906 |
- ld_shlibs_CXX=no |
13907 |
- ;; |
13908 |
- *) |
13909 |
- # FIXME: insert proper C++ library support |
13910 |
- ld_shlibs_CXX=no |
13911 |
- ;; |
13912 |
- esac |
13913 |
- ;; |
13914 |
sunos4*) |
13915 |
case $cc_basename in |
13916 |
- CC) |
13917 |
+ CC*) |
13918 |
# Sun C++ 4.x |
13919 |
# FIXME: insert proper C++ library support |
13920 |
ld_shlibs_CXX=no |
13921 |
;; |
13922 |
- lcc) |
13923 |
+ lcc*) |
13924 |
# Lucid |
13925 |
# FIXME: insert proper C++ library support |
13926 |
ld_shlibs_CXX=no |
13927 |
@@ -10081,36 +10477,33 @@ |
13928 |
;; |
13929 |
solaris*) |
13930 |
case $cc_basename in |
13931 |
- CC) |
13932 |
+ CC*) |
13933 |
# Sun C++ 4.2, 5.x and Centerline C++ |
13934 |
+ archive_cmds_need_lc_CXX=yes |
13935 |
no_undefined_flag_CXX=' -zdefs' |
13936 |
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
13937 |
+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
13938 |
archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
13939 |
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' |
13940 |
+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' |
13941 |
|
13942 |
hardcode_libdir_flag_spec_CXX='-R$libdir' |
13943 |
hardcode_shlibpath_var_CXX=no |
13944 |
case $host_os in |
13945 |
- solaris2.0-5 | solaris2.0-5.*) ;; |
13946 |
+ solaris2.[0-5] | solaris2.[0-5].*) ;; |
13947 |
*) |
13948 |
# The C++ compiler is used as linker so we must use $wl |
13949 |
# flag to pass the commands to the underlying system |
13950 |
- # linker. |
13951 |
+ # linker. We must also pass each convience library through |
13952 |
+ # to the system linker between allextract/defaultextract. |
13953 |
+ # The C++ compiler will combine linker options so we |
13954 |
+ # cannot just pass the convience library names through |
13955 |
+ # without $wl. |
13956 |
# Supported since Solaris 2.6 (maybe 2.5.1?) |
13957 |
- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' |
13958 |
+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' |
13959 |
;; |
13960 |
esac |
13961 |
link_all_deplibs_CXX=yes |
13962 |
|
13963 |
- # Commands to make compiler produce verbose output that lists |
13964 |
- # what "hidden" libraries, object files and flags are used when |
13965 |
- # linking a shared library. |
13966 |
- # |
13967 |
- # There doesn't appear to be a way to prevent this compiler from |
13968 |
- # explicitly linking system object files so we need to strip them |
13969 |
- # from the output so that they don't get included in the library |
13970 |
- # dependencies. |
13971 |
- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' |
13972 |
+ output_verbose_link_cmd='echo' |
13973 |
|
13974 |
# Archives containing C++ object files must be created using |
13975 |
# "CC -xar", where "CC" is the Sun C++ compiler. This is |
13976 |
@@ -10118,7 +10511,7 @@ |
13977 |
# in the archive. |
13978 |
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' |
13979 |
;; |
13980 |
- gcx) |
13981 |
+ gcx*) |
13982 |
# Green Hills C++ Compiler |
13983 |
archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
13984 |
|
13985 |
@@ -10156,12 +10549,63 @@ |
13986 |
;; |
13987 |
esac |
13988 |
;; |
13989 |
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) |
13990 |
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) |
13991 |
+ no_undefined_flag_CXX='${wl}-z,text' |
13992 |
+ archive_cmds_need_lc_CXX=no |
13993 |
+ hardcode_shlibpath_var_CXX=no |
13994 |
+ runpath_var='LD_RUN_PATH' |
13995 |
+ |
13996 |
+ case $cc_basename in |
13997 |
+ CC*) |
13998 |
+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
13999 |
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
14000 |
+ ;; |
14001 |
+ *) |
14002 |
+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
14003 |
+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
14004 |
+ ;; |
14005 |
+ esac |
14006 |
+ ;; |
14007 |
+ sysv5* | sco3.2v5* | sco5v6*) |
14008 |
+ # Note: We can NOT use -z defs as we might desire, because we do not |
14009 |
+ # link with -lc, and that would cause any symbols used from libc to |
14010 |
+ # always be unresolved, which means just about no library would |
14011 |
+ # ever link correctly. If we're not using GNU ld we use -z text |
14012 |
+ # though, which does catch some bad symbols but isn't as heavy-handed |
14013 |
+ # as -z defs. |
14014 |
+ # For security reasons, it is highly recommended that you always |
14015 |
+ # use absolute paths for naming shared libraries, and exclude the |
14016 |
+ # DT_RUNPATH tag from executables and libraries. But doing so |
14017 |
+ # requires that you compile everything twice, which is a pain. |
14018 |
+ # So that behaviour is only enabled if SCOABSPATH is set to a |
14019 |
+ # non-empty value in the environment. Most likely only useful for |
14020 |
+ # creating official distributions of packages. |
14021 |
+ # This is a hack until libtool officially supports absolute path |
14022 |
+ # names for shared libraries. |
14023 |
+ no_undefined_flag_CXX='${wl}-z,text' |
14024 |
+ allow_undefined_flag_CXX='${wl}-z,nodefs' |
14025 |
archive_cmds_need_lc_CXX=no |
14026 |
+ hardcode_shlibpath_var_CXX=no |
14027 |
+ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' |
14028 |
+ hardcode_libdir_separator_CXX=':' |
14029 |
+ link_all_deplibs_CXX=yes |
14030 |
+ export_dynamic_flag_spec_CXX='${wl}-Bexport' |
14031 |
+ runpath_var='LD_RUN_PATH' |
14032 |
+ |
14033 |
+ case $cc_basename in |
14034 |
+ CC*) |
14035 |
+ archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
14036 |
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
14037 |
+ ;; |
14038 |
+ *) |
14039 |
+ archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
14040 |
+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
14041 |
+ ;; |
14042 |
+ esac |
14043 |
;; |
14044 |
tandem*) |
14045 |
case $cc_basename in |
14046 |
- NCC) |
14047 |
+ NCC*) |
14048 |
# NonStop-UX NCC 3.20 |
14049 |
# FIXME: insert proper C++ library support |
14050 |
ld_shlibs_CXX=no |
14051 |
@@ -10214,7 +10658,7 @@ |
14052 |
# The `*' in the case matches for architectures that use `case' in |
14053 |
# $output_verbose_cmd can trigger glob expansion during the loop |
14054 |
# eval without this substitution. |
14055 |
- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" |
14056 |
+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` |
14057 |
|
14058 |
for p in `eval $output_verbose_link_cmd`; do |
14059 |
case $p in |
14060 |
@@ -10290,10 +10734,33 @@ |
14061 |
|
14062 |
$rm -f confest.$objext |
14063 |
|
14064 |
-case " $postdeps_CXX " in |
14065 |
-*" -lc "*) archive_cmds_need_lc_CXX=no ;; |
14066 |
-esac |
14067 |
- |
14068 |
+# PORTME: override above test on systems where it is broken |
14069 |
+case $host_os in |
14070 |
+interix3*) |
14071 |
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than |
14072 |
+ # hack all around it, let's just trust "g++" to DTRT. |
14073 |
+ predep_objects_CXX= |
14074 |
+ postdep_objects_CXX= |
14075 |
+ postdeps_CXX= |
14076 |
+ ;; |
14077 |
+ |
14078 |
+solaris*) |
14079 |
+ case $cc_basename in |
14080 |
+ CC*) |
14081 |
+ # Adding this requires a known-good setup of shared libraries for |
14082 |
+ # Sun compiler versions before 5.6, else PIC objects from an old |
14083 |
+ # archive will be linked into the output, leading to subtle bugs. |
14084 |
+ postdeps_CXX='-lCstd -lCrun' |
14085 |
+ ;; |
14086 |
+ esac |
14087 |
+ ;; |
14088 |
+esac |
14089 |
+ |
14090 |
+ |
14091 |
+case " $postdeps_CXX " in |
14092 |
+*" -lc "*) archive_cmds_need_lc_CXX=no ;; |
14093 |
+esac |
14094 |
+ |
14095 |
lt_prog_compiler_wl_CXX= |
14096 |
lt_prog_compiler_pic_CXX= |
14097 |
lt_prog_compiler_static_CXX= |
14098 |
@@ -10337,6 +10804,10 @@ |
14099 |
# DJGPP does not support shared libraries at all |
14100 |
lt_prog_compiler_pic_CXX= |
14101 |
;; |
14102 |
+ interix3*) |
14103 |
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
14104 |
+ # Instead, we relocate shared libraries at runtime. |
14105 |
+ ;; |
14106 |
sysv4*MP*) |
14107 |
if test -d /usr/nec; then |
14108 |
lt_prog_compiler_pic_CXX=-Kconform_pic |
14109 |
@@ -10345,7 +10816,7 @@ |
14110 |
hpux*) |
14111 |
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
14112 |
# not for PA HP-UX. |
14113 |
- case "$host_cpu" in |
14114 |
+ case $host_cpu in |
14115 |
hppa*64*|ia64*) |
14116 |
;; |
14117 |
*) |
14118 |
@@ -10370,18 +10841,28 @@ |
14119 |
;; |
14120 |
chorus*) |
14121 |
case $cc_basename in |
14122 |
- cxch68) |
14123 |
+ cxch68*) |
14124 |
# Green Hills C++ Compiler |
14125 |
# _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" |
14126 |
;; |
14127 |
esac |
14128 |
;; |
14129 |
+ darwin*) |
14130 |
+ # PIC is the default on this platform |
14131 |
+ # Common symbols not allowed in MH_DYLIB files |
14132 |
+ case $cc_basename in |
14133 |
+ xlc*) |
14134 |
+ lt_prog_compiler_pic_CXX='-qnocommon' |
14135 |
+ lt_prog_compiler_wl_CXX='-Wl,' |
14136 |
+ ;; |
14137 |
+ esac |
14138 |
+ ;; |
14139 |
dgux*) |
14140 |
case $cc_basename in |
14141 |
- ec++) |
14142 |
+ ec++*) |
14143 |
lt_prog_compiler_pic_CXX='-KPIC' |
14144 |
;; |
14145 |
- ghcx) |
14146 |
+ ghcx*) |
14147 |
# Green Hills C++ Compiler |
14148 |
lt_prog_compiler_pic_CXX='-pic' |
14149 |
;; |
14150 |
@@ -10389,22 +10870,22 @@ |
14151 |
;; |
14152 |
esac |
14153 |
;; |
14154 |
- freebsd* | kfreebsd*-gnu) |
14155 |
+ freebsd* | kfreebsd*-gnu | dragonfly*) |
14156 |
# FreeBSD uses GNU C++ |
14157 |
;; |
14158 |
hpux9* | hpux10* | hpux11*) |
14159 |
case $cc_basename in |
14160 |
- CC) |
14161 |
+ CC*) |
14162 |
lt_prog_compiler_wl_CXX='-Wl,' |
14163 |
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" |
14164 |
+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' |
14165 |
if test "$host_cpu" != ia64; then |
14166 |
lt_prog_compiler_pic_CXX='+Z' |
14167 |
fi |
14168 |
;; |
14169 |
- aCC) |
14170 |
+ aCC*) |
14171 |
lt_prog_compiler_wl_CXX='-Wl,' |
14172 |
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" |
14173 |
- case "$host_cpu" in |
14174 |
+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' |
14175 |
+ case $host_cpu in |
14176 |
hppa*64*|ia64*) |
14177 |
# +Z the default |
14178 |
;; |
14179 |
@@ -10417,9 +10898,13 @@ |
14180 |
;; |
14181 |
esac |
14182 |
;; |
14183 |
+ interix*) |
14184 |
+ # This is c89, which is MS Visual C++ (no shared libs) |
14185 |
+ # Anyone wants to do a port? |
14186 |
+ ;; |
14187 |
irix5* | irix6* | nonstopux*) |
14188 |
case $cc_basename in |
14189 |
- CC) |
14190 |
+ CC*) |
14191 |
lt_prog_compiler_wl_CXX='-Wl,' |
14192 |
lt_prog_compiler_static_CXX='-non_shared' |
14193 |
# CC pic flag -KPIC is the default. |
14194 |
@@ -10430,18 +10915,24 @@ |
14195 |
;; |
14196 |
linux*) |
14197 |
case $cc_basename in |
14198 |
- KCC) |
14199 |
+ KCC*) |
14200 |
# KAI C++ Compiler |
14201 |
lt_prog_compiler_wl_CXX='--backend -Wl,' |
14202 |
lt_prog_compiler_pic_CXX='-fPIC' |
14203 |
;; |
14204 |
- icpc) |
14205 |
+ icpc* | ecpc*) |
14206 |
# Intel C++ |
14207 |
lt_prog_compiler_wl_CXX='-Wl,' |
14208 |
lt_prog_compiler_pic_CXX='-KPIC' |
14209 |
lt_prog_compiler_static_CXX='-static' |
14210 |
;; |
14211 |
- cxx) |
14212 |
+ pgCC*) |
14213 |
+ # Portland Group C++ compiler. |
14214 |
+ lt_prog_compiler_wl_CXX='-Wl,' |
14215 |
+ lt_prog_compiler_pic_CXX='-fpic' |
14216 |
+ lt_prog_compiler_static_CXX='-Bstatic' |
14217 |
+ ;; |
14218 |
+ cxx*) |
14219 |
# Compaq C++ |
14220 |
# Make sure the PIC flag is empty. It appears that all Alpha |
14221 |
# Linux and Compaq Tru64 Unix objects are PIC. |
14222 |
@@ -10458,7 +10949,7 @@ |
14223 |
;; |
14224 |
mvs*) |
14225 |
case $cc_basename in |
14226 |
- cxx) |
14227 |
+ cxx*) |
14228 |
lt_prog_compiler_pic_CXX='-W c,exportall' |
14229 |
;; |
14230 |
*) |
14231 |
@@ -10469,14 +10960,14 @@ |
14232 |
;; |
14233 |
osf3* | osf4* | osf5*) |
14234 |
case $cc_basename in |
14235 |
- KCC) |
14236 |
+ KCC*) |
14237 |
lt_prog_compiler_wl_CXX='--backend -Wl,' |
14238 |
;; |
14239 |
- RCC) |
14240 |
+ RCC*) |
14241 |
# Rational C++ 2.4.1 |
14242 |
lt_prog_compiler_pic_CXX='-pic' |
14243 |
;; |
14244 |
- cxx) |
14245 |
+ cxx*) |
14246 |
# Digital/Compaq C++ |
14247 |
lt_prog_compiler_wl_CXX='-Wl,' |
14248 |
# Make sure the PIC flag is empty. It appears that all Alpha |
14249 |
@@ -10490,24 +10981,15 @@ |
14250 |
;; |
14251 |
psos*) |
14252 |
;; |
14253 |
- sco*) |
14254 |
- case $cc_basename in |
14255 |
- CC) |
14256 |
- lt_prog_compiler_pic_CXX='-fPIC' |
14257 |
- ;; |
14258 |
- *) |
14259 |
- ;; |
14260 |
- esac |
14261 |
- ;; |
14262 |
solaris*) |
14263 |
case $cc_basename in |
14264 |
- CC) |
14265 |
+ CC*) |
14266 |
# Sun C++ 4.2, 5.x and Centerline C++ |
14267 |
lt_prog_compiler_pic_CXX='-KPIC' |
14268 |
lt_prog_compiler_static_CXX='-Bstatic' |
14269 |
lt_prog_compiler_wl_CXX='-Qoption ld ' |
14270 |
;; |
14271 |
- gcx) |
14272 |
+ gcx*) |
14273 |
# Green Hills C++ Compiler |
14274 |
lt_prog_compiler_pic_CXX='-PIC' |
14275 |
;; |
14276 |
@@ -10517,12 +10999,12 @@ |
14277 |
;; |
14278 |
sunos4*) |
14279 |
case $cc_basename in |
14280 |
- CC) |
14281 |
+ CC*) |
14282 |
# Sun C++ 4.x |
14283 |
lt_prog_compiler_pic_CXX='-pic' |
14284 |
lt_prog_compiler_static_CXX='-Bstatic' |
14285 |
;; |
14286 |
- lcc) |
14287 |
+ lcc*) |
14288 |
# Lucid |
14289 |
lt_prog_compiler_pic_CXX='-pic' |
14290 |
;; |
14291 |
@@ -10532,7 +11014,7 @@ |
14292 |
;; |
14293 |
tandem*) |
14294 |
case $cc_basename in |
14295 |
- NCC) |
14296 |
+ NCC*) |
14297 |
# NonStop-UX NCC 3.20 |
14298 |
lt_prog_compiler_pic_CXX='-KPIC' |
14299 |
;; |
14300 |
@@ -10540,7 +11022,14 @@ |
14301 |
;; |
14302 |
esac |
14303 |
;; |
14304 |
- unixware*) |
14305 |
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) |
14306 |
+ case $cc_basename in |
14307 |
+ CC*) |
14308 |
+ lt_prog_compiler_wl_CXX='-Wl,' |
14309 |
+ lt_prog_compiler_pic_CXX='-KPIC' |
14310 |
+ lt_prog_compiler_static_CXX='-Bstatic' |
14311 |
+ ;; |
14312 |
+ esac |
14313 |
;; |
14314 |
vxworks*) |
14315 |
;; |
14316 |
@@ -10573,18 +11062,20 @@ |
14317 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
14318 |
# The option is referenced via a variable to avoid confusing sed. |
14319 |
lt_compile=`echo "$ac_compile" | $SED \ |
14320 |
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
14321 |
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
14322 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
14323 |
-e 's:$: $lt_compiler_flag:'` |
14324 |
- (eval echo "\"\$as_me:10579: $lt_compile\"" >&5) |
14325 |
+ (eval echo "\"\$as_me:11068: $lt_compile\"" >&5) |
14326 |
(eval "$lt_compile" 2>conftest.err) |
14327 |
ac_status=$? |
14328 |
cat conftest.err >&5 |
14329 |
- echo "$as_me:10583: \$? = $ac_status" >&5 |
14330 |
+ echo "$as_me:11072: \$? = $ac_status" >&5 |
14331 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
14332 |
# The compiler can only warn and ignore the option if not recognized |
14333 |
- # So say no if there are warnings |
14334 |
- if test ! -s conftest.err; then |
14335 |
+ # So say no if there are warnings other than the usual output. |
14336 |
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
14337 |
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
14338 |
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
14339 |
lt_prog_compiler_pic_works_CXX=yes |
14340 |
fi |
14341 |
fi |
14342 |
@@ -10605,7 +11096,7 @@ |
14343 |
fi |
14344 |
|
14345 |
fi |
14346 |
-case "$host_os" in |
14347 |
+case $host_os in |
14348 |
# For platforms which do not support PIC, -DPIC is meaningless: |
14349 |
*djgpp*) |
14350 |
lt_prog_compiler_pic_CXX= |
14351 |
@@ -10615,6 +11106,48 @@ |
14352 |
;; |
14353 |
esac |
14354 |
|
14355 |
+# |
14356 |
+# Check to make sure the static flag actually works. |
14357 |
+# |
14358 |
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" |
14359 |
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
14360 |
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 |
14361 |
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then |
14362 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
14363 |
+else |
14364 |
+ lt_prog_compiler_static_works_CXX=no |
14365 |
+ save_LDFLAGS="$LDFLAGS" |
14366 |
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" |
14367 |
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext |
14368 |
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
14369 |
+ # The linker can only warn and ignore the option if not recognized |
14370 |
+ # So say no if there are warnings |
14371 |
+ if test -s conftest.err; then |
14372 |
+ # Append any errors to the config.log. |
14373 |
+ cat conftest.err 1>&5 |
14374 |
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
14375 |
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
14376 |
+ if diff conftest.exp conftest.er2 >/dev/null; then |
14377 |
+ lt_prog_compiler_static_works_CXX=yes |
14378 |
+ fi |
14379 |
+ else |
14380 |
+ lt_prog_compiler_static_works_CXX=yes |
14381 |
+ fi |
14382 |
+ fi |
14383 |
+ $rm conftest* |
14384 |
+ LDFLAGS="$save_LDFLAGS" |
14385 |
+ |
14386 |
+fi |
14387 |
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 |
14388 |
+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 |
14389 |
+ |
14390 |
+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then |
14391 |
+ : |
14392 |
+else |
14393 |
+ lt_prog_compiler_static_CXX= |
14394 |
+fi |
14395 |
+ |
14396 |
+ |
14397 |
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
14398 |
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 |
14399 |
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then |
14400 |
@@ -10633,23 +11166,25 @@ |
14401 |
# Note that $ac_compile itself does not contain backslashes and begins |
14402 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
14403 |
lt_compile=`echo "$ac_compile" | $SED \ |
14404 |
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
14405 |
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
14406 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
14407 |
-e 's:$: $lt_compiler_flag:'` |
14408 |
- (eval echo "\"\$as_me:10639: $lt_compile\"" >&5) |
14409 |
+ (eval echo "\"\$as_me:11172: $lt_compile\"" >&5) |
14410 |
(eval "$lt_compile" 2>out/conftest.err) |
14411 |
ac_status=$? |
14412 |
cat out/conftest.err >&5 |
14413 |
- echo "$as_me:10643: \$? = $ac_status" >&5 |
14414 |
+ echo "$as_me:11176: \$? = $ac_status" >&5 |
14415 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext |
14416 |
then |
14417 |
# The compiler can only warn and ignore the option if not recognized |
14418 |
# So say no if there are warnings |
14419 |
- if test ! -s out/conftest.err; then |
14420 |
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
14421 |
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
14422 |
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
14423 |
lt_cv_prog_compiler_c_o_CXX=yes |
14424 |
fi |
14425 |
fi |
14426 |
- chmod u+w . |
14427 |
+ chmod u+w . 2>&5 |
14428 |
$rm conftest* |
14429 |
# SGI C++ compiler will create directory out/ii_files/ for |
14430 |
# template instantiation |
14431 |
@@ -10704,7 +11239,10 @@ |
14432 |
export_symbols_cmds_CXX="$ltdll_cmds" |
14433 |
;; |
14434 |
cygwin* | mingw*) |
14435 |
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' |
14436 |
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' |
14437 |
+ ;; |
14438 |
+ kfreebsd*-gnu) |
14439 |
+ link_all_deplibs_CXX=no |
14440 |
;; |
14441 |
linux*) |
14442 |
link_all_deplibs_CXX=no |
14443 |
@@ -10718,11 +11256,6 @@ |
14444 |
echo "${ECHO_T}$ld_shlibs_CXX" >&6 |
14445 |
test "$ld_shlibs_CXX" = no && can_build_shared=no |
14446 |
|
14447 |
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
14448 |
-if test "$GCC" = yes; then |
14449 |
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
14450 |
-fi |
14451 |
- |
14452 |
# |
14453 |
# Do we need to explicitly link libc? |
14454 |
# |
14455 |
@@ -10755,6 +11288,7 @@ |
14456 |
libobjs=conftest.$ac_objext |
14457 |
deplibs= |
14458 |
wl=$lt_prog_compiler_wl_CXX |
14459 |
+ pic_flag=$lt_prog_compiler_pic_CXX |
14460 |
compiler_flags=-v |
14461 |
linker_flags=-v |
14462 |
verstring= |
14463 |
@@ -10887,7 +11421,7 @@ |
14464 |
shlibpath_var=LIBRARY_PATH |
14465 |
;; |
14466 |
|
14467 |
-bsdi4*) |
14468 |
+bsdi[45]*) |
14469 |
version_type=linux |
14470 |
need_version=no |
14471 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
14472 |
@@ -10915,7 +11449,8 @@ |
14473 |
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ |
14474 |
dldir=$destdir/`dirname \$dlpath`~ |
14475 |
test -d \$dldir || mkdir -p \$dldir~ |
14476 |
- $install_prog $dir/$dlname \$dldir/$dlname' |
14477 |
+ $install_prog $dir/$dlname \$dldir/$dlname~ |
14478 |
+ chmod a+x \$dldir/$dlname' |
14479 |
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
14480 |
dlpath=$dir/\$dldll~ |
14481 |
$rm \$dlpath' |
14482 |
@@ -10945,7 +11480,7 @@ |
14483 |
;; |
14484 |
pw32*) |
14485 |
# pw32 DLLs use 'pw' prefix rather than 'lib' |
14486 |
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' |
14487 |
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
14488 |
;; |
14489 |
esac |
14490 |
;; |
14491 |
@@ -10968,7 +11503,7 @@ |
14492 |
soname_spec='${libname}${release}${major}$shared_ext' |
14493 |
shlibpath_overrides_runpath=yes |
14494 |
shlibpath_var=DYLD_LIBRARY_PATH |
14495 |
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' |
14496 |
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
14497 |
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
14498 |
if test "$GCC" = yes; then |
14499 |
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` |
14500 |
@@ -11003,8 +11538,17 @@ |
14501 |
dynamic_linker='GNU ld.so' |
14502 |
;; |
14503 |
|
14504 |
-freebsd*) |
14505 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
14506 |
+freebsd* | dragonfly*) |
14507 |
+ # DragonFly does not have aout. When/if they implement a new |
14508 |
+ # versioning mechanism, adjust this. |
14509 |
+ if test -x /usr/bin/objformat; then |
14510 |
+ objformat=`/usr/bin/objformat` |
14511 |
+ else |
14512 |
+ case $host_os in |
14513 |
+ freebsd[123]*) objformat=aout ;; |
14514 |
+ *) objformat=elf ;; |
14515 |
+ esac |
14516 |
+ fi |
14517 |
version_type=freebsd-$objformat |
14518 |
case $version_type in |
14519 |
freebsd-elf*) |
14520 |
@@ -11022,14 +11566,19 @@ |
14521 |
freebsd2*) |
14522 |
shlibpath_overrides_runpath=yes |
14523 |
;; |
14524 |
- freebsd3.01* | freebsdelf3.01*) |
14525 |
+ freebsd3.[01]* | freebsdelf3.[01]*) |
14526 |
shlibpath_overrides_runpath=yes |
14527 |
hardcode_into_libs=yes |
14528 |
;; |
14529 |
- *) # from 3.2 on |
14530 |
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ |
14531 |
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) |
14532 |
shlibpath_overrides_runpath=no |
14533 |
hardcode_into_libs=yes |
14534 |
;; |
14535 |
+ freebsd*) # from 4.6 on |
14536 |
+ shlibpath_overrides_runpath=yes |
14537 |
+ hardcode_into_libs=yes |
14538 |
+ ;; |
14539 |
esac |
14540 |
;; |
14541 |
|
14542 |
@@ -11049,7 +11598,7 @@ |
14543 |
version_type=sunos |
14544 |
need_lib_prefix=no |
14545 |
need_version=no |
14546 |
- case "$host_cpu" in |
14547 |
+ case $host_cpu in |
14548 |
ia64*) |
14549 |
shrext_cmds='.so' |
14550 |
hardcode_into_libs=yes |
14551 |
@@ -11089,6 +11638,18 @@ |
14552 |
postinstall_cmds='chmod 555 $lib' |
14553 |
;; |
14554 |
|
14555 |
+interix3*) |
14556 |
+ version_type=linux |
14557 |
+ need_lib_prefix=no |
14558 |
+ need_version=no |
14559 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
14560 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
14561 |
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' |
14562 |
+ shlibpath_var=LD_LIBRARY_PATH |
14563 |
+ shlibpath_overrides_runpath=no |
14564 |
+ hardcode_into_libs=yes |
14565 |
+ ;; |
14566 |
+ |
14567 |
irix5* | irix6* | nonstopux*) |
14568 |
case $host_os in |
14569 |
nonstopux*) version_type=nonstopux ;; |
14570 |
@@ -11148,7 +11709,7 @@ |
14571 |
|
14572 |
# Append ld.so.conf contents to the search path |
14573 |
if test -f /etc/ld.so.conf; then |
14574 |
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` |
14575 |
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
14576 |
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
14577 |
fi |
14578 |
|
14579 |
@@ -11222,8 +11783,13 @@ |
14580 |
|
14581 |
openbsd*) |
14582 |
version_type=sunos |
14583 |
+ sys_lib_dlsearch_path_spec="/usr/lib" |
14584 |
need_lib_prefix=no |
14585 |
- need_version=yes |
14586 |
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. |
14587 |
+ case $host_os in |
14588 |
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; |
14589 |
+ *) need_version=no ;; |
14590 |
+ esac |
14591 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
14592 |
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
14593 |
shlibpath_var=LD_LIBRARY_PATH |
14594 |
@@ -11261,13 +11827,6 @@ |
14595 |
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" |
14596 |
;; |
14597 |
|
14598 |
-sco3.2v5*) |
14599 |
- version_type=osf |
14600 |
- soname_spec='${libname}${release}${shared_ext}$major' |
14601 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
14602 |
- shlibpath_var=LD_LIBRARY_PATH |
14603 |
- ;; |
14604 |
- |
14605 |
solaris*) |
14606 |
version_type=linux |
14607 |
need_lib_prefix=no |
14608 |
@@ -11293,7 +11852,7 @@ |
14609 |
need_version=yes |
14610 |
;; |
14611 |
|
14612 |
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
14613 |
+sysv4 | sysv4.3*) |
14614 |
version_type=linux |
14615 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
14616 |
soname_spec='${libname}${release}${shared_ext}$major' |
14617 |
@@ -11326,6 +11885,29 @@ |
14618 |
fi |
14619 |
;; |
14620 |
|
14621 |
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
14622 |
+ version_type=freebsd-elf |
14623 |
+ need_lib_prefix=no |
14624 |
+ need_version=no |
14625 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
14626 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
14627 |
+ shlibpath_var=LD_LIBRARY_PATH |
14628 |
+ hardcode_into_libs=yes |
14629 |
+ if test "$with_gnu_ld" = yes; then |
14630 |
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' |
14631 |
+ shlibpath_overrides_runpath=no |
14632 |
+ else |
14633 |
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' |
14634 |
+ shlibpath_overrides_runpath=yes |
14635 |
+ case $host_os in |
14636 |
+ sco3.2v5*) |
14637 |
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" |
14638 |
+ ;; |
14639 |
+ esac |
14640 |
+ fi |
14641 |
+ sys_lib_dlsearch_path_spec='/usr/lib' |
14642 |
+ ;; |
14643 |
+ |
14644 |
uts4*) |
14645 |
version_type=linux |
14646 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
14647 |
@@ -11341,12 +11923,17 @@ |
14648 |
echo "${ECHO_T}$dynamic_linker" >&6 |
14649 |
test "$dynamic_linker" = no && can_build_shared=no |
14650 |
|
14651 |
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
14652 |
+if test "$GCC" = yes; then |
14653 |
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
14654 |
+fi |
14655 |
+ |
14656 |
echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
14657 |
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 |
14658 |
hardcode_action_CXX= |
14659 |
if test -n "$hardcode_libdir_flag_spec_CXX" || \ |
14660 |
- test -n "$runpath_var CXX" || \ |
14661 |
- test "X$hardcode_automatic_CXX"="Xyes" ; then |
14662 |
+ test -n "$runpath_var_CXX" || \ |
14663 |
+ test "X$hardcode_automatic_CXX" = "Xyes" ; then |
14664 |
|
14665 |
# We can hardcode non-existant directories. |
14666 |
if test "$hardcode_direct_CXX" != no && |
14667 |
@@ -11378,1221 +11965,402 @@ |
14668 |
enable_fast_install=needless |
14669 |
fi |
14670 |
|
14671 |
-striplib= |
14672 |
-old_striplib= |
14673 |
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 |
14674 |
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 |
14675 |
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then |
14676 |
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" |
14677 |
- test -z "$striplib" && striplib="$STRIP --strip-unneeded" |
14678 |
- echo "$as_me:$LINENO: result: yes" >&5 |
14679 |
-echo "${ECHO_T}yes" >&6 |
14680 |
-else |
14681 |
-# FIXME - insert some real tests, host_os isn't really good enough |
14682 |
- case $host_os in |
14683 |
- darwin*) |
14684 |
- if test -n "$STRIP" ; then |
14685 |
- striplib="$STRIP -x" |
14686 |
- echo "$as_me:$LINENO: result: yes" >&5 |
14687 |
-echo "${ECHO_T}yes" >&6 |
14688 |
- else |
14689 |
- echo "$as_me:$LINENO: result: no" >&5 |
14690 |
-echo "${ECHO_T}no" >&6 |
14691 |
-fi |
14692 |
- ;; |
14693 |
- *) |
14694 |
- echo "$as_me:$LINENO: result: no" >&5 |
14695 |
-echo "${ECHO_T}no" >&6 |
14696 |
+ |
14697 |
+# The else clause should only fire when bootstrapping the |
14698 |
+# libtool distribution, otherwise you forgot to ship ltmain.sh |
14699 |
+# with your package, and you will get complaints that there are |
14700 |
+# no rules to generate ltmain.sh. |
14701 |
+if test -f "$ltmain"; then |
14702 |
+ # See if we are running on zsh, and set the options which allow our commands through |
14703 |
+ # without removal of \ escapes. |
14704 |
+ if test -n "${ZSH_VERSION+set}" ; then |
14705 |
+ setopt NO_GLOB_SUBST |
14706 |
+ fi |
14707 |
+ # Now quote all the things that may contain metacharacters while being |
14708 |
+ # careful not to overquote the AC_SUBSTed values. We take copies of the |
14709 |
+ # variables and quote the copies for generation of the libtool script. |
14710 |
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ |
14711 |
+ SED SHELL STRIP \ |
14712 |
+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
14713 |
+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
14714 |
+ deplibs_check_method reload_flag reload_cmds need_locks \ |
14715 |
+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ |
14716 |
+ lt_cv_sys_global_symbol_to_c_name_address \ |
14717 |
+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ |
14718 |
+ old_postinstall_cmds old_postuninstall_cmds \ |
14719 |
+ compiler_CXX \ |
14720 |
+ CC_CXX \ |
14721 |
+ LD_CXX \ |
14722 |
+ lt_prog_compiler_wl_CXX \ |
14723 |
+ lt_prog_compiler_pic_CXX \ |
14724 |
+ lt_prog_compiler_static_CXX \ |
14725 |
+ lt_prog_compiler_no_builtin_flag_CXX \ |
14726 |
+ export_dynamic_flag_spec_CXX \ |
14727 |
+ thread_safe_flag_spec_CXX \ |
14728 |
+ whole_archive_flag_spec_CXX \ |
14729 |
+ enable_shared_with_static_runtimes_CXX \ |
14730 |
+ old_archive_cmds_CXX \ |
14731 |
+ old_archive_from_new_cmds_CXX \ |
14732 |
+ predep_objects_CXX \ |
14733 |
+ postdep_objects_CXX \ |
14734 |
+ predeps_CXX \ |
14735 |
+ postdeps_CXX \ |
14736 |
+ compiler_lib_search_path_CXX \ |
14737 |
+ archive_cmds_CXX \ |
14738 |
+ archive_expsym_cmds_CXX \ |
14739 |
+ postinstall_cmds_CXX \ |
14740 |
+ postuninstall_cmds_CXX \ |
14741 |
+ old_archive_from_expsyms_cmds_CXX \ |
14742 |
+ allow_undefined_flag_CXX \ |
14743 |
+ no_undefined_flag_CXX \ |
14744 |
+ export_symbols_cmds_CXX \ |
14745 |
+ hardcode_libdir_flag_spec_CXX \ |
14746 |
+ hardcode_libdir_flag_spec_ld_CXX \ |
14747 |
+ hardcode_libdir_separator_CXX \ |
14748 |
+ hardcode_automatic_CXX \ |
14749 |
+ module_cmds_CXX \ |
14750 |
+ module_expsym_cmds_CXX \ |
14751 |
+ lt_cv_prog_compiler_c_o_CXX \ |
14752 |
+ exclude_expsyms_CXX \ |
14753 |
+ include_expsyms_CXX; do |
14754 |
+ |
14755 |
+ case $var in |
14756 |
+ old_archive_cmds_CXX | \ |
14757 |
+ old_archive_from_new_cmds_CXX | \ |
14758 |
+ archive_cmds_CXX | \ |
14759 |
+ archive_expsym_cmds_CXX | \ |
14760 |
+ module_cmds_CXX | \ |
14761 |
+ module_expsym_cmds_CXX | \ |
14762 |
+ old_archive_from_expsyms_cmds_CXX | \ |
14763 |
+ export_symbols_cmds_CXX | \ |
14764 |
+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ |
14765 |
+ postinstall_cmds | postuninstall_cmds | \ |
14766 |
+ old_postinstall_cmds | old_postuninstall_cmds | \ |
14767 |
+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) |
14768 |
+ # Double-quote double-evaled strings. |
14769 |
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" |
14770 |
+ ;; |
14771 |
+ *) |
14772 |
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" |
14773 |
+ ;; |
14774 |
+ esac |
14775 |
+ done |
14776 |
+ |
14777 |
+ case $lt_echo in |
14778 |
+ *'\$0 --fallback-echo"') |
14779 |
+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` |
14780 |
;; |
14781 |
esac |
14782 |
-fi |
14783 |
|
14784 |
-if test "x$enable_dlopen" != xyes; then |
14785 |
- enable_dlopen=unknown |
14786 |
- enable_dlopen_self=unknown |
14787 |
- enable_dlopen_self_static=unknown |
14788 |
-else |
14789 |
- lt_cv_dlopen=no |
14790 |
- lt_cv_dlopen_libs= |
14791 |
+cfgfile="$ofile" |
14792 |
|
14793 |
- case $host_os in |
14794 |
- beos*) |
14795 |
- lt_cv_dlopen="load_add_on" |
14796 |
- lt_cv_dlopen_libs= |
14797 |
- lt_cv_dlopen_self=yes |
14798 |
- ;; |
14799 |
+ cat <<__EOF__ >> "$cfgfile" |
14800 |
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname |
14801 |
|
14802 |
- mingw* | pw32*) |
14803 |
- lt_cv_dlopen="LoadLibrary" |
14804 |
- lt_cv_dlopen_libs= |
14805 |
- ;; |
14806 |
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: |
14807 |
|
14808 |
- cygwin*) |
14809 |
- lt_cv_dlopen="dlopen" |
14810 |
- lt_cv_dlopen_libs= |
14811 |
- ;; |
14812 |
+# Shell to use when invoking shell scripts. |
14813 |
+SHELL=$lt_SHELL |
14814 |
|
14815 |
- darwin*) |
14816 |
- # if libdl is installed we need to link against it |
14817 |
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 |
14818 |
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 |
14819 |
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then |
14820 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
14821 |
-else |
14822 |
- ac_check_lib_save_LIBS=$LIBS |
14823 |
-LIBS="-ldl $LIBS" |
14824 |
-cat >conftest.$ac_ext <<_ACEOF |
14825 |
-/* confdefs.h. */ |
14826 |
-_ACEOF |
14827 |
-cat confdefs.h >>conftest.$ac_ext |
14828 |
-cat >>conftest.$ac_ext <<_ACEOF |
14829 |
-/* end confdefs.h. */ |
14830 |
+# Whether or not to build shared libraries. |
14831 |
+build_libtool_libs=$enable_shared |
14832 |
|
14833 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
14834 |
-#ifdef __cplusplus |
14835 |
-extern "C" |
14836 |
-#endif |
14837 |
-/* We use char because int might match the return type of a gcc2 |
14838 |
- builtin and then its argument prototype would still apply. */ |
14839 |
-char dlopen (); |
14840 |
-int |
14841 |
-main () |
14842 |
-{ |
14843 |
-dlopen (); |
14844 |
- ; |
14845 |
- return 0; |
14846 |
-} |
14847 |
-_ACEOF |
14848 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
14849 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
14850 |
- (eval $ac_link) 2>conftest.er1 |
14851 |
- ac_status=$? |
14852 |
- grep -v '^ *+' conftest.er1 >conftest.err |
14853 |
- rm -f conftest.er1 |
14854 |
- cat conftest.err >&5 |
14855 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14856 |
- (exit $ac_status); } && |
14857 |
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' |
14858 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
14859 |
- (eval $ac_try) 2>&5 |
14860 |
- ac_status=$? |
14861 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14862 |
- (exit $ac_status); }; } && |
14863 |
- { ac_try='test -s conftest$ac_exeext' |
14864 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
14865 |
- (eval $ac_try) 2>&5 |
14866 |
- ac_status=$? |
14867 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14868 |
- (exit $ac_status); }; }; then |
14869 |
- ac_cv_lib_dl_dlopen=yes |
14870 |
-else |
14871 |
- echo "$as_me: failed program was:" >&5 |
14872 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
14873 |
+# Whether or not to build static libraries. |
14874 |
+build_old_libs=$enable_static |
14875 |
|
14876 |
-ac_cv_lib_dl_dlopen=no |
14877 |
-fi |
14878 |
-rm -f conftest.err conftest.$ac_objext \ |
14879 |
- conftest$ac_exeext conftest.$ac_ext |
14880 |
-LIBS=$ac_check_lib_save_LIBS |
14881 |
-fi |
14882 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 |
14883 |
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 |
14884 |
-if test $ac_cv_lib_dl_dlopen = yes; then |
14885 |
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
14886 |
-else |
14887 |
+# Whether or not to add -lc for building shared libraries. |
14888 |
+build_libtool_need_lc=$archive_cmds_need_lc_CXX |
14889 |
|
14890 |
- lt_cv_dlopen="dyld" |
14891 |
- lt_cv_dlopen_libs= |
14892 |
- lt_cv_dlopen_self=yes |
14893 |
+# Whether or not to disallow shared libs when runtime libs are static |
14894 |
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX |
14895 |
|
14896 |
-fi |
14897 |
+# Whether or not to optimize for fast installation. |
14898 |
+fast_install=$enable_fast_install |
14899 |
|
14900 |
- ;; |
14901 |
+# The host system. |
14902 |
+host_alias=$host_alias |
14903 |
+host=$host |
14904 |
+host_os=$host_os |
14905 |
|
14906 |
- *) |
14907 |
- echo "$as_me:$LINENO: checking for shl_load" >&5 |
14908 |
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 |
14909 |
-if test "${ac_cv_func_shl_load+set}" = set; then |
14910 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
14911 |
-else |
14912 |
- cat >conftest.$ac_ext <<_ACEOF |
14913 |
-/* confdefs.h. */ |
14914 |
-_ACEOF |
14915 |
-cat confdefs.h >>conftest.$ac_ext |
14916 |
-cat >>conftest.$ac_ext <<_ACEOF |
14917 |
-/* end confdefs.h. */ |
14918 |
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. |
14919 |
- For example, HP-UX 11i <limits.h> declares gettimeofday. */ |
14920 |
-#define shl_load innocuous_shl_load |
14921 |
+# The build system. |
14922 |
+build_alias=$build_alias |
14923 |
+build=$build |
14924 |
+build_os=$build_os |
14925 |
|
14926 |
-/* System header to define __stub macros and hopefully few prototypes, |
14927 |
- which can conflict with char shl_load (); below. |
14928 |
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
14929 |
- <limits.h> exists even on freestanding compilers. */ |
14930 |
+# An echo program that does not interpret backslashes. |
14931 |
+echo=$lt_echo |
14932 |
|
14933 |
-#ifdef __STDC__ |
14934 |
-# include <limits.h> |
14935 |
-#else |
14936 |
-# include <assert.h> |
14937 |
-#endif |
14938 |
+# The archiver. |
14939 |
+AR=$lt_AR |
14940 |
+AR_FLAGS=$lt_AR_FLAGS |
14941 |
|
14942 |
-#undef shl_load |
14943 |
+# A C compiler. |
14944 |
+LTCC=$lt_LTCC |
14945 |
|
14946 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
14947 |
-#ifdef __cplusplus |
14948 |
-extern "C" |
14949 |
-{ |
14950 |
-#endif |
14951 |
-/* We use char because int might match the return type of a gcc2 |
14952 |
- builtin and then its argument prototype would still apply. */ |
14953 |
-char shl_load (); |
14954 |
-/* The GNU C library defines this for functions which it implements |
14955 |
- to always fail with ENOSYS. Some functions are actually named |
14956 |
- something starting with __ and the normal name is an alias. */ |
14957 |
-#if defined (__stub_shl_load) || defined (__stub___shl_load) |
14958 |
-choke me |
14959 |
-#else |
14960 |
-char (*f) () = shl_load; |
14961 |
-#endif |
14962 |
-#ifdef __cplusplus |
14963 |
-} |
14964 |
-#endif |
14965 |
+# LTCC compiler flags. |
14966 |
+LTCFLAGS=$lt_LTCFLAGS |
14967 |
|
14968 |
-int |
14969 |
-main () |
14970 |
-{ |
14971 |
-return f != shl_load; |
14972 |
- ; |
14973 |
- return 0; |
14974 |
-} |
14975 |
-_ACEOF |
14976 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
14977 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
14978 |
- (eval $ac_link) 2>conftest.er1 |
14979 |
- ac_status=$? |
14980 |
- grep -v '^ *+' conftest.er1 >conftest.err |
14981 |
- rm -f conftest.er1 |
14982 |
- cat conftest.err >&5 |
14983 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14984 |
- (exit $ac_status); } && |
14985 |
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' |
14986 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
14987 |
- (eval $ac_try) 2>&5 |
14988 |
- ac_status=$? |
14989 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14990 |
- (exit $ac_status); }; } && |
14991 |
- { ac_try='test -s conftest$ac_exeext' |
14992 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
14993 |
- (eval $ac_try) 2>&5 |
14994 |
- ac_status=$? |
14995 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14996 |
- (exit $ac_status); }; }; then |
14997 |
- ac_cv_func_shl_load=yes |
14998 |
-else |
14999 |
- echo "$as_me: failed program was:" >&5 |
15000 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
15001 |
+# A language-specific compiler. |
15002 |
+CC=$lt_compiler_CXX |
15003 |
|
15004 |
-ac_cv_func_shl_load=no |
15005 |
-fi |
15006 |
-rm -f conftest.err conftest.$ac_objext \ |
15007 |
- conftest$ac_exeext conftest.$ac_ext |
15008 |
-fi |
15009 |
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 |
15010 |
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6 |
15011 |
-if test $ac_cv_func_shl_load = yes; then |
15012 |
- lt_cv_dlopen="shl_load" |
15013 |
-else |
15014 |
- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 |
15015 |
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 |
15016 |
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then |
15017 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
15018 |
-else |
15019 |
- ac_check_lib_save_LIBS=$LIBS |
15020 |
-LIBS="-ldld $LIBS" |
15021 |
-cat >conftest.$ac_ext <<_ACEOF |
15022 |
-/* confdefs.h. */ |
15023 |
-_ACEOF |
15024 |
-cat confdefs.h >>conftest.$ac_ext |
15025 |
-cat >>conftest.$ac_ext <<_ACEOF |
15026 |
-/* end confdefs.h. */ |
15027 |
+# Is the compiler the GNU C compiler? |
15028 |
+with_gcc=$GCC_CXX |
15029 |
|
15030 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
15031 |
-#ifdef __cplusplus |
15032 |
-extern "C" |
15033 |
-#endif |
15034 |
-/* We use char because int might match the return type of a gcc2 |
15035 |
- builtin and then its argument prototype would still apply. */ |
15036 |
-char shl_load (); |
15037 |
-int |
15038 |
-main () |
15039 |
-{ |
15040 |
-shl_load (); |
15041 |
- ; |
15042 |
- return 0; |
15043 |
-} |
15044 |
-_ACEOF |
15045 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
15046 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15047 |
- (eval $ac_link) 2>conftest.er1 |
15048 |
- ac_status=$? |
15049 |
- grep -v '^ *+' conftest.er1 >conftest.err |
15050 |
- rm -f conftest.er1 |
15051 |
- cat conftest.err >&5 |
15052 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15053 |
- (exit $ac_status); } && |
15054 |
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' |
15055 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15056 |
- (eval $ac_try) 2>&5 |
15057 |
- ac_status=$? |
15058 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15059 |
- (exit $ac_status); }; } && |
15060 |
- { ac_try='test -s conftest$ac_exeext' |
15061 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15062 |
- (eval $ac_try) 2>&5 |
15063 |
- ac_status=$? |
15064 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15065 |
- (exit $ac_status); }; }; then |
15066 |
- ac_cv_lib_dld_shl_load=yes |
15067 |
-else |
15068 |
- echo "$as_me: failed program was:" >&5 |
15069 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
15070 |
+# An ERE matcher. |
15071 |
+EGREP=$lt_EGREP |
15072 |
|
15073 |
-ac_cv_lib_dld_shl_load=no |
15074 |
-fi |
15075 |
-rm -f conftest.err conftest.$ac_objext \ |
15076 |
- conftest$ac_exeext conftest.$ac_ext |
15077 |
-LIBS=$ac_check_lib_save_LIBS |
15078 |
-fi |
15079 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 |
15080 |
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 |
15081 |
-if test $ac_cv_lib_dld_shl_load = yes; then |
15082 |
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" |
15083 |
-else |
15084 |
- echo "$as_me:$LINENO: checking for dlopen" >&5 |
15085 |
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 |
15086 |
-if test "${ac_cv_func_dlopen+set}" = set; then |
15087 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
15088 |
-else |
15089 |
- cat >conftest.$ac_ext <<_ACEOF |
15090 |
-/* confdefs.h. */ |
15091 |
-_ACEOF |
15092 |
-cat confdefs.h >>conftest.$ac_ext |
15093 |
-cat >>conftest.$ac_ext <<_ACEOF |
15094 |
-/* end confdefs.h. */ |
15095 |
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. |
15096 |
- For example, HP-UX 11i <limits.h> declares gettimeofday. */ |
15097 |
-#define dlopen innocuous_dlopen |
15098 |
+# The linker used to build libraries. |
15099 |
+LD=$lt_LD_CXX |
15100 |
|
15101 |
-/* System header to define __stub macros and hopefully few prototypes, |
15102 |
- which can conflict with char dlopen (); below. |
15103 |
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
15104 |
- <limits.h> exists even on freestanding compilers. */ |
15105 |
+# Whether we need hard or soft links. |
15106 |
+LN_S=$lt_LN_S |
15107 |
|
15108 |
-#ifdef __STDC__ |
15109 |
-# include <limits.h> |
15110 |
-#else |
15111 |
-# include <assert.h> |
15112 |
-#endif |
15113 |
+# A BSD-compatible nm program. |
15114 |
+NM=$lt_NM |
15115 |
|
15116 |
-#undef dlopen |
15117 |
+# A symbol stripping program |
15118 |
+STRIP=$lt_STRIP |
15119 |
|
15120 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
15121 |
-#ifdef __cplusplus |
15122 |
-extern "C" |
15123 |
-{ |
15124 |
-#endif |
15125 |
-/* We use char because int might match the return type of a gcc2 |
15126 |
- builtin and then its argument prototype would still apply. */ |
15127 |
-char dlopen (); |
15128 |
-/* The GNU C library defines this for functions which it implements |
15129 |
- to always fail with ENOSYS. Some functions are actually named |
15130 |
- something starting with __ and the normal name is an alias. */ |
15131 |
-#if defined (__stub_dlopen) || defined (__stub___dlopen) |
15132 |
-choke me |
15133 |
-#else |
15134 |
-char (*f) () = dlopen; |
15135 |
-#endif |
15136 |
-#ifdef __cplusplus |
15137 |
-} |
15138 |
-#endif |
15139 |
+# Used to examine libraries when file_magic_cmd begins "file" |
15140 |
+MAGIC_CMD=$MAGIC_CMD |
15141 |
|
15142 |
-int |
15143 |
-main () |
15144 |
-{ |
15145 |
-return f != dlopen; |
15146 |
- ; |
15147 |
- return 0; |
15148 |
-} |
15149 |
-_ACEOF |
15150 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
15151 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15152 |
- (eval $ac_link) 2>conftest.er1 |
15153 |
- ac_status=$? |
15154 |
- grep -v '^ *+' conftest.er1 >conftest.err |
15155 |
- rm -f conftest.er1 |
15156 |
- cat conftest.err >&5 |
15157 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15158 |
- (exit $ac_status); } && |
15159 |
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' |
15160 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15161 |
- (eval $ac_try) 2>&5 |
15162 |
- ac_status=$? |
15163 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15164 |
- (exit $ac_status); }; } && |
15165 |
- { ac_try='test -s conftest$ac_exeext' |
15166 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15167 |
- (eval $ac_try) 2>&5 |
15168 |
- ac_status=$? |
15169 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15170 |
- (exit $ac_status); }; }; then |
15171 |
- ac_cv_func_dlopen=yes |
15172 |
-else |
15173 |
- echo "$as_me: failed program was:" >&5 |
15174 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
15175 |
+# Used on cygwin: DLL creation program. |
15176 |
+DLLTOOL="$DLLTOOL" |
15177 |
|
15178 |
-ac_cv_func_dlopen=no |
15179 |
-fi |
15180 |
-rm -f conftest.err conftest.$ac_objext \ |
15181 |
- conftest$ac_exeext conftest.$ac_ext |
15182 |
-fi |
15183 |
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 |
15184 |
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6 |
15185 |
-if test $ac_cv_func_dlopen = yes; then |
15186 |
- lt_cv_dlopen="dlopen" |
15187 |
-else |
15188 |
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 |
15189 |
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 |
15190 |
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then |
15191 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
15192 |
-else |
15193 |
- ac_check_lib_save_LIBS=$LIBS |
15194 |
-LIBS="-ldl $LIBS" |
15195 |
-cat >conftest.$ac_ext <<_ACEOF |
15196 |
-/* confdefs.h. */ |
15197 |
-_ACEOF |
15198 |
-cat confdefs.h >>conftest.$ac_ext |
15199 |
-cat >>conftest.$ac_ext <<_ACEOF |
15200 |
-/* end confdefs.h. */ |
15201 |
+# Used on cygwin: object dumper. |
15202 |
+OBJDUMP="$OBJDUMP" |
15203 |
|
15204 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
15205 |
-#ifdef __cplusplus |
15206 |
-extern "C" |
15207 |
-#endif |
15208 |
-/* We use char because int might match the return type of a gcc2 |
15209 |
- builtin and then its argument prototype would still apply. */ |
15210 |
-char dlopen (); |
15211 |
-int |
15212 |
-main () |
15213 |
-{ |
15214 |
-dlopen (); |
15215 |
- ; |
15216 |
- return 0; |
15217 |
-} |
15218 |
-_ACEOF |
15219 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
15220 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15221 |
- (eval $ac_link) 2>conftest.er1 |
15222 |
- ac_status=$? |
15223 |
- grep -v '^ *+' conftest.er1 >conftest.err |
15224 |
- rm -f conftest.er1 |
15225 |
- cat conftest.err >&5 |
15226 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15227 |
- (exit $ac_status); } && |
15228 |
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' |
15229 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15230 |
- (eval $ac_try) 2>&5 |
15231 |
- ac_status=$? |
15232 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15233 |
- (exit $ac_status); }; } && |
15234 |
- { ac_try='test -s conftest$ac_exeext' |
15235 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15236 |
- (eval $ac_try) 2>&5 |
15237 |
- ac_status=$? |
15238 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15239 |
- (exit $ac_status); }; }; then |
15240 |
- ac_cv_lib_dl_dlopen=yes |
15241 |
-else |
15242 |
- echo "$as_me: failed program was:" >&5 |
15243 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
15244 |
+# Used on cygwin: assembler. |
15245 |
+AS="$AS" |
15246 |
|
15247 |
-ac_cv_lib_dl_dlopen=no |
15248 |
-fi |
15249 |
-rm -f conftest.err conftest.$ac_objext \ |
15250 |
- conftest$ac_exeext conftest.$ac_ext |
15251 |
-LIBS=$ac_check_lib_save_LIBS |
15252 |
-fi |
15253 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 |
15254 |
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 |
15255 |
-if test $ac_cv_lib_dl_dlopen = yes; then |
15256 |
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
15257 |
-else |
15258 |
- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 |
15259 |
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 |
15260 |
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then |
15261 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
15262 |
-else |
15263 |
- ac_check_lib_save_LIBS=$LIBS |
15264 |
-LIBS="-lsvld $LIBS" |
15265 |
-cat >conftest.$ac_ext <<_ACEOF |
15266 |
-/* confdefs.h. */ |
15267 |
-_ACEOF |
15268 |
-cat confdefs.h >>conftest.$ac_ext |
15269 |
-cat >>conftest.$ac_ext <<_ACEOF |
15270 |
-/* end confdefs.h. */ |
15271 |
+# The name of the directory that contains temporary libtool files. |
15272 |
+objdir=$objdir |
15273 |
|
15274 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
15275 |
-#ifdef __cplusplus |
15276 |
-extern "C" |
15277 |
-#endif |
15278 |
-/* We use char because int might match the return type of a gcc2 |
15279 |
- builtin and then its argument prototype would still apply. */ |
15280 |
-char dlopen (); |
15281 |
-int |
15282 |
-main () |
15283 |
-{ |
15284 |
-dlopen (); |
15285 |
- ; |
15286 |
- return 0; |
15287 |
-} |
15288 |
-_ACEOF |
15289 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
15290 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15291 |
- (eval $ac_link) 2>conftest.er1 |
15292 |
- ac_status=$? |
15293 |
- grep -v '^ *+' conftest.er1 >conftest.err |
15294 |
- rm -f conftest.er1 |
15295 |
- cat conftest.err >&5 |
15296 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15297 |
- (exit $ac_status); } && |
15298 |
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' |
15299 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15300 |
- (eval $ac_try) 2>&5 |
15301 |
- ac_status=$? |
15302 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15303 |
- (exit $ac_status); }; } && |
15304 |
- { ac_try='test -s conftest$ac_exeext' |
15305 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15306 |
- (eval $ac_try) 2>&5 |
15307 |
- ac_status=$? |
15308 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15309 |
- (exit $ac_status); }; }; then |
15310 |
- ac_cv_lib_svld_dlopen=yes |
15311 |
-else |
15312 |
- echo "$as_me: failed program was:" >&5 |
15313 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
15314 |
+# How to create reloadable object files. |
15315 |
+reload_flag=$lt_reload_flag |
15316 |
+reload_cmds=$lt_reload_cmds |
15317 |
|
15318 |
-ac_cv_lib_svld_dlopen=no |
15319 |
-fi |
15320 |
-rm -f conftest.err conftest.$ac_objext \ |
15321 |
- conftest$ac_exeext conftest.$ac_ext |
15322 |
-LIBS=$ac_check_lib_save_LIBS |
15323 |
-fi |
15324 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 |
15325 |
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 |
15326 |
-if test $ac_cv_lib_svld_dlopen = yes; then |
15327 |
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" |
15328 |
-else |
15329 |
- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 |
15330 |
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 |
15331 |
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then |
15332 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
15333 |
-else |
15334 |
- ac_check_lib_save_LIBS=$LIBS |
15335 |
-LIBS="-ldld $LIBS" |
15336 |
-cat >conftest.$ac_ext <<_ACEOF |
15337 |
-/* confdefs.h. */ |
15338 |
-_ACEOF |
15339 |
-cat confdefs.h >>conftest.$ac_ext |
15340 |
-cat >>conftest.$ac_ext <<_ACEOF |
15341 |
-/* end confdefs.h. */ |
15342 |
+# How to pass a linker flag through the compiler. |
15343 |
+wl=$lt_lt_prog_compiler_wl_CXX |
15344 |
|
15345 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
15346 |
-#ifdef __cplusplus |
15347 |
-extern "C" |
15348 |
-#endif |
15349 |
-/* We use char because int might match the return type of a gcc2 |
15350 |
- builtin and then its argument prototype would still apply. */ |
15351 |
-char dld_link (); |
15352 |
-int |
15353 |
-main () |
15354 |
-{ |
15355 |
-dld_link (); |
15356 |
- ; |
15357 |
- return 0; |
15358 |
-} |
15359 |
-_ACEOF |
15360 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
15361 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15362 |
- (eval $ac_link) 2>conftest.er1 |
15363 |
- ac_status=$? |
15364 |
- grep -v '^ *+' conftest.er1 >conftest.err |
15365 |
- rm -f conftest.er1 |
15366 |
- cat conftest.err >&5 |
15367 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15368 |
- (exit $ac_status); } && |
15369 |
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' |
15370 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15371 |
- (eval $ac_try) 2>&5 |
15372 |
- ac_status=$? |
15373 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15374 |
- (exit $ac_status); }; } && |
15375 |
- { ac_try='test -s conftest$ac_exeext' |
15376 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15377 |
- (eval $ac_try) 2>&5 |
15378 |
- ac_status=$? |
15379 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15380 |
- (exit $ac_status); }; }; then |
15381 |
- ac_cv_lib_dld_dld_link=yes |
15382 |
-else |
15383 |
- echo "$as_me: failed program was:" >&5 |
15384 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
15385 |
+# Object file suffix (normally "o"). |
15386 |
+objext="$ac_objext" |
15387 |
|
15388 |
-ac_cv_lib_dld_dld_link=no |
15389 |
-fi |
15390 |
-rm -f conftest.err conftest.$ac_objext \ |
15391 |
- conftest$ac_exeext conftest.$ac_ext |
15392 |
-LIBS=$ac_check_lib_save_LIBS |
15393 |
-fi |
15394 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 |
15395 |
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 |
15396 |
-if test $ac_cv_lib_dld_dld_link = yes; then |
15397 |
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" |
15398 |
-fi |
15399 |
+# Old archive suffix (normally "a"). |
15400 |
+libext="$libext" |
15401 |
|
15402 |
+# Shared library suffix (normally ".so"). |
15403 |
+shrext_cmds='$shrext_cmds' |
15404 |
|
15405 |
-fi |
15406 |
+# Executable file suffix (normally ""). |
15407 |
+exeext="$exeext" |
15408 |
|
15409 |
+# Additional compiler flags for building library objects. |
15410 |
+pic_flag=$lt_lt_prog_compiler_pic_CXX |
15411 |
+pic_mode=$pic_mode |
15412 |
|
15413 |
-fi |
15414 |
+# What is the maximum length of a command? |
15415 |
+max_cmd_len=$lt_cv_sys_max_cmd_len |
15416 |
|
15417 |
+# Does compiler simultaneously support -c and -o options? |
15418 |
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX |
15419 |
|
15420 |
-fi |
15421 |
+# Must we lock files when doing compilation? |
15422 |
+need_locks=$lt_need_locks |
15423 |
|
15424 |
+# Do we need the lib prefix for modules? |
15425 |
+need_lib_prefix=$need_lib_prefix |
15426 |
|
15427 |
-fi |
15428 |
+# Do we need a version for libraries? |
15429 |
+need_version=$need_version |
15430 |
|
15431 |
+# Whether dlopen is supported. |
15432 |
+dlopen_support=$enable_dlopen |
15433 |
|
15434 |
-fi |
15435 |
+# Whether dlopen of programs is supported. |
15436 |
+dlopen_self=$enable_dlopen_self |
15437 |
|
15438 |
- ;; |
15439 |
- esac |
15440 |
+# Whether dlopen of statically linked programs is supported. |
15441 |
+dlopen_self_static=$enable_dlopen_self_static |
15442 |
|
15443 |
- if test "x$lt_cv_dlopen" != xno; then |
15444 |
- enable_dlopen=yes |
15445 |
- else |
15446 |
- enable_dlopen=no |
15447 |
- fi |
15448 |
+# Compiler flag to prevent dynamic linking. |
15449 |
+link_static_flag=$lt_lt_prog_compiler_static_CXX |
15450 |
|
15451 |
- case $lt_cv_dlopen in |
15452 |
- dlopen) |
15453 |
- save_CPPFLAGS="$CPPFLAGS" |
15454 |
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" |
15455 |
+# Compiler flag to turn off builtin functions. |
15456 |
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX |
15457 |
|
15458 |
- save_LDFLAGS="$LDFLAGS" |
15459 |
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" |
15460 |
+# Compiler flag to allow reflexive dlopens. |
15461 |
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX |
15462 |
|
15463 |
- save_LIBS="$LIBS" |
15464 |
- LIBS="$lt_cv_dlopen_libs $LIBS" |
15465 |
+# Compiler flag to generate shared objects directly from archives. |
15466 |
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX |
15467 |
|
15468 |
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 |
15469 |
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 |
15470 |
-if test "${lt_cv_dlopen_self+set}" = set; then |
15471 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
15472 |
-else |
15473 |
- if test "$cross_compiling" = yes; then : |
15474 |
- lt_cv_dlopen_self=cross |
15475 |
-else |
15476 |
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
15477 |
- lt_status=$lt_dlunknown |
15478 |
- cat > conftest.$ac_ext <<EOF |
15479 |
-#line 12008 "configure" |
15480 |
-#include "confdefs.h" |
15481 |
+# Compiler flag to generate thread-safe objects. |
15482 |
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX |
15483 |
|
15484 |
-#if HAVE_DLFCN_H |
15485 |
-#include <dlfcn.h> |
15486 |
-#endif |
15487 |
+# Library versioning type. |
15488 |
+version_type=$version_type |
15489 |
|
15490 |
-#include <stdio.h> |
15491 |
+# Format of library name prefix. |
15492 |
+libname_spec=$lt_libname_spec |
15493 |
|
15494 |
-#ifdef RTLD_GLOBAL |
15495 |
-# define LT_DLGLOBAL RTLD_GLOBAL |
15496 |
-#else |
15497 |
-# ifdef DL_GLOBAL |
15498 |
-# define LT_DLGLOBAL DL_GLOBAL |
15499 |
-# else |
15500 |
-# define LT_DLGLOBAL 0 |
15501 |
-# endif |
15502 |
-#endif |
15503 |
+# List of archive names. First name is the real one, the rest are links. |
15504 |
+# The last name is the one that the linker finds with -lNAME. |
15505 |
+library_names_spec=$lt_library_names_spec |
15506 |
|
15507 |
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we |
15508 |
- find out it does not work in some platform. */ |
15509 |
-#ifndef LT_DLLAZY_OR_NOW |
15510 |
-# ifdef RTLD_LAZY |
15511 |
-# define LT_DLLAZY_OR_NOW RTLD_LAZY |
15512 |
-# else |
15513 |
-# ifdef DL_LAZY |
15514 |
-# define LT_DLLAZY_OR_NOW DL_LAZY |
15515 |
-# else |
15516 |
-# ifdef RTLD_NOW |
15517 |
-# define LT_DLLAZY_OR_NOW RTLD_NOW |
15518 |
-# else |
15519 |
-# ifdef DL_NOW |
15520 |
-# define LT_DLLAZY_OR_NOW DL_NOW |
15521 |
-# else |
15522 |
-# define LT_DLLAZY_OR_NOW 0 |
15523 |
-# endif |
15524 |
-# endif |
15525 |
-# endif |
15526 |
-# endif |
15527 |
-#endif |
15528 |
+# The coded name of the library, if different from the real name. |
15529 |
+soname_spec=$lt_soname_spec |
15530 |
|
15531 |
-#ifdef __cplusplus |
15532 |
-extern "C" void exit (int); |
15533 |
-#endif |
15534 |
+# Commands used to build and install an old-style archive. |
15535 |
+RANLIB=$lt_RANLIB |
15536 |
+old_archive_cmds=$lt_old_archive_cmds_CXX |
15537 |
+old_postinstall_cmds=$lt_old_postinstall_cmds |
15538 |
+old_postuninstall_cmds=$lt_old_postuninstall_cmds |
15539 |
|
15540 |
-void fnord() { int i=42;} |
15541 |
-int main () |
15542 |
-{ |
15543 |
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
15544 |
- int status = $lt_dlunknown; |
15545 |
+# Create an old-style archive from a shared archive. |
15546 |
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX |
15547 |
|
15548 |
- if (self) |
15549 |
- { |
15550 |
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
15551 |
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
15552 |
- /* dlclose (self); */ |
15553 |
- } |
15554 |
+# Create a temporary old-style archive to link instead of a shared archive. |
15555 |
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX |
15556 |
|
15557 |
- exit (status); |
15558 |
-} |
15559 |
-EOF |
15560 |
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15561 |
- (eval $ac_link) 2>&5 |
15562 |
- ac_status=$? |
15563 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15564 |
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then |
15565 |
- (./conftest; exit; ) 2>/dev/null |
15566 |
- lt_status=$? |
15567 |
- case x$lt_status in |
15568 |
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; |
15569 |
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; |
15570 |
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; |
15571 |
- esac |
15572 |
- else : |
15573 |
- # compilation failed |
15574 |
- lt_cv_dlopen_self=no |
15575 |
- fi |
15576 |
-fi |
15577 |
-rm -fr conftest* |
15578 |
+# Commands used to build and install a shared archive. |
15579 |
+archive_cmds=$lt_archive_cmds_CXX |
15580 |
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX |
15581 |
+postinstall_cmds=$lt_postinstall_cmds |
15582 |
+postuninstall_cmds=$lt_postuninstall_cmds |
15583 |
|
15584 |
+# Commands used to build a loadable module (assumed same as above if empty) |
15585 |
+module_cmds=$lt_module_cmds_CXX |
15586 |
+module_expsym_cmds=$lt_module_expsym_cmds_CXX |
15587 |
|
15588 |
-fi |
15589 |
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 |
15590 |
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6 |
15591 |
+# Commands to strip libraries. |
15592 |
+old_striplib=$lt_old_striplib |
15593 |
+striplib=$lt_striplib |
15594 |
|
15595 |
- if test "x$lt_cv_dlopen_self" = xyes; then |
15596 |
- LDFLAGS="$LDFLAGS $link_static_flag" |
15597 |
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 |
15598 |
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 |
15599 |
-if test "${lt_cv_dlopen_self_static+set}" = set; then |
15600 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
15601 |
-else |
15602 |
- if test "$cross_compiling" = yes; then : |
15603 |
- lt_cv_dlopen_self_static=cross |
15604 |
-else |
15605 |
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
15606 |
- lt_status=$lt_dlunknown |
15607 |
- cat > conftest.$ac_ext <<EOF |
15608 |
-#line 12106 "configure" |
15609 |
-#include "confdefs.h" |
15610 |
+# Dependencies to place before the objects being linked to create a |
15611 |
+# shared library. |
15612 |
+predep_objects=$lt_predep_objects_CXX |
15613 |
|
15614 |
-#if HAVE_DLFCN_H |
15615 |
-#include <dlfcn.h> |
15616 |
-#endif |
15617 |
+# Dependencies to place after the objects being linked to create a |
15618 |
+# shared library. |
15619 |
+postdep_objects=$lt_postdep_objects_CXX |
15620 |
|
15621 |
-#include <stdio.h> |
15622 |
+# Dependencies to place before the objects being linked to create a |
15623 |
+# shared library. |
15624 |
+predeps=$lt_predeps_CXX |
15625 |
|
15626 |
-#ifdef RTLD_GLOBAL |
15627 |
-# define LT_DLGLOBAL RTLD_GLOBAL |
15628 |
-#else |
15629 |
-# ifdef DL_GLOBAL |
15630 |
-# define LT_DLGLOBAL DL_GLOBAL |
15631 |
-# else |
15632 |
-# define LT_DLGLOBAL 0 |
15633 |
-# endif |
15634 |
-#endif |
15635 |
+# Dependencies to place after the objects being linked to create a |
15636 |
+# shared library. |
15637 |
+postdeps=$lt_postdeps_CXX |
15638 |
|
15639 |
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we |
15640 |
- find out it does not work in some platform. */ |
15641 |
-#ifndef LT_DLLAZY_OR_NOW |
15642 |
-# ifdef RTLD_LAZY |
15643 |
-# define LT_DLLAZY_OR_NOW RTLD_LAZY |
15644 |
-# else |
15645 |
-# ifdef DL_LAZY |
15646 |
-# define LT_DLLAZY_OR_NOW DL_LAZY |
15647 |
-# else |
15648 |
-# ifdef RTLD_NOW |
15649 |
-# define LT_DLLAZY_OR_NOW RTLD_NOW |
15650 |
-# else |
15651 |
-# ifdef DL_NOW |
15652 |
-# define LT_DLLAZY_OR_NOW DL_NOW |
15653 |
-# else |
15654 |
-# define LT_DLLAZY_OR_NOW 0 |
15655 |
-# endif |
15656 |
-# endif |
15657 |
-# endif |
15658 |
-# endif |
15659 |
-#endif |
15660 |
- |
15661 |
-#ifdef __cplusplus |
15662 |
-extern "C" void exit (int); |
15663 |
-#endif |
15664 |
+# The library search path used internally by the compiler when linking |
15665 |
+# a shared library. |
15666 |
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX |
15667 |
|
15668 |
-void fnord() { int i=42;} |
15669 |
-int main () |
15670 |
-{ |
15671 |
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
15672 |
- int status = $lt_dlunknown; |
15673 |
+# Method to check whether dependent libraries are shared objects. |
15674 |
+deplibs_check_method=$lt_deplibs_check_method |
15675 |
|
15676 |
- if (self) |
15677 |
- { |
15678 |
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
15679 |
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
15680 |
- /* dlclose (self); */ |
15681 |
- } |
15682 |
+# Command to use when deplibs_check_method == file_magic. |
15683 |
+file_magic_cmd=$lt_file_magic_cmd |
15684 |
|
15685 |
- exit (status); |
15686 |
-} |
15687 |
-EOF |
15688 |
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15689 |
- (eval $ac_link) 2>&5 |
15690 |
- ac_status=$? |
15691 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15692 |
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then |
15693 |
- (./conftest; exit; ) 2>/dev/null |
15694 |
- lt_status=$? |
15695 |
- case x$lt_status in |
15696 |
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; |
15697 |
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; |
15698 |
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; |
15699 |
- esac |
15700 |
- else : |
15701 |
- # compilation failed |
15702 |
- lt_cv_dlopen_self_static=no |
15703 |
- fi |
15704 |
-fi |
15705 |
-rm -fr conftest* |
15706 |
+# Flag that allows shared libraries with undefined symbols to be built. |
15707 |
+allow_undefined_flag=$lt_allow_undefined_flag_CXX |
15708 |
|
15709 |
+# Flag that forces no undefined symbols. |
15710 |
+no_undefined_flag=$lt_no_undefined_flag_CXX |
15711 |
|
15712 |
-fi |
15713 |
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 |
15714 |
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 |
15715 |
- fi |
15716 |
+# Commands used to finish a libtool library installation in a directory. |
15717 |
+finish_cmds=$lt_finish_cmds |
15718 |
|
15719 |
- CPPFLAGS="$save_CPPFLAGS" |
15720 |
- LDFLAGS="$save_LDFLAGS" |
15721 |
- LIBS="$save_LIBS" |
15722 |
- ;; |
15723 |
- esac |
15724 |
+# Same as above, but a single script fragment to be evaled but not shown. |
15725 |
+finish_eval=$lt_finish_eval |
15726 |
|
15727 |
- case $lt_cv_dlopen_self in |
15728 |
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; |
15729 |
- *) enable_dlopen_self=unknown ;; |
15730 |
- esac |
15731 |
+# Take the output of nm and produce a listing of raw symbols and C names. |
15732 |
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe |
15733 |
|
15734 |
- case $lt_cv_dlopen_self_static in |
15735 |
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; |
15736 |
- *) enable_dlopen_self_static=unknown ;; |
15737 |
- esac |
15738 |
-fi |
15739 |
+# Transform the output of nm in a proper C declaration |
15740 |
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl |
15741 |
|
15742 |
+# Transform the output of nm in a C name address pair |
15743 |
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
15744 |
|
15745 |
-# The else clause should only fire when bootstrapping the |
15746 |
-# libtool distribution, otherwise you forgot to ship ltmain.sh |
15747 |
-# with your package, and you will get complaints that there are |
15748 |
-# no rules to generate ltmain.sh. |
15749 |
-if test -f "$ltmain"; then |
15750 |
- # See if we are running on zsh, and set the options which allow our commands through |
15751 |
- # without removal of \ escapes. |
15752 |
- if test -n "${ZSH_VERSION+set}" ; then |
15753 |
- setopt NO_GLOB_SUBST |
15754 |
- fi |
15755 |
- # Now quote all the things that may contain metacharacters while being |
15756 |
- # careful not to overquote the AC_SUBSTed values. We take copies of the |
15757 |
- # variables and quote the copies for generation of the libtool script. |
15758 |
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ |
15759 |
- SED SHELL STRIP \ |
15760 |
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
15761 |
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
15762 |
- deplibs_check_method reload_flag reload_cmds need_locks \ |
15763 |
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ |
15764 |
- lt_cv_sys_global_symbol_to_c_name_address \ |
15765 |
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ |
15766 |
- old_postinstall_cmds old_postuninstall_cmds \ |
15767 |
- compiler_CXX \ |
15768 |
- CC_CXX \ |
15769 |
- LD_CXX \ |
15770 |
- lt_prog_compiler_wl_CXX \ |
15771 |
- lt_prog_compiler_pic_CXX \ |
15772 |
- lt_prog_compiler_static_CXX \ |
15773 |
- lt_prog_compiler_no_builtin_flag_CXX \ |
15774 |
- export_dynamic_flag_spec_CXX \ |
15775 |
- thread_safe_flag_spec_CXX \ |
15776 |
- whole_archive_flag_spec_CXX \ |
15777 |
- enable_shared_with_static_runtimes_CXX \ |
15778 |
- old_archive_cmds_CXX \ |
15779 |
- old_archive_from_new_cmds_CXX \ |
15780 |
- predep_objects_CXX \ |
15781 |
- postdep_objects_CXX \ |
15782 |
- predeps_CXX \ |
15783 |
- postdeps_CXX \ |
15784 |
- compiler_lib_search_path_CXX \ |
15785 |
- archive_cmds_CXX \ |
15786 |
- archive_expsym_cmds_CXX \ |
15787 |
- postinstall_cmds_CXX \ |
15788 |
- postuninstall_cmds_CXX \ |
15789 |
- old_archive_from_expsyms_cmds_CXX \ |
15790 |
- allow_undefined_flag_CXX \ |
15791 |
- no_undefined_flag_CXX \ |
15792 |
- export_symbols_cmds_CXX \ |
15793 |
- hardcode_libdir_flag_spec_CXX \ |
15794 |
- hardcode_libdir_flag_spec_ld_CXX \ |
15795 |
- hardcode_libdir_separator_CXX \ |
15796 |
- hardcode_automatic_CXX \ |
15797 |
- module_cmds_CXX \ |
15798 |
- module_expsym_cmds_CXX \ |
15799 |
- lt_cv_prog_compiler_c_o_CXX \ |
15800 |
- exclude_expsyms_CXX \ |
15801 |
- include_expsyms_CXX; do |
15802 |
+# This is the shared library runtime path variable. |
15803 |
+runpath_var=$runpath_var |
15804 |
|
15805 |
- case $var in |
15806 |
- old_archive_cmds_CXX | \ |
15807 |
- old_archive_from_new_cmds_CXX | \ |
15808 |
- archive_cmds_CXX | \ |
15809 |
- archive_expsym_cmds_CXX | \ |
15810 |
- module_cmds_CXX | \ |
15811 |
- module_expsym_cmds_CXX | \ |
15812 |
- old_archive_from_expsyms_cmds_CXX | \ |
15813 |
- export_symbols_cmds_CXX | \ |
15814 |
- extract_expsyms_cmds | reload_cmds | finish_cmds | \ |
15815 |
- postinstall_cmds | postuninstall_cmds | \ |
15816 |
- old_postinstall_cmds | old_postuninstall_cmds | \ |
15817 |
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) |
15818 |
- # Double-quote double-evaled strings. |
15819 |
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" |
15820 |
- ;; |
15821 |
- *) |
15822 |
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" |
15823 |
- ;; |
15824 |
- esac |
15825 |
- done |
15826 |
+# This is the shared library path variable. |
15827 |
+shlibpath_var=$shlibpath_var |
15828 |
|
15829 |
- case $lt_echo in |
15830 |
- *'\$0 --fallback-echo"') |
15831 |
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` |
15832 |
- ;; |
15833 |
- esac |
15834 |
+# Is shlibpath searched before the hard-coded library search path? |
15835 |
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath |
15836 |
|
15837 |
-cfgfile="$ofile" |
15838 |
+# How to hardcode a shared library path into an executable. |
15839 |
+hardcode_action=$hardcode_action_CXX |
15840 |
|
15841 |
- cat <<__EOF__ >> "$cfgfile" |
15842 |
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname |
15843 |
+# Whether we should hardcode library paths into libraries. |
15844 |
+hardcode_into_libs=$hardcode_into_libs |
15845 |
|
15846 |
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: |
15847 |
+# Flag to hardcode \$libdir into a binary during linking. |
15848 |
+# This must work even if \$libdir does not exist. |
15849 |
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX |
15850 |
|
15851 |
-# Shell to use when invoking shell scripts. |
15852 |
-SHELL=$lt_SHELL |
15853 |
+# If ld is used when linking, flag to hardcode \$libdir into |
15854 |
+# a binary during linking. This must work even if \$libdir does |
15855 |
+# not exist. |
15856 |
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX |
15857 |
|
15858 |
-# Whether or not to build shared libraries. |
15859 |
-build_libtool_libs=$enable_shared |
15860 |
+# Whether we need a single -rpath flag with a separated argument. |
15861 |
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX |
15862 |
|
15863 |
-# Whether or not to build static libraries. |
15864 |
-build_old_libs=$enable_static |
15865 |
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the |
15866 |
+# resulting binary. |
15867 |
+hardcode_direct=$hardcode_direct_CXX |
15868 |
|
15869 |
-# Whether or not to add -lc for building shared libraries. |
15870 |
-build_libtool_need_lc=$archive_cmds_need_lc_CXX |
15871 |
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the |
15872 |
+# resulting binary. |
15873 |
+hardcode_minus_L=$hardcode_minus_L_CXX |
15874 |
|
15875 |
-# Whether or not to disallow shared libs when runtime libs are static |
15876 |
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX |
15877 |
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into |
15878 |
+# the resulting binary. |
15879 |
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX |
15880 |
|
15881 |
-# Whether or not to optimize for fast installation. |
15882 |
-fast_install=$enable_fast_install |
15883 |
+# Set to yes if building a shared library automatically hardcodes DIR into the library |
15884 |
+# and all subsequent libraries and executables linked against it. |
15885 |
+hardcode_automatic=$hardcode_automatic_CXX |
15886 |
|
15887 |
-# The host system. |
15888 |
-host_alias=$host_alias |
15889 |
-host=$host |
15890 |
+# Variables whose values should be saved in libtool wrapper scripts and |
15891 |
+# restored at relink time. |
15892 |
+variables_saved_for_relink="$variables_saved_for_relink" |
15893 |
|
15894 |
-# An echo program that does not interpret backslashes. |
15895 |
-echo=$lt_echo |
15896 |
+# Whether libtool must link a program against all its dependency libraries. |
15897 |
+link_all_deplibs=$link_all_deplibs_CXX |
15898 |
|
15899 |
-# The archiver. |
15900 |
-AR=$lt_AR |
15901 |
-AR_FLAGS=$lt_AR_FLAGS |
15902 |
+# Compile-time system search path for libraries |
15903 |
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec |
15904 |
|
15905 |
-# A C compiler. |
15906 |
-LTCC=$lt_LTCC |
15907 |
+# Run-time system search path for libraries |
15908 |
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec |
15909 |
|
15910 |
-# A language-specific compiler. |
15911 |
-CC=$lt_compiler_CXX |
15912 |
+# Fix the shell variable \$srcfile for the compiler. |
15913 |
+fix_srcfile_path="$fix_srcfile_path_CXX" |
15914 |
|
15915 |
-# Is the compiler the GNU C compiler? |
15916 |
-with_gcc=$GCC_CXX |
15917 |
+# Set to yes if exported symbols are required. |
15918 |
+always_export_symbols=$always_export_symbols_CXX |
15919 |
|
15920 |
-# An ERE matcher. |
15921 |
-EGREP=$lt_EGREP |
15922 |
+# The commands to list exported symbols. |
15923 |
+export_symbols_cmds=$lt_export_symbols_cmds_CXX |
15924 |
|
15925 |
-# The linker used to build libraries. |
15926 |
-LD=$lt_LD_CXX |
15927 |
+# The commands to extract the exported symbol list from a shared archive. |
15928 |
+extract_expsyms_cmds=$lt_extract_expsyms_cmds |
15929 |
|
15930 |
-# Whether we need hard or soft links. |
15931 |
-LN_S=$lt_LN_S |
15932 |
+# Symbols that should not be listed in the preloaded symbols. |
15933 |
+exclude_expsyms=$lt_exclude_expsyms_CXX |
15934 |
|
15935 |
-# A BSD-compatible nm program. |
15936 |
-NM=$lt_NM |
15937 |
+# Symbols that must always be exported. |
15938 |
+include_expsyms=$lt_include_expsyms_CXX |
15939 |
|
15940 |
-# A symbol stripping program |
15941 |
-STRIP=$lt_STRIP |
15942 |
+# ### END LIBTOOL TAG CONFIG: $tagname |
15943 |
|
15944 |
-# Used to examine libraries when file_magic_cmd begins "file" |
15945 |
-MAGIC_CMD=$MAGIC_CMD |
15946 |
- |
15947 |
-# Used on cygwin: DLL creation program. |
15948 |
-DLLTOOL="$DLLTOOL" |
15949 |
- |
15950 |
-# Used on cygwin: object dumper. |
15951 |
-OBJDUMP="$OBJDUMP" |
15952 |
- |
15953 |
-# Used on cygwin: assembler. |
15954 |
-AS="$AS" |
15955 |
- |
15956 |
-# The name of the directory that contains temporary libtool files. |
15957 |
-objdir=$objdir |
15958 |
- |
15959 |
-# How to create reloadable object files. |
15960 |
-reload_flag=$lt_reload_flag |
15961 |
-reload_cmds=$lt_reload_cmds |
15962 |
- |
15963 |
-# How to pass a linker flag through the compiler. |
15964 |
-wl=$lt_lt_prog_compiler_wl_CXX |
15965 |
- |
15966 |
-# Object file suffix (normally "o"). |
15967 |
-objext="$ac_objext" |
15968 |
- |
15969 |
-# Old archive suffix (normally "a"). |
15970 |
-libext="$libext" |
15971 |
- |
15972 |
-# Shared library suffix (normally ".so"). |
15973 |
-shrext_cmds='$shrext_cmds' |
15974 |
- |
15975 |
-# Executable file suffix (normally ""). |
15976 |
-exeext="$exeext" |
15977 |
- |
15978 |
-# Additional compiler flags for building library objects. |
15979 |
-pic_flag=$lt_lt_prog_compiler_pic_CXX |
15980 |
-pic_mode=$pic_mode |
15981 |
- |
15982 |
-# What is the maximum length of a command? |
15983 |
-max_cmd_len=$lt_cv_sys_max_cmd_len |
15984 |
- |
15985 |
-# Does compiler simultaneously support -c and -o options? |
15986 |
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX |
15987 |
- |
15988 |
-# Must we lock files when doing compilation ? |
15989 |
-need_locks=$lt_need_locks |
15990 |
- |
15991 |
-# Do we need the lib prefix for modules? |
15992 |
-need_lib_prefix=$need_lib_prefix |
15993 |
- |
15994 |
-# Do we need a version for libraries? |
15995 |
-need_version=$need_version |
15996 |
- |
15997 |
-# Whether dlopen is supported. |
15998 |
-dlopen_support=$enable_dlopen |
15999 |
- |
16000 |
-# Whether dlopen of programs is supported. |
16001 |
-dlopen_self=$enable_dlopen_self |
16002 |
- |
16003 |
-# Whether dlopen of statically linked programs is supported. |
16004 |
-dlopen_self_static=$enable_dlopen_self_static |
16005 |
- |
16006 |
-# Compiler flag to prevent dynamic linking. |
16007 |
-link_static_flag=$lt_lt_prog_compiler_static_CXX |
16008 |
- |
16009 |
-# Compiler flag to turn off builtin functions. |
16010 |
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX |
16011 |
- |
16012 |
-# Compiler flag to allow reflexive dlopens. |
16013 |
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX |
16014 |
- |
16015 |
-# Compiler flag to generate shared objects directly from archives. |
16016 |
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX |
16017 |
- |
16018 |
-# Compiler flag to generate thread-safe objects. |
16019 |
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX |
16020 |
- |
16021 |
-# Library versioning type. |
16022 |
-version_type=$version_type |
16023 |
- |
16024 |
-# Format of library name prefix. |
16025 |
-libname_spec=$lt_libname_spec |
16026 |
- |
16027 |
-# List of archive names. First name is the real one, the rest are links. |
16028 |
-# The last name is the one that the linker finds with -lNAME. |
16029 |
-library_names_spec=$lt_library_names_spec |
16030 |
- |
16031 |
-# The coded name of the library, if different from the real name. |
16032 |
-soname_spec=$lt_soname_spec |
16033 |
- |
16034 |
-# Commands used to build and install an old-style archive. |
16035 |
-RANLIB=$lt_RANLIB |
16036 |
-old_archive_cmds=$lt_old_archive_cmds_CXX |
16037 |
-old_postinstall_cmds=$lt_old_postinstall_cmds |
16038 |
-old_postuninstall_cmds=$lt_old_postuninstall_cmds |
16039 |
- |
16040 |
-# Create an old-style archive from a shared archive. |
16041 |
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX |
16042 |
- |
16043 |
-# Create a temporary old-style archive to link instead of a shared archive. |
16044 |
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX |
16045 |
- |
16046 |
-# Commands used to build and install a shared archive. |
16047 |
-archive_cmds=$lt_archive_cmds_CXX |
16048 |
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX |
16049 |
-postinstall_cmds=$lt_postinstall_cmds |
16050 |
-postuninstall_cmds=$lt_postuninstall_cmds |
16051 |
- |
16052 |
-# Commands used to build a loadable module (assumed same as above if empty) |
16053 |
-module_cmds=$lt_module_cmds_CXX |
16054 |
-module_expsym_cmds=$lt_module_expsym_cmds_CXX |
16055 |
- |
16056 |
-# Commands to strip libraries. |
16057 |
-old_striplib=$lt_old_striplib |
16058 |
-striplib=$lt_striplib |
16059 |
- |
16060 |
-# Dependencies to place before the objects being linked to create a |
16061 |
-# shared library. |
16062 |
-predep_objects=$lt_predep_objects_CXX |
16063 |
- |
16064 |
-# Dependencies to place after the objects being linked to create a |
16065 |
-# shared library. |
16066 |
-postdep_objects=$lt_postdep_objects_CXX |
16067 |
- |
16068 |
-# Dependencies to place before the objects being linked to create a |
16069 |
-# shared library. |
16070 |
-predeps=$lt_predeps_CXX |
16071 |
- |
16072 |
-# Dependencies to place after the objects being linked to create a |
16073 |
-# shared library. |
16074 |
-postdeps=$lt_postdeps_CXX |
16075 |
- |
16076 |
-# The library search path used internally by the compiler when linking |
16077 |
-# a shared library. |
16078 |
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX |
16079 |
- |
16080 |
-# Method to check whether dependent libraries are shared objects. |
16081 |
-deplibs_check_method=$lt_deplibs_check_method |
16082 |
- |
16083 |
-# Command to use when deplibs_check_method == file_magic. |
16084 |
-file_magic_cmd=$lt_file_magic_cmd |
16085 |
- |
16086 |
-# Flag that allows shared libraries with undefined symbols to be built. |
16087 |
-allow_undefined_flag=$lt_allow_undefined_flag_CXX |
16088 |
- |
16089 |
-# Flag that forces no undefined symbols. |
16090 |
-no_undefined_flag=$lt_no_undefined_flag_CXX |
16091 |
- |
16092 |
-# Commands used to finish a libtool library installation in a directory. |
16093 |
-finish_cmds=$lt_finish_cmds |
16094 |
- |
16095 |
-# Same as above, but a single script fragment to be evaled but not shown. |
16096 |
-finish_eval=$lt_finish_eval |
16097 |
- |
16098 |
-# Take the output of nm and produce a listing of raw symbols and C names. |
16099 |
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe |
16100 |
- |
16101 |
-# Transform the output of nm in a proper C declaration |
16102 |
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl |
16103 |
- |
16104 |
-# Transform the output of nm in a C name address pair |
16105 |
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
16106 |
- |
16107 |
-# This is the shared library runtime path variable. |
16108 |
-runpath_var=$runpath_var |
16109 |
- |
16110 |
-# This is the shared library path variable. |
16111 |
-shlibpath_var=$shlibpath_var |
16112 |
- |
16113 |
-# Is shlibpath searched before the hard-coded library search path? |
16114 |
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath |
16115 |
- |
16116 |
-# How to hardcode a shared library path into an executable. |
16117 |
-hardcode_action=$hardcode_action_CXX |
16118 |
- |
16119 |
-# Whether we should hardcode library paths into libraries. |
16120 |
-hardcode_into_libs=$hardcode_into_libs |
16121 |
- |
16122 |
-# Flag to hardcode \$libdir into a binary during linking. |
16123 |
-# This must work even if \$libdir does not exist. |
16124 |
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX |
16125 |
- |
16126 |
-# If ld is used when linking, flag to hardcode \$libdir into |
16127 |
-# a binary during linking. This must work even if \$libdir does |
16128 |
-# not exist. |
16129 |
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX |
16130 |
- |
16131 |
-# Whether we need a single -rpath flag with a separated argument. |
16132 |
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX |
16133 |
- |
16134 |
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the |
16135 |
-# resulting binary. |
16136 |
-hardcode_direct=$hardcode_direct_CXX |
16137 |
- |
16138 |
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the |
16139 |
-# resulting binary. |
16140 |
-hardcode_minus_L=$hardcode_minus_L_CXX |
16141 |
- |
16142 |
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into |
16143 |
-# the resulting binary. |
16144 |
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX |
16145 |
- |
16146 |
-# Set to yes if building a shared library automatically hardcodes DIR into the library |
16147 |
-# and all subsequent libraries and executables linked against it. |
16148 |
-hardcode_automatic=$hardcode_automatic_CXX |
16149 |
- |
16150 |
-# Variables whose values should be saved in libtool wrapper scripts and |
16151 |
-# restored at relink time. |
16152 |
-variables_saved_for_relink="$variables_saved_for_relink" |
16153 |
- |
16154 |
-# Whether libtool must link a program against all its dependency libraries. |
16155 |
-link_all_deplibs=$link_all_deplibs_CXX |
16156 |
- |
16157 |
-# Compile-time system search path for libraries |
16158 |
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec |
16159 |
- |
16160 |
-# Run-time system search path for libraries |
16161 |
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec |
16162 |
- |
16163 |
-# Fix the shell variable \$srcfile for the compiler. |
16164 |
-fix_srcfile_path="$fix_srcfile_path_CXX" |
16165 |
- |
16166 |
-# Set to yes if exported symbols are required. |
16167 |
-always_export_symbols=$always_export_symbols_CXX |
16168 |
- |
16169 |
-# The commands to list exported symbols. |
16170 |
-export_symbols_cmds=$lt_export_symbols_cmds_CXX |
16171 |
- |
16172 |
-# The commands to extract the exported symbol list from a shared archive. |
16173 |
-extract_expsyms_cmds=$lt_extract_expsyms_cmds |
16174 |
- |
16175 |
-# Symbols that should not be listed in the preloaded symbols. |
16176 |
-exclude_expsyms=$lt_exclude_expsyms_CXX |
16177 |
- |
16178 |
-# Symbols that must always be exported. |
16179 |
-include_expsyms=$lt_include_expsyms_CXX |
16180 |
- |
16181 |
-# ### END LIBTOOL TAG CONFIG: $tagname |
16182 |
- |
16183 |
-__EOF__ |
16184 |
+__EOF__ |
16185 |
|
16186 |
|
16187 |
else |
16188 |
@@ -12674,16 +12442,42 @@ |
16189 |
# If no C compiler was specified, use CC. |
16190 |
LTCC=${LTCC-"$CC"} |
16191 |
|
16192 |
+# If no C compiler flags were specified, use CFLAGS. |
16193 |
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} |
16194 |
+ |
16195 |
# Allow CC to be a program name with arguments. |
16196 |
compiler=$CC |
16197 |
|
16198 |
|
16199 |
+# save warnings/boilerplate of simple test code |
16200 |
+ac_outfile=conftest.$ac_objext |
16201 |
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext |
16202 |
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
16203 |
+_lt_compiler_boilerplate=`cat conftest.err` |
16204 |
+$rm conftest* |
16205 |
+ |
16206 |
+ac_outfile=conftest.$ac_objext |
16207 |
+printf "$lt_simple_link_test_code" >conftest.$ac_ext |
16208 |
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
16209 |
+_lt_linker_boilerplate=`cat conftest.err` |
16210 |
+$rm conftest* |
16211 |
+ |
16212 |
+ |
16213 |
# Allow CC to be a program name with arguments. |
16214 |
lt_save_CC="$CC" |
16215 |
CC=${F77-"f77"} |
16216 |
compiler=$CC |
16217 |
compiler_F77=$CC |
16218 |
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` |
16219 |
+for cc_temp in $compiler""; do |
16220 |
+ case $cc_temp in |
16221 |
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; |
16222 |
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; |
16223 |
+ \-*) ;; |
16224 |
+ *) break;; |
16225 |
+ esac |
16226 |
+done |
16227 |
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
16228 |
+ |
16229 |
|
16230 |
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 |
16231 |
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 |
16232 |
@@ -12696,7 +12490,7 @@ |
16233 |
|
16234 |
# On AIX, shared libraries and static libraries use the same namespace, and |
16235 |
# are all built from PIC. |
16236 |
-case "$host_os" in |
16237 |
+case $host_os in |
16238 |
aix3*) |
16239 |
test "$enable_shared" = yes && enable_static=no |
16240 |
if test -n "$RANLIB"; then |
16241 |
@@ -12705,7 +12499,9 @@ |
16242 |
fi |
16243 |
;; |
16244 |
aix4* | aix5*) |
16245 |
- test "$enable_shared" = yes && enable_static=no |
16246 |
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then |
16247 |
+ test "$enable_shared" = yes && enable_static=no |
16248 |
+ fi |
16249 |
;; |
16250 |
esac |
16251 |
echo "$as_me:$LINENO: result: $enable_shared" >&5 |
16252 |
@@ -12718,8 +12514,6 @@ |
16253 |
echo "$as_me:$LINENO: result: $enable_static" >&5 |
16254 |
echo "${ECHO_T}$enable_static" >&6 |
16255 |
|
16256 |
-test "$ld_shlibs_F77" = no && can_build_shared=no |
16257 |
- |
16258 |
GCC_F77="$G77" |
16259 |
LD_F77="$LD" |
16260 |
|
16261 |
@@ -12766,6 +12560,11 @@ |
16262 |
lt_prog_compiler_pic_F77='-fno-common' |
16263 |
;; |
16264 |
|
16265 |
+ interix3*) |
16266 |
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
16267 |
+ # Instead, we relocate shared libraries at runtime. |
16268 |
+ ;; |
16269 |
+ |
16270 |
msdosdjgpp*) |
16271 |
# Just because we use GCC doesn't mean we suddenly get shared libraries |
16272 |
# on systems that don't support them. |
16273 |
@@ -12782,7 +12581,7 @@ |
16274 |
hpux*) |
16275 |
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
16276 |
# not for PA HP-UX. |
16277 |
- case "$host_cpu" in |
16278 |
+ case $host_cpu in |
16279 |
hppa*64*|ia64*) |
16280 |
# +Z the default |
16281 |
;; |
16282 |
@@ -12808,6 +12607,16 @@ |
16283 |
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' |
16284 |
fi |
16285 |
;; |
16286 |
+ darwin*) |
16287 |
+ # PIC is the default on this platform |
16288 |
+ # Common symbols not allowed in MH_DYLIB files |
16289 |
+ case $cc_basename in |
16290 |
+ xlc*) |
16291 |
+ lt_prog_compiler_pic_F77='-qnocommon' |
16292 |
+ lt_prog_compiler_wl_F77='-Wl,' |
16293 |
+ ;; |
16294 |
+ esac |
16295 |
+ ;; |
16296 |
|
16297 |
mingw* | pw32* | os2*) |
16298 |
# This hack is so that the source file can tell whether it is being |
16299 |
@@ -12819,7 +12628,7 @@ |
16300 |
lt_prog_compiler_wl_F77='-Wl,' |
16301 |
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
16302 |
# not for PA HP-UX. |
16303 |
- case "$host_cpu" in |
16304 |
+ case $host_cpu in |
16305 |
hppa*64*|ia64*) |
16306 |
# +Z the default |
16307 |
;; |
16308 |
@@ -12843,12 +12652,19 @@ |
16309 |
;; |
16310 |
|
16311 |
linux*) |
16312 |
- case $CC in |
16313 |
+ case $cc_basename in |
16314 |
icc* | ecc*) |
16315 |
lt_prog_compiler_wl_F77='-Wl,' |
16316 |
lt_prog_compiler_pic_F77='-KPIC' |
16317 |
lt_prog_compiler_static_F77='-static' |
16318 |
;; |
16319 |
+ pgcc* | pgf77* | pgf90* | pgf95*) |
16320 |
+ # Portland Group compilers (*not* the Pentium gcc compiler, |
16321 |
+ # which looks to be a dead project) |
16322 |
+ lt_prog_compiler_wl_F77='-Wl,' |
16323 |
+ lt_prog_compiler_pic_F77='-fpic' |
16324 |
+ lt_prog_compiler_static_F77='-Bstatic' |
16325 |
+ ;; |
16326 |
ccc*) |
16327 |
lt_prog_compiler_wl_F77='-Wl,' |
16328 |
# All Alpha code is PIC. |
16329 |
@@ -12863,15 +12679,15 @@ |
16330 |
lt_prog_compiler_static_F77='-non_shared' |
16331 |
;; |
16332 |
|
16333 |
- sco3.2v5*) |
16334 |
- lt_prog_compiler_pic_F77='-Kpic' |
16335 |
- lt_prog_compiler_static_F77='-dn' |
16336 |
- ;; |
16337 |
- |
16338 |
solaris*) |
16339 |
- lt_prog_compiler_wl_F77='-Wl,' |
16340 |
lt_prog_compiler_pic_F77='-KPIC' |
16341 |
lt_prog_compiler_static_F77='-Bstatic' |
16342 |
+ case $cc_basename in |
16343 |
+ f77* | f90* | f95*) |
16344 |
+ lt_prog_compiler_wl_F77='-Qoption ld ';; |
16345 |
+ *) |
16346 |
+ lt_prog_compiler_wl_F77='-Wl,';; |
16347 |
+ esac |
16348 |
;; |
16349 |
|
16350 |
sunos4*) |
16351 |
@@ -12880,7 +12696,7 @@ |
16352 |
lt_prog_compiler_static_F77='-Bstatic' |
16353 |
;; |
16354 |
|
16355 |
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
16356 |
+ sysv4 | sysv4.2uw2* | sysv4.3*) |
16357 |
lt_prog_compiler_wl_F77='-Wl,' |
16358 |
lt_prog_compiler_pic_F77='-KPIC' |
16359 |
lt_prog_compiler_static_F77='-Bstatic' |
16360 |
@@ -12893,6 +12709,17 @@ |
16361 |
fi |
16362 |
;; |
16363 |
|
16364 |
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) |
16365 |
+ lt_prog_compiler_wl_F77='-Wl,' |
16366 |
+ lt_prog_compiler_pic_F77='-KPIC' |
16367 |
+ lt_prog_compiler_static_F77='-Bstatic' |
16368 |
+ ;; |
16369 |
+ |
16370 |
+ unicos*) |
16371 |
+ lt_prog_compiler_wl_F77='-Wl,' |
16372 |
+ lt_prog_compiler_can_build_shared_F77=no |
16373 |
+ ;; |
16374 |
+ |
16375 |
uts4*) |
16376 |
lt_prog_compiler_pic_F77='-pic' |
16377 |
lt_prog_compiler_static_F77='-Bstatic' |
16378 |
@@ -12927,18 +12754,20 @@ |
16379 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
16380 |
# The option is referenced via a variable to avoid confusing sed. |
16381 |
lt_compile=`echo "$ac_compile" | $SED \ |
16382 |
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
16383 |
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
16384 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
16385 |
-e 's:$: $lt_compiler_flag:'` |
16386 |
- (eval echo "\"\$as_me:12933: $lt_compile\"" >&5) |
16387 |
+ (eval echo "\"\$as_me:12760: $lt_compile\"" >&5) |
16388 |
(eval "$lt_compile" 2>conftest.err) |
16389 |
ac_status=$? |
16390 |
cat conftest.err >&5 |
16391 |
- echo "$as_me:12937: \$? = $ac_status" >&5 |
16392 |
+ echo "$as_me:12764: \$? = $ac_status" >&5 |
16393 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
16394 |
# The compiler can only warn and ignore the option if not recognized |
16395 |
- # So say no if there are warnings |
16396 |
- if test ! -s conftest.err; then |
16397 |
+ # So say no if there are warnings other than the usual output. |
16398 |
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
16399 |
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
16400 |
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
16401 |
lt_prog_compiler_pic_works_F77=yes |
16402 |
fi |
16403 |
fi |
16404 |
@@ -12959,7 +12788,7 @@ |
16405 |
fi |
16406 |
|
16407 |
fi |
16408 |
-case "$host_os" in |
16409 |
+case $host_os in |
16410 |
# For platforms which do not support PIC, -DPIC is meaningless: |
16411 |
*djgpp*) |
16412 |
lt_prog_compiler_pic_F77= |
16413 |
@@ -12969,6 +12798,48 @@ |
16414 |
;; |
16415 |
esac |
16416 |
|
16417 |
+# |
16418 |
+# Check to make sure the static flag actually works. |
16419 |
+# |
16420 |
+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" |
16421 |
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
16422 |
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 |
16423 |
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then |
16424 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
16425 |
+else |
16426 |
+ lt_prog_compiler_static_works_F77=no |
16427 |
+ save_LDFLAGS="$LDFLAGS" |
16428 |
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" |
16429 |
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext |
16430 |
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
16431 |
+ # The linker can only warn and ignore the option if not recognized |
16432 |
+ # So say no if there are warnings |
16433 |
+ if test -s conftest.err; then |
16434 |
+ # Append any errors to the config.log. |
16435 |
+ cat conftest.err 1>&5 |
16436 |
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
16437 |
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
16438 |
+ if diff conftest.exp conftest.er2 >/dev/null; then |
16439 |
+ lt_prog_compiler_static_works_F77=yes |
16440 |
+ fi |
16441 |
+ else |
16442 |
+ lt_prog_compiler_static_works_F77=yes |
16443 |
+ fi |
16444 |
+ fi |
16445 |
+ $rm conftest* |
16446 |
+ LDFLAGS="$save_LDFLAGS" |
16447 |
+ |
16448 |
+fi |
16449 |
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 |
16450 |
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 |
16451 |
+ |
16452 |
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then |
16453 |
+ : |
16454 |
+else |
16455 |
+ lt_prog_compiler_static_F77= |
16456 |
+fi |
16457 |
+ |
16458 |
+ |
16459 |
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
16460 |
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 |
16461 |
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then |
16462 |
@@ -12987,23 +12858,25 @@ |
16463 |
# Note that $ac_compile itself does not contain backslashes and begins |
16464 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
16465 |
lt_compile=`echo "$ac_compile" | $SED \ |
16466 |
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
16467 |
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
16468 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
16469 |
-e 's:$: $lt_compiler_flag:'` |
16470 |
- (eval echo "\"\$as_me:12993: $lt_compile\"" >&5) |
16471 |
+ (eval echo "\"\$as_me:12864: $lt_compile\"" >&5) |
16472 |
(eval "$lt_compile" 2>out/conftest.err) |
16473 |
ac_status=$? |
16474 |
cat out/conftest.err >&5 |
16475 |
- echo "$as_me:12997: \$? = $ac_status" >&5 |
16476 |
+ echo "$as_me:12868: \$? = $ac_status" >&5 |
16477 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext |
16478 |
then |
16479 |
# The compiler can only warn and ignore the option if not recognized |
16480 |
# So say no if there are warnings |
16481 |
- if test ! -s out/conftest.err; then |
16482 |
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
16483 |
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
16484 |
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
16485 |
lt_cv_prog_compiler_c_o_F77=yes |
16486 |
fi |
16487 |
fi |
16488 |
- chmod u+w . |
16489 |
+ chmod u+w . 2>&5 |
16490 |
$rm conftest* |
16491 |
# SGI C++ compiler will create directory out/ii_files/ for |
16492 |
# template instantiation |
16493 |
@@ -13079,6 +12952,16 @@ |
16494 |
# rely on this symbol name, it's probably fine to never include it in |
16495 |
# preloaded symbol tables. |
16496 |
extract_expsyms_cmds= |
16497 |
+ # Just being paranoid about ensuring that cc_basename is set. |
16498 |
+ for cc_temp in $compiler""; do |
16499 |
+ case $cc_temp in |
16500 |
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; |
16501 |
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; |
16502 |
+ \-*) ;; |
16503 |
+ *) break;; |
16504 |
+ esac |
16505 |
+done |
16506 |
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
16507 |
|
16508 |
case $host_os in |
16509 |
cygwin* | mingw* | pw32*) |
16510 |
@@ -13089,6 +12972,10 @@ |
16511 |
with_gnu_ld=no |
16512 |
fi |
16513 |
;; |
16514 |
+ interix*) |
16515 |
+ # we just hope/assume this is gcc and not c89 (= MSVC++) |
16516 |
+ with_gnu_ld=yes |
16517 |
+ ;; |
16518 |
openbsd*) |
16519 |
with_gnu_ld=no |
16520 |
;; |
16521 |
@@ -13099,6 +12986,27 @@ |
16522 |
# If archive_cmds runs LD, not CC, wlarc should be empty |
16523 |
wlarc='${wl}' |
16524 |
|
16525 |
+ # Set some defaults for GNU ld with shared library support. These |
16526 |
+ # are reset later if shared libraries are not supported. Putting them |
16527 |
+ # here allows them to be overridden if necessary. |
16528 |
+ runpath_var=LD_RUN_PATH |
16529 |
+ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' |
16530 |
+ export_dynamic_flag_spec_F77='${wl}--export-dynamic' |
16531 |
+ # ancient GNU ld didn't support --whole-archive et. al. |
16532 |
+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then |
16533 |
+ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
16534 |
+ else |
16535 |
+ whole_archive_flag_spec_F77= |
16536 |
+ fi |
16537 |
+ supports_anon_versioning=no |
16538 |
+ case `$LD -v 2>/dev/null` in |
16539 |
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 |
16540 |
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
16541 |
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
16542 |
+ *\ 2.11.*) ;; # other 2.11 versions |
16543 |
+ *) supports_anon_versioning=yes ;; |
16544 |
+ esac |
16545 |
+ |
16546 |
# See if GNU ld supports shared libraries. |
16547 |
case $host_os in |
16548 |
aix3* | aix4* | aix5*) |
16549 |
@@ -13149,10 +13057,10 @@ |
16550 |
allow_undefined_flag_F77=unsupported |
16551 |
always_export_symbols_F77=no |
16552 |
enable_shared_with_static_runtimes_F77=yes |
16553 |
- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' |
16554 |
+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' |
16555 |
|
16556 |
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then |
16557 |
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
16558 |
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
16559 |
# If the export-symbols file already is a .def file (1st line |
16560 |
# is EXPORTS), use it as is; otherwise, prepend... |
16561 |
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
16562 |
@@ -13161,9 +13069,56 @@ |
16563 |
echo EXPORTS > $output_objdir/$soname.def; |
16564 |
cat $export_symbols >> $output_objdir/$soname.def; |
16565 |
fi~ |
16566 |
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
16567 |
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
16568 |
else |
16569 |
- ld_shlibs=no |
16570 |
+ ld_shlibs_F77=no |
16571 |
+ fi |
16572 |
+ ;; |
16573 |
+ |
16574 |
+ interix3*) |
16575 |
+ hardcode_direct_F77=no |
16576 |
+ hardcode_shlibpath_var_F77=no |
16577 |
+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' |
16578 |
+ export_dynamic_flag_spec_F77='${wl}-E' |
16579 |
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. |
16580 |
+ # Instead, shared libraries are loaded at an image base (0x10000000 by |
16581 |
+ # default) and relocated if they conflict, which is a slow very memory |
16582 |
+ # consuming and fragmenting process. To avoid this, we pick a random, |
16583 |
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link |
16584 |
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. |
16585 |
+ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
16586 |
+ archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
16587 |
+ ;; |
16588 |
+ |
16589 |
+ linux*) |
16590 |
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
16591 |
+ tmp_addflag= |
16592 |
+ case $cc_basename,$host_cpu in |
16593 |
+ pgcc*) # Portland Group C compiler |
16594 |
+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
16595 |
+ tmp_addflag=' $pic_flag' |
16596 |
+ ;; |
16597 |
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
16598 |
+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
16599 |
+ tmp_addflag=' $pic_flag -Mnomain' ;; |
16600 |
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
16601 |
+ tmp_addflag=' -i_dynamic' ;; |
16602 |
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 |
16603 |
+ tmp_addflag=' -i_dynamic -nofor_main' ;; |
16604 |
+ ifc* | ifort*) # Intel Fortran compiler |
16605 |
+ tmp_addflag=' -nofor_main' ;; |
16606 |
+ esac |
16607 |
+ archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
16608 |
+ |
16609 |
+ if test $supports_anon_versioning = yes; then |
16610 |
+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ |
16611 |
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
16612 |
+ $echo "local: *; };" >> $output_objdir/$libname.ver~ |
16613 |
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
16614 |
+ fi |
16615 |
+ link_all_deplibs_F77=no |
16616 |
+ else |
16617 |
+ ld_shlibs_F77=no |
16618 |
fi |
16619 |
;; |
16620 |
|
16621 |
@@ -13177,7 +13132,7 @@ |
16622 |
fi |
16623 |
;; |
16624 |
|
16625 |
- solaris* | sysv5*) |
16626 |
+ solaris*) |
16627 |
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then |
16628 |
ld_shlibs_F77=no |
16629 |
cat <<EOF 1>&2 |
16630 |
@@ -13198,6 +13153,33 @@ |
16631 |
fi |
16632 |
;; |
16633 |
|
16634 |
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) |
16635 |
+ case `$LD -v 2>&1` in |
16636 |
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) |
16637 |
+ ld_shlibs_F77=no |
16638 |
+ cat <<_LT_EOF 1>&2 |
16639 |
+ |
16640 |
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not |
16641 |
+*** reliably create shared libraries on SCO systems. Therefore, libtool |
16642 |
+*** is disabling shared libraries support. We urge you to upgrade GNU |
16643 |
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify |
16644 |
+*** your PATH or compiler configuration so that the native linker is |
16645 |
+*** used, and then restart. |
16646 |
+ |
16647 |
+_LT_EOF |
16648 |
+ ;; |
16649 |
+ *) |
16650 |
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
16651 |
+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' |
16652 |
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' |
16653 |
+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' |
16654 |
+ else |
16655 |
+ ld_shlibs_F77=no |
16656 |
+ fi |
16657 |
+ ;; |
16658 |
+ esac |
16659 |
+ ;; |
16660 |
+ |
16661 |
sunos4*) |
16662 |
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
16663 |
wlarc= |
16664 |
@@ -13205,32 +13187,6 @@ |
16665 |
hardcode_shlibpath_var_F77=no |
16666 |
;; |
16667 |
|
16668 |
- linux*) |
16669 |
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
16670 |
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
16671 |
- archive_cmds_F77="$tmp_archive_cmds" |
16672 |
- supports_anon_versioning=no |
16673 |
- case `$LD -v 2>/dev/null` in |
16674 |
- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 |
16675 |
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
16676 |
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
16677 |
- *\ 2.11.*) ;; # other 2.11 versions |
16678 |
- *) supports_anon_versioning=yes ;; |
16679 |
- esac |
16680 |
- if test $supports_anon_versioning = yes; then |
16681 |
- archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ |
16682 |
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
16683 |
-$echo "local: *; };" >> $output_objdir/$libname.ver~ |
16684 |
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
16685 |
- else |
16686 |
- archive_expsym_cmds_F77="$tmp_archive_cmds" |
16687 |
- fi |
16688 |
- link_all_deplibs_F77=no |
16689 |
- else |
16690 |
- ld_shlibs_F77=no |
16691 |
- fi |
16692 |
- ;; |
16693 |
- |
16694 |
*) |
16695 |
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
16696 |
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
16697 |
@@ -13241,16 +13197,11 @@ |
16698 |
;; |
16699 |
esac |
16700 |
|
16701 |
- if test "$ld_shlibs_F77" = yes; then |
16702 |
- runpath_var=LD_RUN_PATH |
16703 |
- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' |
16704 |
- export_dynamic_flag_spec_F77='${wl}--export-dynamic' |
16705 |
- # ancient GNU ld didn't support --whole-archive et. al. |
16706 |
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then |
16707 |
- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
16708 |
- else |
16709 |
- whole_archive_flag_spec_F77= |
16710 |
- fi |
16711 |
+ if test "$ld_shlibs_F77" = no; then |
16712 |
+ runpath_var= |
16713 |
+ hardcode_libdir_flag_spec_F77= |
16714 |
+ export_dynamic_flag_spec_F77= |
16715 |
+ whole_archive_flag_spec_F77= |
16716 |
fi |
16717 |
else |
16718 |
# PORTME fill in a description of your system's linker (not GNU ld) |
16719 |
@@ -13262,7 +13213,7 @@ |
16720 |
# Note: this linker hardcodes the directories in LIBPATH if there |
16721 |
# are no directories specified by -L. |
16722 |
hardcode_minus_L_F77=yes |
16723 |
- if test "$GCC" = yes && test -z "$link_static_flag"; then |
16724 |
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then |
16725 |
# Neither direct hardcoding nor static linking is supported with a |
16726 |
# broken collect2. |
16727 |
hardcode_direct_F77=unsupported |
16728 |
@@ -13296,6 +13247,7 @@ |
16729 |
break |
16730 |
fi |
16731 |
done |
16732 |
+ ;; |
16733 |
esac |
16734 |
|
16735 |
exp_sym_flag='-bexport' |
16736 |
@@ -13314,7 +13266,7 @@ |
16737 |
link_all_deplibs_F77=yes |
16738 |
|
16739 |
if test "$GCC" = yes; then |
16740 |
- case $host_os in aix4.012|aix4.012.*) |
16741 |
+ case $host_os in aix4.[012]|aix4.[012].*) |
16742 |
# We only want to do this on AIX 4.2 and lower, the check |
16743 |
# below for broken collect2 doesn't work under 4.3+ |
16744 |
collect2name=`${CC} -print-prog-name=collect2` |
16745 |
@@ -13333,8 +13285,12 @@ |
16746 |
hardcode_libdir_flag_spec_F77='-L$libdir' |
16747 |
hardcode_libdir_separator_F77= |
16748 |
fi |
16749 |
+ ;; |
16750 |
esac |
16751 |
shared_flag='-shared' |
16752 |
+ if test "$aix_use_runtimelinking" = yes; then |
16753 |
+ shared_flag="$shared_flag "'${wl}-G' |
16754 |
+ fi |
16755 |
else |
16756 |
# not using gcc |
16757 |
if test "$host_cpu" = ia64; then |
16758 |
@@ -13342,11 +13298,11 @@ |
16759 |
# chokes on -Wl,-G. The following line is correct: |
16760 |
shared_flag='-G' |
16761 |
else |
16762 |
- if test "$aix_use_runtimelinking" = yes; then |
16763 |
+ if test "$aix_use_runtimelinking" = yes; then |
16764 |
shared_flag='${wl}-G' |
16765 |
else |
16766 |
shared_flag='${wl}-bM:SRE' |
16767 |
- fi |
16768 |
+ fi |
16769 |
fi |
16770 |
fi |
16771 |
|
16772 |
@@ -13400,12 +13356,12 @@ |
16773 |
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
16774 |
|
16775 |
hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" |
16776 |
- archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
16777 |
+ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
16778 |
else |
16779 |
if test "$host_cpu" = ia64; then |
16780 |
hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' |
16781 |
allow_undefined_flag_F77="-z nodefs" |
16782 |
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" |
16783 |
+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" |
16784 |
else |
16785 |
# Determine the default libpath from the value encoded in an empty executable. |
16786 |
cat >conftest.$ac_ext <<_ACEOF |
16787 |
@@ -13454,13 +13410,11 @@ |
16788 |
# -berok will link without error, but may produce a broken library. |
16789 |
no_undefined_flag_F77=' ${wl}-bernotok' |
16790 |
allow_undefined_flag_F77=' ${wl}-berok' |
16791 |
- # -bexpall does not export symbols beginning with underscore (_) |
16792 |
- always_export_symbols_F77=yes |
16793 |
# Exported symbols can be pulled into shared objects from archives |
16794 |
- whole_archive_flag_spec_F77=' ' |
16795 |
+ whole_archive_flag_spec_F77='$convenience' |
16796 |
archive_cmds_need_lc_F77=yes |
16797 |
- # This is similar to how AIX traditionally builds it's shared libraries. |
16798 |
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
16799 |
+ # This is similar to how AIX traditionally builds its shared libraries. |
16800 |
+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
16801 |
fi |
16802 |
fi |
16803 |
;; |
16804 |
@@ -13473,7 +13427,7 @@ |
16805 |
ld_shlibs_F77=no |
16806 |
;; |
16807 |
|
16808 |
- bsdi4*) |
16809 |
+ bsdi[45]*) |
16810 |
export_dynamic_flag_spec_F77=-rdynamic |
16811 |
;; |
16812 |
|
16813 |
@@ -13494,57 +13448,57 @@ |
16814 |
old_archive_From_new_cmds_F77='true' |
16815 |
# FIXME: Should let the user specify the lib program. |
16816 |
old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' |
16817 |
- fix_srcfile_path='`cygpath -w "$srcfile"`' |
16818 |
+ fix_srcfile_path_F77='`cygpath -w "$srcfile"`' |
16819 |
enable_shared_with_static_runtimes_F77=yes |
16820 |
;; |
16821 |
|
16822 |
darwin* | rhapsody*) |
16823 |
- if test "$GXX" = yes ; then |
16824 |
- archive_cmds_need_lc_F77=no |
16825 |
- case "$host_os" in |
16826 |
- rhapsody* | darwin1.[012]) |
16827 |
- allow_undefined_flag_F77='-undefined suppress' |
16828 |
- ;; |
16829 |
- *) # Darwin 1.3 on |
16830 |
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
16831 |
- allow_undefined_flag_F77='-flat_namespace -undefined suppress' |
16832 |
- else |
16833 |
- case ${MACOSX_DEPLOYMENT_TARGET} in |
16834 |
- 10.[012]) |
16835 |
- allow_undefined_flag_F77='-flat_namespace -undefined suppress' |
16836 |
- ;; |
16837 |
- 10.*) |
16838 |
- allow_undefined_flag_F77='-undefined dynamic_lookup' |
16839 |
- ;; |
16840 |
- esac |
16841 |
- fi |
16842 |
- ;; |
16843 |
+ case $host_os in |
16844 |
+ rhapsody* | darwin1.[012]) |
16845 |
+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' |
16846 |
+ ;; |
16847 |
+ *) # Darwin 1.3 on |
16848 |
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
16849 |
+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
16850 |
+ else |
16851 |
+ case ${MACOSX_DEPLOYMENT_TARGET} in |
16852 |
+ 10.[012]) |
16853 |
+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
16854 |
+ ;; |
16855 |
+ 10.*) |
16856 |
+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' |
16857 |
+ ;; |
16858 |
+ esac |
16859 |
+ fi |
16860 |
+ ;; |
16861 |
esac |
16862 |
- lt_int_apple_cc_single_mod=no |
16863 |
- output_verbose_link_cmd='echo' |
16864 |
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then |
16865 |
- lt_int_apple_cc_single_mod=yes |
16866 |
- fi |
16867 |
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
16868 |
- archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
16869 |
- else |
16870 |
- archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
16871 |
- fi |
16872 |
- module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
16873 |
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
16874 |
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
16875 |
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
16876 |
- else |
16877 |
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
16878 |
- fi |
16879 |
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
16880 |
+ archive_cmds_need_lc_F77=no |
16881 |
hardcode_direct_F77=no |
16882 |
hardcode_automatic_F77=yes |
16883 |
hardcode_shlibpath_var_F77=unsupported |
16884 |
- whole_archive_flag_spec_F77='-all_load $convenience' |
16885 |
+ whole_archive_flag_spec_F77='' |
16886 |
link_all_deplibs_F77=yes |
16887 |
+ if test "$GCC" = yes ; then |
16888 |
+ output_verbose_link_cmd='echo' |
16889 |
+ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
16890 |
+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
16891 |
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
16892 |
+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
16893 |
+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
16894 |
else |
16895 |
- ld_shlibs_F77=no |
16896 |
+ case $cc_basename in |
16897 |
+ xlc*) |
16898 |
+ output_verbose_link_cmd='echo' |
16899 |
+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' |
16900 |
+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
16901 |
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
16902 |
+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
16903 |
+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
16904 |
+ ;; |
16905 |
+ *) |
16906 |
+ ld_shlibs_F77=no |
16907 |
+ ;; |
16908 |
+ esac |
16909 |
fi |
16910 |
;; |
16911 |
|
16912 |
@@ -13578,13 +13532,22 @@ |
16913 |
;; |
16914 |
|
16915 |
# FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
16916 |
- freebsd* | kfreebsd*-gnu) |
16917 |
+ freebsd* | dragonfly*) |
16918 |
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
16919 |
hardcode_libdir_flag_spec_F77='-R$libdir' |
16920 |
hardcode_direct_F77=yes |
16921 |
hardcode_shlibpath_var_F77=no |
16922 |
;; |
16923 |
|
16924 |
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries. |
16925 |
+ kfreebsd*-gnu) |
16926 |
+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
16927 |
+ hardcode_libdir_flag_spec_F77='-R$libdir' |
16928 |
+ hardcode_direct_F77=yes |
16929 |
+ hardcode_shlibpath_var_F77=no |
16930 |
+ link_all_deplibs_F77=no |
16931 |
+ ;; |
16932 |
+ |
16933 |
hpux9*) |
16934 |
if test "$GCC" = yes; then |
16935 |
archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
16936 |
@@ -13601,47 +13564,62 @@ |
16937 |
export_dynamic_flag_spec_F77='${wl}-E' |
16938 |
;; |
16939 |
|
16940 |
- hpux10* | hpux11*) |
16941 |
+ hpux10*) |
16942 |
if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
16943 |
- case "$host_cpu" in |
16944 |
- hppa*64*|ia64*) |
16945 |
+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
16946 |
+ else |
16947 |
+ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
16948 |
+ fi |
16949 |
+ if test "$with_gnu_ld" = no; then |
16950 |
+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' |
16951 |
+ hardcode_libdir_separator_F77=: |
16952 |
+ |
16953 |
+ hardcode_direct_F77=yes |
16954 |
+ export_dynamic_flag_spec_F77='${wl}-E' |
16955 |
+ |
16956 |
+ # hardcode_minus_L: Not really in the search PATH, |
16957 |
+ # but as the default location of the library. |
16958 |
+ hardcode_minus_L_F77=yes |
16959 |
+ fi |
16960 |
+ ;; |
16961 |
+ |
16962 |
+ hpux11*) |
16963 |
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
16964 |
+ case $host_cpu in |
16965 |
+ hppa*64*) |
16966 |
archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
16967 |
;; |
16968 |
+ ia64*) |
16969 |
+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
16970 |
+ ;; |
16971 |
*) |
16972 |
archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
16973 |
;; |
16974 |
esac |
16975 |
else |
16976 |
- case "$host_cpu" in |
16977 |
- hppa*64*|ia64*) |
16978 |
- archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' |
16979 |
+ case $host_cpu in |
16980 |
+ hppa*64*) |
16981 |
+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
16982 |
+ ;; |
16983 |
+ ia64*) |
16984 |
+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
16985 |
;; |
16986 |
*) |
16987 |
- archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
16988 |
+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
16989 |
;; |
16990 |
esac |
16991 |
fi |
16992 |
if test "$with_gnu_ld" = no; then |
16993 |
- case "$host_cpu" in |
16994 |
- hppa*64*) |
16995 |
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' |
16996 |
+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' |
16997 |
+ hardcode_libdir_separator_F77=: |
16998 |
+ |
16999 |
+ case $host_cpu in |
17000 |
+ hppa*64*|ia64*) |
17001 |
hardcode_libdir_flag_spec_ld_F77='+b $libdir' |
17002 |
- hardcode_libdir_separator_F77=: |
17003 |
- hardcode_direct_F77=no |
17004 |
- hardcode_shlibpath_var_F77=no |
17005 |
- ;; |
17006 |
- ia64*) |
17007 |
- hardcode_libdir_flag_spec_F77='-L$libdir' |
17008 |
hardcode_direct_F77=no |
17009 |
hardcode_shlibpath_var_F77=no |
17010 |
- |
17011 |
- # hardcode_minus_L: Not really in the search PATH, |
17012 |
- # but as the default location of the library. |
17013 |
- hardcode_minus_L_F77=yes |
17014 |
;; |
17015 |
*) |
17016 |
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' |
17017 |
- hardcode_libdir_separator_F77=: |
17018 |
hardcode_direct_F77=yes |
17019 |
export_dynamic_flag_spec_F77='${wl}-E' |
17020 |
|
17021 |
@@ -13689,6 +13667,7 @@ |
17022 |
hardcode_shlibpath_var_F77=no |
17023 |
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
17024 |
archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
17025 |
+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' |
17026 |
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' |
17027 |
export_dynamic_flag_spec_F77='${wl}-E' |
17028 |
else |
17029 |
@@ -13734,7 +13713,7 @@ |
17030 |
allow_undefined_flag_F77=' -expect_unresolved \*' |
17031 |
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
17032 |
archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ |
17033 |
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' |
17034 |
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' |
17035 |
|
17036 |
# Both c and cxx compiler support -rpath directly |
17037 |
hardcode_libdir_flag_spec_F77='-rpath $libdir' |
17038 |
@@ -13742,21 +13721,15 @@ |
17039 |
hardcode_libdir_separator_F77=: |
17040 |
;; |
17041 |
|
17042 |
- sco3.2v5*) |
17043 |
- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' |
17044 |
- hardcode_shlibpath_var_F77=no |
17045 |
- export_dynamic_flag_spec_F77='${wl}-Bexport' |
17046 |
- runpath_var=LD_RUN_PATH |
17047 |
- hardcode_runpath_var=yes |
17048 |
- ;; |
17049 |
- |
17050 |
solaris*) |
17051 |
no_undefined_flag_F77=' -z text' |
17052 |
if test "$GCC" = yes; then |
17053 |
+ wlarc='${wl}' |
17054 |
archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
17055 |
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
17056 |
$CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' |
17057 |
else |
17058 |
+ wlarc='' |
17059 |
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
17060 |
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
17061 |
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' |
17062 |
@@ -13765,8 +13738,18 @@ |
17063 |
hardcode_shlibpath_var_F77=no |
17064 |
case $host_os in |
17065 |
solaris2.[0-5] | solaris2.[0-5].*) ;; |
17066 |
- *) # Supported since Solaris 2.6 (maybe 2.5.1?) |
17067 |
- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; |
17068 |
+ *) |
17069 |
+ # The compiler driver will combine linker options so we |
17070 |
+ # cannot just pass the convience library names through |
17071 |
+ # without $wl, iff we do not link with $LD. |
17072 |
+ # Luckily, gcc supports the same syntax we need for Sun Studio. |
17073 |
+ # Supported since Solaris 2.6 (maybe 2.5.1?) |
17074 |
+ case $wlarc in |
17075 |
+ '') |
17076 |
+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; |
17077 |
+ *) |
17078 |
+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; |
17079 |
+ esac ;; |
17080 |
esac |
17081 |
link_all_deplibs_F77=yes |
17082 |
;; |
17083 |
@@ -13823,36 +13806,45 @@ |
17084 |
fi |
17085 |
;; |
17086 |
|
17087 |
- sysv4.2uw2*) |
17088 |
- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' |
17089 |
- hardcode_direct_F77=yes |
17090 |
- hardcode_minus_L_F77=no |
17091 |
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) |
17092 |
+ no_undefined_flag_F77='${wl}-z,text' |
17093 |
+ archive_cmds_need_lc_F77=no |
17094 |
hardcode_shlibpath_var_F77=no |
17095 |
- hardcode_runpath_var=yes |
17096 |
- runpath_var=LD_RUN_PATH |
17097 |
- ;; |
17098 |
+ runpath_var='LD_RUN_PATH' |
17099 |
|
17100 |
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) |
17101 |
- no_undefined_flag_F77='${wl}-z ${wl}text' |
17102 |
if test "$GCC" = yes; then |
17103 |
- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
17104 |
+ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
17105 |
+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
17106 |
else |
17107 |
- archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
17108 |
+ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
17109 |
+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
17110 |
fi |
17111 |
- runpath_var='LD_RUN_PATH' |
17112 |
- hardcode_shlibpath_var_F77=no |
17113 |
;; |
17114 |
|
17115 |
- sysv5*) |
17116 |
- no_undefined_flag_F77=' -z text' |
17117 |
- # $CC -shared without GNU ld will not create a library from C++ |
17118 |
- # object files and a static libstdc++, better avoid it by now |
17119 |
- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
17120 |
- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
17121 |
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' |
17122 |
- hardcode_libdir_flag_spec_F77= |
17123 |
+ sysv5* | sco3.2v5* | sco5v6*) |
17124 |
+ # Note: We can NOT use -z defs as we might desire, because we do not |
17125 |
+ # link with -lc, and that would cause any symbols used from libc to |
17126 |
+ # always be unresolved, which means just about no library would |
17127 |
+ # ever link correctly. If we're not using GNU ld we use -z text |
17128 |
+ # though, which does catch some bad symbols but isn't as heavy-handed |
17129 |
+ # as -z defs. |
17130 |
+ no_undefined_flag_F77='${wl}-z,text' |
17131 |
+ allow_undefined_flag_F77='${wl}-z,nodefs' |
17132 |
+ archive_cmds_need_lc_F77=no |
17133 |
hardcode_shlibpath_var_F77=no |
17134 |
+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' |
17135 |
+ hardcode_libdir_separator_F77=':' |
17136 |
+ link_all_deplibs_F77=yes |
17137 |
+ export_dynamic_flag_spec_F77='${wl}-Bexport' |
17138 |
runpath_var='LD_RUN_PATH' |
17139 |
+ |
17140 |
+ if test "$GCC" = yes; then |
17141 |
+ archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
17142 |
+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
17143 |
+ else |
17144 |
+ archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
17145 |
+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
17146 |
+ fi |
17147 |
;; |
17148 |
|
17149 |
uts4*) |
17150 |
@@ -13871,11 +13863,6 @@ |
17151 |
echo "${ECHO_T}$ld_shlibs_F77" >&6 |
17152 |
test "$ld_shlibs_F77" = no && can_build_shared=no |
17153 |
|
17154 |
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
17155 |
-if test "$GCC" = yes; then |
17156 |
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
17157 |
-fi |
17158 |
- |
17159 |
# |
17160 |
# Do we need to explicitly link libc? |
17161 |
# |
17162 |
@@ -13908,6 +13895,7 @@ |
17163 |
libobjs=conftest.$ac_objext |
17164 |
deplibs= |
17165 |
wl=$lt_prog_compiler_wl_F77 |
17166 |
+ pic_flag=$lt_prog_compiler_pic_F77 |
17167 |
compiler_flags=-v |
17168 |
linker_flags=-v |
17169 |
verstring= |
17170 |
@@ -14040,7 +14028,7 @@ |
17171 |
shlibpath_var=LIBRARY_PATH |
17172 |
;; |
17173 |
|
17174 |
-bsdi4*) |
17175 |
+bsdi[45]*) |
17176 |
version_type=linux |
17177 |
need_version=no |
17178 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
17179 |
@@ -14068,7 +14056,8 @@ |
17180 |
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ |
17181 |
dldir=$destdir/`dirname \$dlpath`~ |
17182 |
test -d \$dldir || mkdir -p \$dldir~ |
17183 |
- $install_prog $dir/$dlname \$dldir/$dlname' |
17184 |
+ $install_prog $dir/$dlname \$dldir/$dlname~ |
17185 |
+ chmod a+x \$dldir/$dlname' |
17186 |
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
17187 |
dlpath=$dir/\$dldll~ |
17188 |
$rm \$dlpath' |
17189 |
@@ -14098,7 +14087,7 @@ |
17190 |
;; |
17191 |
pw32*) |
17192 |
# pw32 DLLs use 'pw' prefix rather than 'lib' |
17193 |
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' |
17194 |
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
17195 |
;; |
17196 |
esac |
17197 |
;; |
17198 |
@@ -14121,7 +14110,7 @@ |
17199 |
soname_spec='${libname}${release}${major}$shared_ext' |
17200 |
shlibpath_overrides_runpath=yes |
17201 |
shlibpath_var=DYLD_LIBRARY_PATH |
17202 |
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' |
17203 |
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
17204 |
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
17205 |
if test "$GCC" = yes; then |
17206 |
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` |
17207 |
@@ -14156,8 +14145,17 @@ |
17208 |
dynamic_linker='GNU ld.so' |
17209 |
;; |
17210 |
|
17211 |
-freebsd*) |
17212 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
17213 |
+freebsd* | dragonfly*) |
17214 |
+ # DragonFly does not have aout. When/if they implement a new |
17215 |
+ # versioning mechanism, adjust this. |
17216 |
+ if test -x /usr/bin/objformat; then |
17217 |
+ objformat=`/usr/bin/objformat` |
17218 |
+ else |
17219 |
+ case $host_os in |
17220 |
+ freebsd[123]*) objformat=aout ;; |
17221 |
+ *) objformat=elf ;; |
17222 |
+ esac |
17223 |
+ fi |
17224 |
version_type=freebsd-$objformat |
17225 |
case $version_type in |
17226 |
freebsd-elf*) |
17227 |
@@ -14175,14 +14173,19 @@ |
17228 |
freebsd2*) |
17229 |
shlibpath_overrides_runpath=yes |
17230 |
;; |
17231 |
- freebsd3.01* | freebsdelf3.01*) |
17232 |
+ freebsd3.[01]* | freebsdelf3.[01]*) |
17233 |
shlibpath_overrides_runpath=yes |
17234 |
hardcode_into_libs=yes |
17235 |
;; |
17236 |
- *) # from 3.2 on |
17237 |
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ |
17238 |
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) |
17239 |
shlibpath_overrides_runpath=no |
17240 |
hardcode_into_libs=yes |
17241 |
;; |
17242 |
+ freebsd*) # from 4.6 on |
17243 |
+ shlibpath_overrides_runpath=yes |
17244 |
+ hardcode_into_libs=yes |
17245 |
+ ;; |
17246 |
esac |
17247 |
;; |
17248 |
|
17249 |
@@ -14202,7 +14205,7 @@ |
17250 |
version_type=sunos |
17251 |
need_lib_prefix=no |
17252 |
need_version=no |
17253 |
- case "$host_cpu" in |
17254 |
+ case $host_cpu in |
17255 |
ia64*) |
17256 |
shrext_cmds='.so' |
17257 |
hardcode_into_libs=yes |
17258 |
@@ -14242,6 +14245,18 @@ |
17259 |
postinstall_cmds='chmod 555 $lib' |
17260 |
;; |
17261 |
|
17262 |
+interix3*) |
17263 |
+ version_type=linux |
17264 |
+ need_lib_prefix=no |
17265 |
+ need_version=no |
17266 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
17267 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
17268 |
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' |
17269 |
+ shlibpath_var=LD_LIBRARY_PATH |
17270 |
+ shlibpath_overrides_runpath=no |
17271 |
+ hardcode_into_libs=yes |
17272 |
+ ;; |
17273 |
+ |
17274 |
irix5* | irix6* | nonstopux*) |
17275 |
case $host_os in |
17276 |
nonstopux*) version_type=nonstopux ;; |
17277 |
@@ -14301,7 +14316,7 @@ |
17278 |
|
17279 |
# Append ld.so.conf contents to the search path |
17280 |
if test -f /etc/ld.so.conf; then |
17281 |
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` |
17282 |
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
17283 |
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
17284 |
fi |
17285 |
|
17286 |
@@ -14375,8 +14390,13 @@ |
17287 |
|
17288 |
openbsd*) |
17289 |
version_type=sunos |
17290 |
+ sys_lib_dlsearch_path_spec="/usr/lib" |
17291 |
need_lib_prefix=no |
17292 |
- need_version=yes |
17293 |
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. |
17294 |
+ case $host_os in |
17295 |
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; |
17296 |
+ *) need_version=no ;; |
17297 |
+ esac |
17298 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
17299 |
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
17300 |
shlibpath_var=LD_LIBRARY_PATH |
17301 |
@@ -14414,13 +14434,6 @@ |
17302 |
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" |
17303 |
;; |
17304 |
|
17305 |
-sco3.2v5*) |
17306 |
- version_type=osf |
17307 |
- soname_spec='${libname}${release}${shared_ext}$major' |
17308 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
17309 |
- shlibpath_var=LD_LIBRARY_PATH |
17310 |
- ;; |
17311 |
- |
17312 |
solaris*) |
17313 |
version_type=linux |
17314 |
need_lib_prefix=no |
17315 |
@@ -14446,7 +14459,7 @@ |
17316 |
need_version=yes |
17317 |
;; |
17318 |
|
17319 |
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
17320 |
+sysv4 | sysv4.3*) |
17321 |
version_type=linux |
17322 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
17323 |
soname_spec='${libname}${release}${shared_ext}$major' |
17324 |
@@ -14479,6 +14492,29 @@ |
17325 |
fi |
17326 |
;; |
17327 |
|
17328 |
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
17329 |
+ version_type=freebsd-elf |
17330 |
+ need_lib_prefix=no |
17331 |
+ need_version=no |
17332 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
17333 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
17334 |
+ shlibpath_var=LD_LIBRARY_PATH |
17335 |
+ hardcode_into_libs=yes |
17336 |
+ if test "$with_gnu_ld" = yes; then |
17337 |
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' |
17338 |
+ shlibpath_overrides_runpath=no |
17339 |
+ else |
17340 |
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' |
17341 |
+ shlibpath_overrides_runpath=yes |
17342 |
+ case $host_os in |
17343 |
+ sco3.2v5*) |
17344 |
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" |
17345 |
+ ;; |
17346 |
+ esac |
17347 |
+ fi |
17348 |
+ sys_lib_dlsearch_path_spec='/usr/lib' |
17349 |
+ ;; |
17350 |
+ |
17351 |
uts4*) |
17352 |
version_type=linux |
17353 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
17354 |
@@ -14494,12 +14530,17 @@ |
17355 |
echo "${ECHO_T}$dynamic_linker" >&6 |
17356 |
test "$dynamic_linker" = no && can_build_shared=no |
17357 |
|
17358 |
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
17359 |
+if test "$GCC" = yes; then |
17360 |
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
17361 |
+fi |
17362 |
+ |
17363 |
echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
17364 |
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 |
17365 |
hardcode_action_F77= |
17366 |
if test -n "$hardcode_libdir_flag_spec_F77" || \ |
17367 |
- test -n "$runpath_var F77" || \ |
17368 |
- test "X$hardcode_automatic_F77"="Xyes" ; then |
17369 |
+ test -n "$runpath_var_F77" || \ |
17370 |
+ test "X$hardcode_automatic_F77" = "Xyes" ; then |
17371 |
|
17372 |
# We can hardcode non-existant directories. |
17373 |
if test "$hardcode_direct_F77" != no && |
17374 |
@@ -14531,36 +14572,6 @@ |
17375 |
enable_fast_install=needless |
17376 |
fi |
17377 |
|
17378 |
-striplib= |
17379 |
-old_striplib= |
17380 |
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 |
17381 |
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 |
17382 |
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then |
17383 |
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" |
17384 |
- test -z "$striplib" && striplib="$STRIP --strip-unneeded" |
17385 |
- echo "$as_me:$LINENO: result: yes" >&5 |
17386 |
-echo "${ECHO_T}yes" >&6 |
17387 |
-else |
17388 |
-# FIXME - insert some real tests, host_os isn't really good enough |
17389 |
- case $host_os in |
17390 |
- darwin*) |
17391 |
- if test -n "$STRIP" ; then |
17392 |
- striplib="$STRIP -x" |
17393 |
- echo "$as_me:$LINENO: result: yes" >&5 |
17394 |
-echo "${ECHO_T}yes" >&6 |
17395 |
- else |
17396 |
- echo "$as_me:$LINENO: result: no" >&5 |
17397 |
-echo "${ECHO_T}no" >&6 |
17398 |
-fi |
17399 |
- ;; |
17400 |
- *) |
17401 |
- echo "$as_me:$LINENO: result: no" >&5 |
17402 |
-echo "${ECHO_T}no" >&6 |
17403 |
- ;; |
17404 |
- esac |
17405 |
-fi |
17406 |
- |
17407 |
- |
17408 |
|
17409 |
# The else clause should only fire when bootstrapping the |
17410 |
# libtool distribution, otherwise you forgot to ship ltmain.sh |
17411 |
@@ -14575,7 +14586,7 @@ |
17412 |
# Now quote all the things that may contain metacharacters while being |
17413 |
# careful not to overquote the AC_SUBSTed values. We take copies of the |
17414 |
# variables and quote the copies for generation of the libtool script. |
17415 |
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ |
17416 |
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ |
17417 |
SED SHELL STRIP \ |
17418 |
libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
17419 |
old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
17420 |
@@ -14676,6 +14687,12 @@ |
17421 |
# The host system. |
17422 |
host_alias=$host_alias |
17423 |
host=$host |
17424 |
+host_os=$host_os |
17425 |
+ |
17426 |
+# The build system. |
17427 |
+build_alias=$build_alias |
17428 |
+build=$build |
17429 |
+build_os=$build_os |
17430 |
|
17431 |
# An echo program that does not interpret backslashes. |
17432 |
echo=$lt_echo |
17433 |
@@ -14687,6 +14704,9 @@ |
17434 |
# A C compiler. |
17435 |
LTCC=$lt_LTCC |
17436 |
|
17437 |
+# LTCC compiler flags. |
17438 |
+LTCFLAGS=$lt_LTCFLAGS |
17439 |
+ |
17440 |
# A language-specific compiler. |
17441 |
CC=$lt_compiler_F77 |
17442 |
|
17443 |
@@ -14752,7 +14772,7 @@ |
17444 |
# Does compiler simultaneously support -c and -o options? |
17445 |
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 |
17446 |
|
17447 |
-# Must we lock files when doing compilation ? |
17448 |
+# Must we lock files when doing compilation? |
17449 |
need_locks=$lt_need_locks |
17450 |
|
17451 |
# Do we need the lib prefix for modules? |
17452 |
@@ -14990,26 +15010,55 @@ |
17453 |
lt_simple_compile_test_code="class foo {}\n" |
17454 |
|
17455 |
# Code to be used in simple link tests |
17456 |
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' |
17457 |
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' |
17458 |
|
17459 |
# ltmain only uses $CC for tagged configurations so make sure $CC is set. |
17460 |
|
17461 |
# If no C compiler was specified, use CC. |
17462 |
LTCC=${LTCC-"$CC"} |
17463 |
|
17464 |
+# If no C compiler flags were specified, use CFLAGS. |
17465 |
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} |
17466 |
+ |
17467 |
# Allow CC to be a program name with arguments. |
17468 |
compiler=$CC |
17469 |
|
17470 |
|
17471 |
+# save warnings/boilerplate of simple test code |
17472 |
+ac_outfile=conftest.$ac_objext |
17473 |
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext |
17474 |
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
17475 |
+_lt_compiler_boilerplate=`cat conftest.err` |
17476 |
+$rm conftest* |
17477 |
+ |
17478 |
+ac_outfile=conftest.$ac_objext |
17479 |
+printf "$lt_simple_link_test_code" >conftest.$ac_ext |
17480 |
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
17481 |
+_lt_linker_boilerplate=`cat conftest.err` |
17482 |
+$rm conftest* |
17483 |
+ |
17484 |
+ |
17485 |
# Allow CC to be a program name with arguments. |
17486 |
lt_save_CC="$CC" |
17487 |
CC=${GCJ-"gcj"} |
17488 |
compiler=$CC |
17489 |
compiler_GCJ=$CC |
17490 |
+for cc_temp in $compiler""; do |
17491 |
+ case $cc_temp in |
17492 |
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; |
17493 |
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; |
17494 |
+ \-*) ;; |
17495 |
+ *) break;; |
17496 |
+ esac |
17497 |
+done |
17498 |
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
17499 |
+ |
17500 |
|
17501 |
# GCJ did not exist at the time GCC didn't implicitly link libc in. |
17502 |
archive_cmds_need_lc_GCJ=no |
17503 |
|
17504 |
+old_archive_cmds_GCJ=$old_archive_cmds |
17505 |
+ |
17506 |
|
17507 |
lt_prog_compiler_no_builtin_flag_GCJ= |
17508 |
|
17509 |
@@ -15032,18 +15081,20 @@ |
17510 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
17511 |
# The option is referenced via a variable to avoid confusing sed. |
17512 |
lt_compile=`echo "$ac_compile" | $SED \ |
17513 |
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
17514 |
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
17515 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
17516 |
-e 's:$: $lt_compiler_flag:'` |
17517 |
- (eval echo "\"\$as_me:15038: $lt_compile\"" >&5) |
17518 |
+ (eval echo "\"\$as_me:15087: $lt_compile\"" >&5) |
17519 |
(eval "$lt_compile" 2>conftest.err) |
17520 |
ac_status=$? |
17521 |
cat conftest.err >&5 |
17522 |
- echo "$as_me:15042: \$? = $ac_status" >&5 |
17523 |
+ echo "$as_me:15091: \$? = $ac_status" >&5 |
17524 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
17525 |
# The compiler can only warn and ignore the option if not recognized |
17526 |
- # So say no if there are warnings |
17527 |
- if test ! -s conftest.err; then |
17528 |
+ # So say no if there are warnings other than the usual output. |
17529 |
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
17530 |
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
17531 |
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
17532 |
lt_cv_prog_compiler_rtti_exceptions=yes |
17533 |
fi |
17534 |
fi |
17535 |
@@ -15104,6 +15155,11 @@ |
17536 |
lt_prog_compiler_pic_GCJ='-fno-common' |
17537 |
;; |
17538 |
|
17539 |
+ interix3*) |
17540 |
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
17541 |
+ # Instead, we relocate shared libraries at runtime. |
17542 |
+ ;; |
17543 |
+ |
17544 |
msdosdjgpp*) |
17545 |
# Just because we use GCC doesn't mean we suddenly get shared libraries |
17546 |
# on systems that don't support them. |
17547 |
@@ -15120,7 +15176,7 @@ |
17548 |
hpux*) |
17549 |
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
17550 |
# not for PA HP-UX. |
17551 |
- case "$host_cpu" in |
17552 |
+ case $host_cpu in |
17553 |
hppa*64*|ia64*) |
17554 |
# +Z the default |
17555 |
;; |
17556 |
@@ -15146,6 +15202,16 @@ |
17557 |
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' |
17558 |
fi |
17559 |
;; |
17560 |
+ darwin*) |
17561 |
+ # PIC is the default on this platform |
17562 |
+ # Common symbols not allowed in MH_DYLIB files |
17563 |
+ case $cc_basename in |
17564 |
+ xlc*) |
17565 |
+ lt_prog_compiler_pic_GCJ='-qnocommon' |
17566 |
+ lt_prog_compiler_wl_GCJ='-Wl,' |
17567 |
+ ;; |
17568 |
+ esac |
17569 |
+ ;; |
17570 |
|
17571 |
mingw* | pw32* | os2*) |
17572 |
# This hack is so that the source file can tell whether it is being |
17573 |
@@ -15157,7 +15223,7 @@ |
17574 |
lt_prog_compiler_wl_GCJ='-Wl,' |
17575 |
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
17576 |
# not for PA HP-UX. |
17577 |
- case "$host_cpu" in |
17578 |
+ case $host_cpu in |
17579 |
hppa*64*|ia64*) |
17580 |
# +Z the default |
17581 |
;; |
17582 |
@@ -15181,12 +15247,19 @@ |
17583 |
;; |
17584 |
|
17585 |
linux*) |
17586 |
- case $CC in |
17587 |
+ case $cc_basename in |
17588 |
icc* | ecc*) |
17589 |
lt_prog_compiler_wl_GCJ='-Wl,' |
17590 |
lt_prog_compiler_pic_GCJ='-KPIC' |
17591 |
lt_prog_compiler_static_GCJ='-static' |
17592 |
;; |
17593 |
+ pgcc* | pgf77* | pgf90* | pgf95*) |
17594 |
+ # Portland Group compilers (*not* the Pentium gcc compiler, |
17595 |
+ # which looks to be a dead project) |
17596 |
+ lt_prog_compiler_wl_GCJ='-Wl,' |
17597 |
+ lt_prog_compiler_pic_GCJ='-fpic' |
17598 |
+ lt_prog_compiler_static_GCJ='-Bstatic' |
17599 |
+ ;; |
17600 |
ccc*) |
17601 |
lt_prog_compiler_wl_GCJ='-Wl,' |
17602 |
# All Alpha code is PIC. |
17603 |
@@ -15201,15 +15274,15 @@ |
17604 |
lt_prog_compiler_static_GCJ='-non_shared' |
17605 |
;; |
17606 |
|
17607 |
- sco3.2v5*) |
17608 |
- lt_prog_compiler_pic_GCJ='-Kpic' |
17609 |
- lt_prog_compiler_static_GCJ='-dn' |
17610 |
- ;; |
17611 |
- |
17612 |
solaris*) |
17613 |
- lt_prog_compiler_wl_GCJ='-Wl,' |
17614 |
lt_prog_compiler_pic_GCJ='-KPIC' |
17615 |
lt_prog_compiler_static_GCJ='-Bstatic' |
17616 |
+ case $cc_basename in |
17617 |
+ f77* | f90* | f95*) |
17618 |
+ lt_prog_compiler_wl_GCJ='-Qoption ld ';; |
17619 |
+ *) |
17620 |
+ lt_prog_compiler_wl_GCJ='-Wl,';; |
17621 |
+ esac |
17622 |
;; |
17623 |
|
17624 |
sunos4*) |
17625 |
@@ -15218,7 +15291,7 @@ |
17626 |
lt_prog_compiler_static_GCJ='-Bstatic' |
17627 |
;; |
17628 |
|
17629 |
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
17630 |
+ sysv4 | sysv4.2uw2* | sysv4.3*) |
17631 |
lt_prog_compiler_wl_GCJ='-Wl,' |
17632 |
lt_prog_compiler_pic_GCJ='-KPIC' |
17633 |
lt_prog_compiler_static_GCJ='-Bstatic' |
17634 |
@@ -15231,6 +15304,17 @@ |
17635 |
fi |
17636 |
;; |
17637 |
|
17638 |
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) |
17639 |
+ lt_prog_compiler_wl_GCJ='-Wl,' |
17640 |
+ lt_prog_compiler_pic_GCJ='-KPIC' |
17641 |
+ lt_prog_compiler_static_GCJ='-Bstatic' |
17642 |
+ ;; |
17643 |
+ |
17644 |
+ unicos*) |
17645 |
+ lt_prog_compiler_wl_GCJ='-Wl,' |
17646 |
+ lt_prog_compiler_can_build_shared_GCJ=no |
17647 |
+ ;; |
17648 |
+ |
17649 |
uts4*) |
17650 |
lt_prog_compiler_pic_GCJ='-pic' |
17651 |
lt_prog_compiler_static_GCJ='-Bstatic' |
17652 |
@@ -15265,18 +15349,20 @@ |
17653 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
17654 |
# The option is referenced via a variable to avoid confusing sed. |
17655 |
lt_compile=`echo "$ac_compile" | $SED \ |
17656 |
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
17657 |
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
17658 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
17659 |
-e 's:$: $lt_compiler_flag:'` |
17660 |
- (eval echo "\"\$as_me:15271: $lt_compile\"" >&5) |
17661 |
+ (eval echo "\"\$as_me:15355: $lt_compile\"" >&5) |
17662 |
(eval "$lt_compile" 2>conftest.err) |
17663 |
ac_status=$? |
17664 |
cat conftest.err >&5 |
17665 |
- echo "$as_me:15275: \$? = $ac_status" >&5 |
17666 |
+ echo "$as_me:15359: \$? = $ac_status" >&5 |
17667 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
17668 |
# The compiler can only warn and ignore the option if not recognized |
17669 |
- # So say no if there are warnings |
17670 |
- if test ! -s conftest.err; then |
17671 |
+ # So say no if there are warnings other than the usual output. |
17672 |
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
17673 |
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
17674 |
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
17675 |
lt_prog_compiler_pic_works_GCJ=yes |
17676 |
fi |
17677 |
fi |
17678 |
@@ -15297,7 +15383,7 @@ |
17679 |
fi |
17680 |
|
17681 |
fi |
17682 |
-case "$host_os" in |
17683 |
+case $host_os in |
17684 |
# For platforms which do not support PIC, -DPIC is meaningless: |
17685 |
*djgpp*) |
17686 |
lt_prog_compiler_pic_GCJ= |
17687 |
@@ -15307,6 +15393,48 @@ |
17688 |
;; |
17689 |
esac |
17690 |
|
17691 |
+# |
17692 |
+# Check to make sure the static flag actually works. |
17693 |
+# |
17694 |
+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" |
17695 |
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
17696 |
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 |
17697 |
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then |
17698 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
17699 |
+else |
17700 |
+ lt_prog_compiler_static_works_GCJ=no |
17701 |
+ save_LDFLAGS="$LDFLAGS" |
17702 |
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" |
17703 |
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext |
17704 |
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
17705 |
+ # The linker can only warn and ignore the option if not recognized |
17706 |
+ # So say no if there are warnings |
17707 |
+ if test -s conftest.err; then |
17708 |
+ # Append any errors to the config.log. |
17709 |
+ cat conftest.err 1>&5 |
17710 |
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
17711 |
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
17712 |
+ if diff conftest.exp conftest.er2 >/dev/null; then |
17713 |
+ lt_prog_compiler_static_works_GCJ=yes |
17714 |
+ fi |
17715 |
+ else |
17716 |
+ lt_prog_compiler_static_works_GCJ=yes |
17717 |
+ fi |
17718 |
+ fi |
17719 |
+ $rm conftest* |
17720 |
+ LDFLAGS="$save_LDFLAGS" |
17721 |
+ |
17722 |
+fi |
17723 |
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 |
17724 |
+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 |
17725 |
+ |
17726 |
+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then |
17727 |
+ : |
17728 |
+else |
17729 |
+ lt_prog_compiler_static_GCJ= |
17730 |
+fi |
17731 |
+ |
17732 |
+ |
17733 |
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
17734 |
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 |
17735 |
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then |
17736 |
@@ -15325,23 +15453,25 @@ |
17737 |
# Note that $ac_compile itself does not contain backslashes and begins |
17738 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
17739 |
lt_compile=`echo "$ac_compile" | $SED \ |
17740 |
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
17741 |
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
17742 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
17743 |
-e 's:$: $lt_compiler_flag:'` |
17744 |
- (eval echo "\"\$as_me:15331: $lt_compile\"" >&5) |
17745 |
+ (eval echo "\"\$as_me:15459: $lt_compile\"" >&5) |
17746 |
(eval "$lt_compile" 2>out/conftest.err) |
17747 |
ac_status=$? |
17748 |
cat out/conftest.err >&5 |
17749 |
- echo "$as_me:15335: \$? = $ac_status" >&5 |
17750 |
+ echo "$as_me:15463: \$? = $ac_status" >&5 |
17751 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext |
17752 |
then |
17753 |
# The compiler can only warn and ignore the option if not recognized |
17754 |
# So say no if there are warnings |
17755 |
- if test ! -s out/conftest.err; then |
17756 |
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
17757 |
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
17758 |
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
17759 |
lt_cv_prog_compiler_c_o_GCJ=yes |
17760 |
fi |
17761 |
fi |
17762 |
- chmod u+w . |
17763 |
+ chmod u+w . 2>&5 |
17764 |
$rm conftest* |
17765 |
# SGI C++ compiler will create directory out/ii_files/ for |
17766 |
# template instantiation |
17767 |
@@ -15417,6 +15547,16 @@ |
17768 |
# rely on this symbol name, it's probably fine to never include it in |
17769 |
# preloaded symbol tables. |
17770 |
extract_expsyms_cmds= |
17771 |
+ # Just being paranoid about ensuring that cc_basename is set. |
17772 |
+ for cc_temp in $compiler""; do |
17773 |
+ case $cc_temp in |
17774 |
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; |
17775 |
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; |
17776 |
+ \-*) ;; |
17777 |
+ *) break;; |
17778 |
+ esac |
17779 |
+done |
17780 |
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
17781 |
|
17782 |
case $host_os in |
17783 |
cygwin* | mingw* | pw32*) |
17784 |
@@ -15427,6 +15567,10 @@ |
17785 |
with_gnu_ld=no |
17786 |
fi |
17787 |
;; |
17788 |
+ interix*) |
17789 |
+ # we just hope/assume this is gcc and not c89 (= MSVC++) |
17790 |
+ with_gnu_ld=yes |
17791 |
+ ;; |
17792 |
openbsd*) |
17793 |
with_gnu_ld=no |
17794 |
;; |
17795 |
@@ -15437,6 +15581,27 @@ |
17796 |
# If archive_cmds runs LD, not CC, wlarc should be empty |
17797 |
wlarc='${wl}' |
17798 |
|
17799 |
+ # Set some defaults for GNU ld with shared library support. These |
17800 |
+ # are reset later if shared libraries are not supported. Putting them |
17801 |
+ # here allows them to be overridden if necessary. |
17802 |
+ runpath_var=LD_RUN_PATH |
17803 |
+ hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' |
17804 |
+ export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' |
17805 |
+ # ancient GNU ld didn't support --whole-archive et. al. |
17806 |
+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then |
17807 |
+ whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
17808 |
+ else |
17809 |
+ whole_archive_flag_spec_GCJ= |
17810 |
+ fi |
17811 |
+ supports_anon_versioning=no |
17812 |
+ case `$LD -v 2>/dev/null` in |
17813 |
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 |
17814 |
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
17815 |
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
17816 |
+ *\ 2.11.*) ;; # other 2.11 versions |
17817 |
+ *) supports_anon_versioning=yes ;; |
17818 |
+ esac |
17819 |
+ |
17820 |
# See if GNU ld supports shared libraries. |
17821 |
case $host_os in |
17822 |
aix3* | aix4* | aix5*) |
17823 |
@@ -15487,10 +15652,10 @@ |
17824 |
allow_undefined_flag_GCJ=unsupported |
17825 |
always_export_symbols_GCJ=no |
17826 |
enable_shared_with_static_runtimes_GCJ=yes |
17827 |
- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' |
17828 |
+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' |
17829 |
|
17830 |
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then |
17831 |
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
17832 |
+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
17833 |
# If the export-symbols file already is a .def file (1st line |
17834 |
# is EXPORTS), use it as is; otherwise, prepend... |
17835 |
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
17836 |
@@ -15499,9 +15664,56 @@ |
17837 |
echo EXPORTS > $output_objdir/$soname.def; |
17838 |
cat $export_symbols >> $output_objdir/$soname.def; |
17839 |
fi~ |
17840 |
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
17841 |
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
17842 |
else |
17843 |
- ld_shlibs=no |
17844 |
+ ld_shlibs_GCJ=no |
17845 |
+ fi |
17846 |
+ ;; |
17847 |
+ |
17848 |
+ interix3*) |
17849 |
+ hardcode_direct_GCJ=no |
17850 |
+ hardcode_shlibpath_var_GCJ=no |
17851 |
+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' |
17852 |
+ export_dynamic_flag_spec_GCJ='${wl}-E' |
17853 |
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. |
17854 |
+ # Instead, shared libraries are loaded at an image base (0x10000000 by |
17855 |
+ # default) and relocated if they conflict, which is a slow very memory |
17856 |
+ # consuming and fragmenting process. To avoid this, we pick a random, |
17857 |
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link |
17858 |
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. |
17859 |
+ archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
17860 |
+ archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
17861 |
+ ;; |
17862 |
+ |
17863 |
+ linux*) |
17864 |
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
17865 |
+ tmp_addflag= |
17866 |
+ case $cc_basename,$host_cpu in |
17867 |
+ pgcc*) # Portland Group C compiler |
17868 |
+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
17869 |
+ tmp_addflag=' $pic_flag' |
17870 |
+ ;; |
17871 |
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
17872 |
+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' |
17873 |
+ tmp_addflag=' $pic_flag -Mnomain' ;; |
17874 |
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
17875 |
+ tmp_addflag=' -i_dynamic' ;; |
17876 |
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 |
17877 |
+ tmp_addflag=' -i_dynamic -nofor_main' ;; |
17878 |
+ ifc* | ifort*) # Intel Fortran compiler |
17879 |
+ tmp_addflag=' -nofor_main' ;; |
17880 |
+ esac |
17881 |
+ archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
17882 |
+ |
17883 |
+ if test $supports_anon_versioning = yes; then |
17884 |
+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ |
17885 |
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
17886 |
+ $echo "local: *; };" >> $output_objdir/$libname.ver~ |
17887 |
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
17888 |
+ fi |
17889 |
+ link_all_deplibs_GCJ=no |
17890 |
+ else |
17891 |
+ ld_shlibs_GCJ=no |
17892 |
fi |
17893 |
;; |
17894 |
|
17895 |
@@ -15515,7 +15727,7 @@ |
17896 |
fi |
17897 |
;; |
17898 |
|
17899 |
- solaris* | sysv5*) |
17900 |
+ solaris*) |
17901 |
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then |
17902 |
ld_shlibs_GCJ=no |
17903 |
cat <<EOF 1>&2 |
17904 |
@@ -15536,6 +15748,33 @@ |
17905 |
fi |
17906 |
;; |
17907 |
|
17908 |
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) |
17909 |
+ case `$LD -v 2>&1` in |
17910 |
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) |
17911 |
+ ld_shlibs_GCJ=no |
17912 |
+ cat <<_LT_EOF 1>&2 |
17913 |
+ |
17914 |
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not |
17915 |
+*** reliably create shared libraries on SCO systems. Therefore, libtool |
17916 |
+*** is disabling shared libraries support. We urge you to upgrade GNU |
17917 |
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify |
17918 |
+*** your PATH or compiler configuration so that the native linker is |
17919 |
+*** used, and then restart. |
17920 |
+ |
17921 |
+_LT_EOF |
17922 |
+ ;; |
17923 |
+ *) |
17924 |
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
17925 |
+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' |
17926 |
+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' |
17927 |
+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' |
17928 |
+ else |
17929 |
+ ld_shlibs_GCJ=no |
17930 |
+ fi |
17931 |
+ ;; |
17932 |
+ esac |
17933 |
+ ;; |
17934 |
+ |
17935 |
sunos4*) |
17936 |
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
17937 |
wlarc= |
17938 |
@@ -15543,32 +15782,6 @@ |
17939 |
hardcode_shlibpath_var_GCJ=no |
17940 |
;; |
17941 |
|
17942 |
- linux*) |
17943 |
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
17944 |
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
17945 |
- archive_cmds_GCJ="$tmp_archive_cmds" |
17946 |
- supports_anon_versioning=no |
17947 |
- case `$LD -v 2>/dev/null` in |
17948 |
- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 |
17949 |
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
17950 |
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
17951 |
- *\ 2.11.*) ;; # other 2.11 versions |
17952 |
- *) supports_anon_versioning=yes ;; |
17953 |
- esac |
17954 |
- if test $supports_anon_versioning = yes; then |
17955 |
- archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ |
17956 |
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
17957 |
-$echo "local: *; };" >> $output_objdir/$libname.ver~ |
17958 |
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
17959 |
- else |
17960 |
- archive_expsym_cmds_GCJ="$tmp_archive_cmds" |
17961 |
- fi |
17962 |
- link_all_deplibs_GCJ=no |
17963 |
- else |
17964 |
- ld_shlibs_GCJ=no |
17965 |
- fi |
17966 |
- ;; |
17967 |
- |
17968 |
*) |
17969 |
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
17970 |
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
17971 |
@@ -15579,16 +15792,11 @@ |
17972 |
;; |
17973 |
esac |
17974 |
|
17975 |
- if test "$ld_shlibs_GCJ" = yes; then |
17976 |
- runpath_var=LD_RUN_PATH |
17977 |
- hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' |
17978 |
- export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' |
17979 |
- # ancient GNU ld didn't support --whole-archive et. al. |
17980 |
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then |
17981 |
- whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
17982 |
- else |
17983 |
- whole_archive_flag_spec_GCJ= |
17984 |
- fi |
17985 |
+ if test "$ld_shlibs_GCJ" = no; then |
17986 |
+ runpath_var= |
17987 |
+ hardcode_libdir_flag_spec_GCJ= |
17988 |
+ export_dynamic_flag_spec_GCJ= |
17989 |
+ whole_archive_flag_spec_GCJ= |
17990 |
fi |
17991 |
else |
17992 |
# PORTME fill in a description of your system's linker (not GNU ld) |
17993 |
@@ -15600,7 +15808,7 @@ |
17994 |
# Note: this linker hardcodes the directories in LIBPATH if there |
17995 |
# are no directories specified by -L. |
17996 |
hardcode_minus_L_GCJ=yes |
17997 |
- if test "$GCC" = yes && test -z "$link_static_flag"; then |
17998 |
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then |
17999 |
# Neither direct hardcoding nor static linking is supported with a |
18000 |
# broken collect2. |
18001 |
hardcode_direct_GCJ=unsupported |
18002 |
@@ -15634,6 +15842,7 @@ |
18003 |
break |
18004 |
fi |
18005 |
done |
18006 |
+ ;; |
18007 |
esac |
18008 |
|
18009 |
exp_sym_flag='-bexport' |
18010 |
@@ -15652,7 +15861,7 @@ |
18011 |
link_all_deplibs_GCJ=yes |
18012 |
|
18013 |
if test "$GCC" = yes; then |
18014 |
- case $host_os in aix4.012|aix4.012.*) |
18015 |
+ case $host_os in aix4.[012]|aix4.[012].*) |
18016 |
# We only want to do this on AIX 4.2 and lower, the check |
18017 |
# below for broken collect2 doesn't work under 4.3+ |
18018 |
collect2name=`${CC} -print-prog-name=collect2` |
18019 |
@@ -15671,8 +15880,12 @@ |
18020 |
hardcode_libdir_flag_spec_GCJ='-L$libdir' |
18021 |
hardcode_libdir_separator_GCJ= |
18022 |
fi |
18023 |
+ ;; |
18024 |
esac |
18025 |
shared_flag='-shared' |
18026 |
+ if test "$aix_use_runtimelinking" = yes; then |
18027 |
+ shared_flag="$shared_flag "'${wl}-G' |
18028 |
+ fi |
18029 |
else |
18030 |
# not using gcc |
18031 |
if test "$host_cpu" = ia64; then |
18032 |
@@ -15680,11 +15893,11 @@ |
18033 |
# chokes on -Wl,-G. The following line is correct: |
18034 |
shared_flag='-G' |
18035 |
else |
18036 |
- if test "$aix_use_runtimelinking" = yes; then |
18037 |
+ if test "$aix_use_runtimelinking" = yes; then |
18038 |
shared_flag='${wl}-G' |
18039 |
else |
18040 |
shared_flag='${wl}-bM:SRE' |
18041 |
- fi |
18042 |
+ fi |
18043 |
fi |
18044 |
fi |
18045 |
|
18046 |
@@ -15748,12 +15961,12 @@ |
18047 |
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18048 |
|
18049 |
hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" |
18050 |
- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
18051 |
+ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
18052 |
else |
18053 |
if test "$host_cpu" = ia64; then |
18054 |
hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' |
18055 |
allow_undefined_flag_GCJ="-z nodefs" |
18056 |
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" |
18057 |
+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" |
18058 |
else |
18059 |
# Determine the default libpath from the value encoded in an empty executable. |
18060 |
cat >conftest.$ac_ext <<_ACEOF |
18061 |
@@ -15812,13 +16025,11 @@ |
18062 |
# -berok will link without error, but may produce a broken library. |
18063 |
no_undefined_flag_GCJ=' ${wl}-bernotok' |
18064 |
allow_undefined_flag_GCJ=' ${wl}-berok' |
18065 |
- # -bexpall does not export symbols beginning with underscore (_) |
18066 |
- always_export_symbols_GCJ=yes |
18067 |
# Exported symbols can be pulled into shared objects from archives |
18068 |
- whole_archive_flag_spec_GCJ=' ' |
18069 |
+ whole_archive_flag_spec_GCJ='$convenience' |
18070 |
archive_cmds_need_lc_GCJ=yes |
18071 |
- # This is similar to how AIX traditionally builds it's shared libraries. |
18072 |
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
18073 |
+ # This is similar to how AIX traditionally builds its shared libraries. |
18074 |
+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
18075 |
fi |
18076 |
fi |
18077 |
;; |
18078 |
@@ -15831,7 +16042,7 @@ |
18079 |
ld_shlibs_GCJ=no |
18080 |
;; |
18081 |
|
18082 |
- bsdi4*) |
18083 |
+ bsdi[45]*) |
18084 |
export_dynamic_flag_spec_GCJ=-rdynamic |
18085 |
;; |
18086 |
|
18087 |
@@ -15852,57 +16063,57 @@ |
18088 |
old_archive_From_new_cmds_GCJ='true' |
18089 |
# FIXME: Should let the user specify the lib program. |
18090 |
old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' |
18091 |
- fix_srcfile_path='`cygpath -w "$srcfile"`' |
18092 |
+ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' |
18093 |
enable_shared_with_static_runtimes_GCJ=yes |
18094 |
;; |
18095 |
|
18096 |
darwin* | rhapsody*) |
18097 |
- if test "$GXX" = yes ; then |
18098 |
- archive_cmds_need_lc_GCJ=no |
18099 |
- case "$host_os" in |
18100 |
- rhapsody* | darwin1.[012]) |
18101 |
- allow_undefined_flag_GCJ='-undefined suppress' |
18102 |
- ;; |
18103 |
- *) # Darwin 1.3 on |
18104 |
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
18105 |
- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' |
18106 |
- else |
18107 |
- case ${MACOSX_DEPLOYMENT_TARGET} in |
18108 |
- 10.[012]) |
18109 |
- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' |
18110 |
- ;; |
18111 |
- 10.*) |
18112 |
- allow_undefined_flag_GCJ='-undefined dynamic_lookup' |
18113 |
- ;; |
18114 |
- esac |
18115 |
- fi |
18116 |
- ;; |
18117 |
+ case $host_os in |
18118 |
+ rhapsody* | darwin1.[012]) |
18119 |
+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' |
18120 |
+ ;; |
18121 |
+ *) # Darwin 1.3 on |
18122 |
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then |
18123 |
+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
18124 |
+ else |
18125 |
+ case ${MACOSX_DEPLOYMENT_TARGET} in |
18126 |
+ 10.[012]) |
18127 |
+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' |
18128 |
+ ;; |
18129 |
+ 10.*) |
18130 |
+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' |
18131 |
+ ;; |
18132 |
+ esac |
18133 |
+ fi |
18134 |
+ ;; |
18135 |
esac |
18136 |
- lt_int_apple_cc_single_mod=no |
18137 |
- output_verbose_link_cmd='echo' |
18138 |
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then |
18139 |
- lt_int_apple_cc_single_mod=yes |
18140 |
- fi |
18141 |
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
18142 |
- archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
18143 |
- else |
18144 |
- archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
18145 |
- fi |
18146 |
- module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
18147 |
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
18148 |
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
18149 |
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
18150 |
- else |
18151 |
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
18152 |
- fi |
18153 |
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
18154 |
+ archive_cmds_need_lc_GCJ=no |
18155 |
hardcode_direct_GCJ=no |
18156 |
hardcode_automatic_GCJ=yes |
18157 |
hardcode_shlibpath_var_GCJ=unsupported |
18158 |
- whole_archive_flag_spec_GCJ='-all_load $convenience' |
18159 |
+ whole_archive_flag_spec_GCJ='' |
18160 |
link_all_deplibs_GCJ=yes |
18161 |
+ if test "$GCC" = yes ; then |
18162 |
+ output_verbose_link_cmd='echo' |
18163 |
+ archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' |
18164 |
+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
18165 |
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
18166 |
+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
18167 |
+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
18168 |
else |
18169 |
- ld_shlibs_GCJ=no |
18170 |
+ case $cc_basename in |
18171 |
+ xlc*) |
18172 |
+ output_verbose_link_cmd='echo' |
18173 |
+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' |
18174 |
+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' |
18175 |
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds |
18176 |
+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
18177 |
+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' |
18178 |
+ ;; |
18179 |
+ *) |
18180 |
+ ld_shlibs_GCJ=no |
18181 |
+ ;; |
18182 |
+ esac |
18183 |
fi |
18184 |
;; |
18185 |
|
18186 |
@@ -15936,11 +16147,20 @@ |
18187 |
;; |
18188 |
|
18189 |
# FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
18190 |
- freebsd* | kfreebsd*-gnu) |
18191 |
+ freebsd* | dragonfly*) |
18192 |
+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
18193 |
+ hardcode_libdir_flag_spec_GCJ='-R$libdir' |
18194 |
+ hardcode_direct_GCJ=yes |
18195 |
+ hardcode_shlibpath_var_GCJ=no |
18196 |
+ ;; |
18197 |
+ |
18198 |
+ # GNU/kFreeBSD uses gcc -shared to do shared libraries. |
18199 |
+ kfreebsd*-gnu) |
18200 |
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
18201 |
hardcode_libdir_flag_spec_GCJ='-R$libdir' |
18202 |
hardcode_direct_GCJ=yes |
18203 |
hardcode_shlibpath_var_GCJ=no |
18204 |
+ link_all_deplibs_GCJ=no |
18205 |
;; |
18206 |
|
18207 |
hpux9*) |
18208 |
@@ -15959,47 +16179,62 @@ |
18209 |
export_dynamic_flag_spec_GCJ='${wl}-E' |
18210 |
;; |
18211 |
|
18212 |
- hpux10* | hpux11*) |
18213 |
+ hpux10*) |
18214 |
if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
18215 |
- case "$host_cpu" in |
18216 |
- hppa*64*|ia64*) |
18217 |
+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
18218 |
+ else |
18219 |
+ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
18220 |
+ fi |
18221 |
+ if test "$with_gnu_ld" = no; then |
18222 |
+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' |
18223 |
+ hardcode_libdir_separator_GCJ=: |
18224 |
+ |
18225 |
+ hardcode_direct_GCJ=yes |
18226 |
+ export_dynamic_flag_spec_GCJ='${wl}-E' |
18227 |
+ |
18228 |
+ # hardcode_minus_L: Not really in the search PATH, |
18229 |
+ # but as the default location of the library. |
18230 |
+ hardcode_minus_L_GCJ=yes |
18231 |
+ fi |
18232 |
+ ;; |
18233 |
+ |
18234 |
+ hpux11*) |
18235 |
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
18236 |
+ case $host_cpu in |
18237 |
+ hppa*64*) |
18238 |
archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
18239 |
;; |
18240 |
+ ia64*) |
18241 |
+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
18242 |
+ ;; |
18243 |
*) |
18244 |
archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
18245 |
;; |
18246 |
esac |
18247 |
else |
18248 |
- case "$host_cpu" in |
18249 |
- hppa*64*|ia64*) |
18250 |
- archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' |
18251 |
+ case $host_cpu in |
18252 |
+ hppa*64*) |
18253 |
+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
18254 |
+ ;; |
18255 |
+ ia64*) |
18256 |
+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
18257 |
;; |
18258 |
*) |
18259 |
- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
18260 |
+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
18261 |
;; |
18262 |
esac |
18263 |
fi |
18264 |
if test "$with_gnu_ld" = no; then |
18265 |
- case "$host_cpu" in |
18266 |
- hppa*64*) |
18267 |
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' |
18268 |
+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' |
18269 |
+ hardcode_libdir_separator_GCJ=: |
18270 |
+ |
18271 |
+ case $host_cpu in |
18272 |
+ hppa*64*|ia64*) |
18273 |
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' |
18274 |
- hardcode_libdir_separator_GCJ=: |
18275 |
- hardcode_direct_GCJ=no |
18276 |
- hardcode_shlibpath_var_GCJ=no |
18277 |
- ;; |
18278 |
- ia64*) |
18279 |
- hardcode_libdir_flag_spec_GCJ='-L$libdir' |
18280 |
hardcode_direct_GCJ=no |
18281 |
hardcode_shlibpath_var_GCJ=no |
18282 |
- |
18283 |
- # hardcode_minus_L: Not really in the search PATH, |
18284 |
- # but as the default location of the library. |
18285 |
- hardcode_minus_L_GCJ=yes |
18286 |
;; |
18287 |
*) |
18288 |
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' |
18289 |
- hardcode_libdir_separator_GCJ=: |
18290 |
hardcode_direct_GCJ=yes |
18291 |
export_dynamic_flag_spec_GCJ='${wl}-E' |
18292 |
|
18293 |
@@ -16047,6 +16282,7 @@ |
18294 |
hardcode_shlibpath_var_GCJ=no |
18295 |
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
18296 |
archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
18297 |
+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' |
18298 |
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' |
18299 |
export_dynamic_flag_spec_GCJ='${wl}-E' |
18300 |
else |
18301 |
@@ -16092,7 +16328,7 @@ |
18302 |
allow_undefined_flag_GCJ=' -expect_unresolved \*' |
18303 |
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
18304 |
archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ |
18305 |
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' |
18306 |
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' |
18307 |
|
18308 |
# Both c and cxx compiler support -rpath directly |
18309 |
hardcode_libdir_flag_spec_GCJ='-rpath $libdir' |
18310 |
@@ -16100,21 +16336,15 @@ |
18311 |
hardcode_libdir_separator_GCJ=: |
18312 |
;; |
18313 |
|
18314 |
- sco3.2v5*) |
18315 |
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' |
18316 |
- hardcode_shlibpath_var_GCJ=no |
18317 |
- export_dynamic_flag_spec_GCJ='${wl}-Bexport' |
18318 |
- runpath_var=LD_RUN_PATH |
18319 |
- hardcode_runpath_var=yes |
18320 |
- ;; |
18321 |
- |
18322 |
solaris*) |
18323 |
no_undefined_flag_GCJ=' -z text' |
18324 |
if test "$GCC" = yes; then |
18325 |
+ wlarc='${wl}' |
18326 |
archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
18327 |
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
18328 |
$CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' |
18329 |
else |
18330 |
+ wlarc='' |
18331 |
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
18332 |
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
18333 |
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' |
18334 |
@@ -16123,8 +16353,18 @@ |
18335 |
hardcode_shlibpath_var_GCJ=no |
18336 |
case $host_os in |
18337 |
solaris2.[0-5] | solaris2.[0-5].*) ;; |
18338 |
- *) # Supported since Solaris 2.6 (maybe 2.5.1?) |
18339 |
- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; |
18340 |
+ *) |
18341 |
+ # The compiler driver will combine linker options so we |
18342 |
+ # cannot just pass the convience library names through |
18343 |
+ # without $wl, iff we do not link with $LD. |
18344 |
+ # Luckily, gcc supports the same syntax we need for Sun Studio. |
18345 |
+ # Supported since Solaris 2.6 (maybe 2.5.1?) |
18346 |
+ case $wlarc in |
18347 |
+ '') |
18348 |
+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; |
18349 |
+ *) |
18350 |
+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; |
18351 |
+ esac ;; |
18352 |
esac |
18353 |
link_all_deplibs_GCJ=yes |
18354 |
;; |
18355 |
@@ -16181,36 +16421,45 @@ |
18356 |
fi |
18357 |
;; |
18358 |
|
18359 |
- sysv4.2uw2*) |
18360 |
- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' |
18361 |
- hardcode_direct_GCJ=yes |
18362 |
- hardcode_minus_L_GCJ=no |
18363 |
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) |
18364 |
+ no_undefined_flag_GCJ='${wl}-z,text' |
18365 |
+ archive_cmds_need_lc_GCJ=no |
18366 |
hardcode_shlibpath_var_GCJ=no |
18367 |
- hardcode_runpath_var=yes |
18368 |
- runpath_var=LD_RUN_PATH |
18369 |
- ;; |
18370 |
+ runpath_var='LD_RUN_PATH' |
18371 |
|
18372 |
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) |
18373 |
- no_undefined_flag_GCJ='${wl}-z ${wl}text' |
18374 |
if test "$GCC" = yes; then |
18375 |
- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
18376 |
+ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
18377 |
+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
18378 |
else |
18379 |
- archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
18380 |
+ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
18381 |
+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
18382 |
fi |
18383 |
- runpath_var='LD_RUN_PATH' |
18384 |
- hardcode_shlibpath_var_GCJ=no |
18385 |
;; |
18386 |
|
18387 |
- sysv5*) |
18388 |
- no_undefined_flag_GCJ=' -z text' |
18389 |
- # $CC -shared without GNU ld will not create a library from C++ |
18390 |
- # object files and a static libstdc++, better avoid it by now |
18391 |
- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
18392 |
- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ |
18393 |
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' |
18394 |
- hardcode_libdir_flag_spec_GCJ= |
18395 |
+ sysv5* | sco3.2v5* | sco5v6*) |
18396 |
+ # Note: We can NOT use -z defs as we might desire, because we do not |
18397 |
+ # link with -lc, and that would cause any symbols used from libc to |
18398 |
+ # always be unresolved, which means just about no library would |
18399 |
+ # ever link correctly. If we're not using GNU ld we use -z text |
18400 |
+ # though, which does catch some bad symbols but isn't as heavy-handed |
18401 |
+ # as -z defs. |
18402 |
+ no_undefined_flag_GCJ='${wl}-z,text' |
18403 |
+ allow_undefined_flag_GCJ='${wl}-z,nodefs' |
18404 |
+ archive_cmds_need_lc_GCJ=no |
18405 |
hardcode_shlibpath_var_GCJ=no |
18406 |
+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' |
18407 |
+ hardcode_libdir_separator_GCJ=':' |
18408 |
+ link_all_deplibs_GCJ=yes |
18409 |
+ export_dynamic_flag_spec_GCJ='${wl}-Bexport' |
18410 |
runpath_var='LD_RUN_PATH' |
18411 |
+ |
18412 |
+ if test "$GCC" = yes; then |
18413 |
+ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
18414 |
+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
18415 |
+ else |
18416 |
+ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
18417 |
+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' |
18418 |
+ fi |
18419 |
;; |
18420 |
|
18421 |
uts4*) |
18422 |
@@ -16229,11 +16478,6 @@ |
18423 |
echo "${ECHO_T}$ld_shlibs_GCJ" >&6 |
18424 |
test "$ld_shlibs_GCJ" = no && can_build_shared=no |
18425 |
|
18426 |
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
18427 |
-if test "$GCC" = yes; then |
18428 |
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
18429 |
-fi |
18430 |
- |
18431 |
# |
18432 |
# Do we need to explicitly link libc? |
18433 |
# |
18434 |
@@ -16266,6 +16510,7 @@ |
18435 |
libobjs=conftest.$ac_objext |
18436 |
deplibs= |
18437 |
wl=$lt_prog_compiler_wl_GCJ |
18438 |
+ pic_flag=$lt_prog_compiler_pic_GCJ |
18439 |
compiler_flags=-v |
18440 |
linker_flags=-v |
18441 |
verstring= |
18442 |
@@ -16380,1341 +16625,566 @@ |
18443 |
# We preserve .a as extension for shared libraries through AIX4.2 |
18444 |
# and later when we are not doing run time linking. |
18445 |
library_names_spec='${libname}${release}.a $libname.a' |
18446 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18447 |
- fi |
18448 |
- shlibpath_var=LIBPATH |
18449 |
- fi |
18450 |
- ;; |
18451 |
- |
18452 |
-amigaos*) |
18453 |
- library_names_spec='$libname.ixlibrary $libname.a' |
18454 |
- # Create ${libname}_ixlibrary.a entries in /sys/libs. |
18455 |
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
18456 |
- ;; |
18457 |
- |
18458 |
-beos*) |
18459 |
- library_names_spec='${libname}${shared_ext}' |
18460 |
- dynamic_linker="$host_os ld.so" |
18461 |
- shlibpath_var=LIBRARY_PATH |
18462 |
- ;; |
18463 |
- |
18464 |
-bsdi4*) |
18465 |
- version_type=linux |
18466 |
- need_version=no |
18467 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
18468 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18469 |
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' |
18470 |
- shlibpath_var=LD_LIBRARY_PATH |
18471 |
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" |
18472 |
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" |
18473 |
- # the default ld.so.conf also contains /usr/contrib/lib and |
18474 |
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow |
18475 |
- # libtool to hard-code these into programs |
18476 |
- ;; |
18477 |
- |
18478 |
-cygwin* | mingw* | pw32*) |
18479 |
- version_type=windows |
18480 |
- shrext_cmds=".dll" |
18481 |
- need_version=no |
18482 |
- need_lib_prefix=no |
18483 |
- |
18484 |
- case $GCC,$host_os in |
18485 |
- yes,cygwin* | yes,mingw* | yes,pw32*) |
18486 |
- library_names_spec='$libname.dll.a' |
18487 |
- # DLL is installed to $(libdir)/../bin by postinstall_cmds |
18488 |
- postinstall_cmds='base_file=`basename \${file}`~ |
18489 |
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ |
18490 |
- dldir=$destdir/`dirname \$dlpath`~ |
18491 |
- test -d \$dldir || mkdir -p \$dldir~ |
18492 |
- $install_prog $dir/$dlname \$dldir/$dlname' |
18493 |
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
18494 |
- dlpath=$dir/\$dldll~ |
18495 |
- $rm \$dlpath' |
18496 |
- shlibpath_overrides_runpath=yes |
18497 |
- |
18498 |
- case $host_os in |
18499 |
- cygwin*) |
18500 |
- # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
18501 |
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
18502 |
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" |
18503 |
- ;; |
18504 |
- mingw*) |
18505 |
- # MinGW DLLs use traditional 'lib' prefix |
18506 |
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
18507 |
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
18508 |
- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then |
18509 |
- # It is most probably a Windows format PATH printed by |
18510 |
- # mingw gcc, but we are running on Cygwin. Gcc prints its search |
18511 |
- # path with ; separators, and with drive letters. We can handle the |
18512 |
- # drive letters (cygwin fileutils understands them), so leave them, |
18513 |
- # especially as we might pass files found there to a mingw objdump, |
18514 |
- # which wouldn't understand a cygwinified path. Ahh. |
18515 |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
18516 |
- else |
18517 |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
18518 |
- fi |
18519 |
- ;; |
18520 |
- pw32*) |
18521 |
- # pw32 DLLs use 'pw' prefix rather than 'lib' |
18522 |
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' |
18523 |
- ;; |
18524 |
- esac |
18525 |
- ;; |
18526 |
- |
18527 |
- *) |
18528 |
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
18529 |
- ;; |
18530 |
- esac |
18531 |
- dynamic_linker='Win32 ld.exe' |
18532 |
- # FIXME: first we should search . and the directory the executable is in |
18533 |
- shlibpath_var=PATH |
18534 |
- ;; |
18535 |
- |
18536 |
-darwin* | rhapsody*) |
18537 |
- dynamic_linker="$host_os dyld" |
18538 |
- version_type=darwin |
18539 |
- need_lib_prefix=no |
18540 |
- need_version=no |
18541 |
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
18542 |
- soname_spec='${libname}${release}${major}$shared_ext' |
18543 |
- shlibpath_overrides_runpath=yes |
18544 |
- shlibpath_var=DYLD_LIBRARY_PATH |
18545 |
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' |
18546 |
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
18547 |
- if test "$GCC" = yes; then |
18548 |
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` |
18549 |
- else |
18550 |
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' |
18551 |
- fi |
18552 |
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
18553 |
- ;; |
18554 |
- |
18555 |
-dgux*) |
18556 |
- version_type=linux |
18557 |
- need_lib_prefix=no |
18558 |
- need_version=no |
18559 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
18560 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18561 |
- shlibpath_var=LD_LIBRARY_PATH |
18562 |
- ;; |
18563 |
- |
18564 |
-freebsd1*) |
18565 |
- dynamic_linker=no |
18566 |
- ;; |
18567 |
- |
18568 |
-kfreebsd*-gnu) |
18569 |
- version_type=linux |
18570 |
- need_lib_prefix=no |
18571 |
- need_version=no |
18572 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
18573 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18574 |
- shlibpath_var=LD_LIBRARY_PATH |
18575 |
- shlibpath_overrides_runpath=no |
18576 |
- hardcode_into_libs=yes |
18577 |
- dynamic_linker='GNU ld.so' |
18578 |
- ;; |
18579 |
- |
18580 |
-freebsd*) |
18581 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
18582 |
- version_type=freebsd-$objformat |
18583 |
- case $version_type in |
18584 |
- freebsd-elf*) |
18585 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
18586 |
- need_version=no |
18587 |
- need_lib_prefix=no |
18588 |
- ;; |
18589 |
- freebsd-*) |
18590 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
18591 |
- need_version=yes |
18592 |
- ;; |
18593 |
- esac |
18594 |
- shlibpath_var=LD_LIBRARY_PATH |
18595 |
- case $host_os in |
18596 |
- freebsd2*) |
18597 |
- shlibpath_overrides_runpath=yes |
18598 |
- ;; |
18599 |
- freebsd3.01* | freebsdelf3.01*) |
18600 |
- shlibpath_overrides_runpath=yes |
18601 |
- hardcode_into_libs=yes |
18602 |
- ;; |
18603 |
- *) # from 3.2 on |
18604 |
- shlibpath_overrides_runpath=no |
18605 |
- hardcode_into_libs=yes |
18606 |
- ;; |
18607 |
- esac |
18608 |
- ;; |
18609 |
- |
18610 |
-gnu*) |
18611 |
- version_type=linux |
18612 |
- need_lib_prefix=no |
18613 |
- need_version=no |
18614 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
18615 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18616 |
- shlibpath_var=LD_LIBRARY_PATH |
18617 |
- hardcode_into_libs=yes |
18618 |
- ;; |
18619 |
- |
18620 |
-hpux9* | hpux10* | hpux11*) |
18621 |
- # Give a soname corresponding to the major version so that dld.sl refuses to |
18622 |
- # link against other versions. |
18623 |
- version_type=sunos |
18624 |
- need_lib_prefix=no |
18625 |
- need_version=no |
18626 |
- case "$host_cpu" in |
18627 |
- ia64*) |
18628 |
- shrext_cmds='.so' |
18629 |
- hardcode_into_libs=yes |
18630 |
- dynamic_linker="$host_os dld.so" |
18631 |
- shlibpath_var=LD_LIBRARY_PATH |
18632 |
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. |
18633 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
18634 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18635 |
- if test "X$HPUX_IA64_MODE" = X32; then |
18636 |
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" |
18637 |
- else |
18638 |
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" |
18639 |
- fi |
18640 |
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
18641 |
- ;; |
18642 |
- hppa*64*) |
18643 |
- shrext_cmds='.sl' |
18644 |
- hardcode_into_libs=yes |
18645 |
- dynamic_linker="$host_os dld.sl" |
18646 |
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH |
18647 |
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. |
18648 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
18649 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18650 |
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" |
18651 |
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
18652 |
- ;; |
18653 |
- *) |
18654 |
- shrext_cmds='.sl' |
18655 |
- dynamic_linker="$host_os dld.sl" |
18656 |
- shlibpath_var=SHLIB_PATH |
18657 |
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH |
18658 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
18659 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18660 |
- ;; |
18661 |
- esac |
18662 |
- # HP-UX runs *really* slowly unless shared libraries are mode 555. |
18663 |
- postinstall_cmds='chmod 555 $lib' |
18664 |
- ;; |
18665 |
- |
18666 |
-irix5* | irix6* | nonstopux*) |
18667 |
- case $host_os in |
18668 |
- nonstopux*) version_type=nonstopux ;; |
18669 |
- *) |
18670 |
- if test "$lt_cv_prog_gnu_ld" = yes; then |
18671 |
- version_type=linux |
18672 |
- else |
18673 |
- version_type=irix |
18674 |
- fi ;; |
18675 |
- esac |
18676 |
- need_lib_prefix=no |
18677 |
- need_version=no |
18678 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18679 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' |
18680 |
- case $host_os in |
18681 |
- irix5* | nonstopux*) |
18682 |
- libsuff= shlibsuff= |
18683 |
- ;; |
18684 |
- *) |
18685 |
- case $LD in # libtool.m4 will add one of these switches to LD |
18686 |
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") |
18687 |
- libsuff= shlibsuff= libmagic=32-bit;; |
18688 |
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") |
18689 |
- libsuff=32 shlibsuff=N32 libmagic=N32;; |
18690 |
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") |
18691 |
- libsuff=64 shlibsuff=64 libmagic=64-bit;; |
18692 |
- *) libsuff= shlibsuff= libmagic=never-match;; |
18693 |
- esac |
18694 |
- ;; |
18695 |
- esac |
18696 |
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH |
18697 |
- shlibpath_overrides_runpath=no |
18698 |
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" |
18699 |
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" |
18700 |
- hardcode_into_libs=yes |
18701 |
- ;; |
18702 |
- |
18703 |
-# No shared lib support for Linux oldld, aout, or coff. |
18704 |
-linux*oldld* | linux*aout* | linux*coff*) |
18705 |
- dynamic_linker=no |
18706 |
- ;; |
18707 |
- |
18708 |
-# This must be Linux ELF. |
18709 |
-linux*) |
18710 |
- version_type=linux |
18711 |
- need_lib_prefix=no |
18712 |
- need_version=no |
18713 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
18714 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18715 |
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
18716 |
- shlibpath_var=LD_LIBRARY_PATH |
18717 |
- shlibpath_overrides_runpath=no |
18718 |
- # This implies no fast_install, which is unacceptable. |
18719 |
- # Some rework will be needed to allow for fast_install |
18720 |
- # before this can be enabled. |
18721 |
- hardcode_into_libs=yes |
18722 |
- |
18723 |
- # Append ld.so.conf contents to the search path |
18724 |
- if test -f /etc/ld.so.conf; then |
18725 |
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` |
18726 |
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
18727 |
- fi |
18728 |
- |
18729 |
- # We used to test for /lib/ld.so.1 and disable shared libraries on |
18730 |
- # powerpc, because MkLinux only supported shared libraries with the |
18731 |
- # GNU dynamic linker. Since this was broken with cross compilers, |
18732 |
- # most powerpc-linux boxes support dynamic linking these days and |
18733 |
- # people can always --disable-shared, the test was removed, and we |
18734 |
- # assume the GNU/Linux dynamic linker is in use. |
18735 |
- dynamic_linker='GNU/Linux ld.so' |
18736 |
- ;; |
18737 |
- |
18738 |
-netbsdelf*-gnu) |
18739 |
- version_type=linux |
18740 |
- need_lib_prefix=no |
18741 |
- need_version=no |
18742 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
18743 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18744 |
- shlibpath_var=LD_LIBRARY_PATH |
18745 |
- shlibpath_overrides_runpath=no |
18746 |
- hardcode_into_libs=yes |
18747 |
- dynamic_linker='NetBSD ld.elf_so' |
18748 |
- ;; |
18749 |
- |
18750 |
-knetbsd*-gnu) |
18751 |
- version_type=linux |
18752 |
- need_lib_prefix=no |
18753 |
- need_version=no |
18754 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
18755 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18756 |
- shlibpath_var=LD_LIBRARY_PATH |
18757 |
- shlibpath_overrides_runpath=no |
18758 |
- hardcode_into_libs=yes |
18759 |
- dynamic_linker='GNU ld.so' |
18760 |
- ;; |
18761 |
- |
18762 |
-netbsd*) |
18763 |
- version_type=sunos |
18764 |
- need_lib_prefix=no |
18765 |
- need_version=no |
18766 |
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
18767 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
18768 |
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
18769 |
- dynamic_linker='NetBSD (a.out) ld.so' |
18770 |
- else |
18771 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
18772 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18773 |
- dynamic_linker='NetBSD ld.elf_so' |
18774 |
- fi |
18775 |
- shlibpath_var=LD_LIBRARY_PATH |
18776 |
- shlibpath_overrides_runpath=yes |
18777 |
- hardcode_into_libs=yes |
18778 |
- ;; |
18779 |
- |
18780 |
-newsos6) |
18781 |
- version_type=linux |
18782 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
18783 |
- shlibpath_var=LD_LIBRARY_PATH |
18784 |
- shlibpath_overrides_runpath=yes |
18785 |
- ;; |
18786 |
- |
18787 |
-nto-qnx*) |
18788 |
- version_type=linux |
18789 |
- need_lib_prefix=no |
18790 |
- need_version=no |
18791 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
18792 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18793 |
- shlibpath_var=LD_LIBRARY_PATH |
18794 |
- shlibpath_overrides_runpath=yes |
18795 |
- ;; |
18796 |
- |
18797 |
-openbsd*) |
18798 |
- version_type=sunos |
18799 |
- need_lib_prefix=no |
18800 |
- need_version=yes |
18801 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
18802 |
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
18803 |
- shlibpath_var=LD_LIBRARY_PATH |
18804 |
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
18805 |
- case $host_os in |
18806 |
- openbsd2.[89] | openbsd2.[89].*) |
18807 |
- shlibpath_overrides_runpath=no |
18808 |
- ;; |
18809 |
- *) |
18810 |
- shlibpath_overrides_runpath=yes |
18811 |
- ;; |
18812 |
- esac |
18813 |
- else |
18814 |
- shlibpath_overrides_runpath=yes |
18815 |
- fi |
18816 |
- ;; |
18817 |
- |
18818 |
-os2*) |
18819 |
- libname_spec='$name' |
18820 |
- shrext_cmds=".dll" |
18821 |
- need_lib_prefix=no |
18822 |
- library_names_spec='$libname${shared_ext} $libname.a' |
18823 |
- dynamic_linker='OS/2 ld.exe' |
18824 |
- shlibpath_var=LIBPATH |
18825 |
- ;; |
18826 |
- |
18827 |
-osf3* | osf4* | osf5*) |
18828 |
- version_type=osf |
18829 |
- need_lib_prefix=no |
18830 |
- need_version=no |
18831 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18832 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
18833 |
- shlibpath_var=LD_LIBRARY_PATH |
18834 |
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" |
18835 |
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" |
18836 |
- ;; |
18837 |
- |
18838 |
-sco3.2v5*) |
18839 |
- version_type=osf |
18840 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18841 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
18842 |
- shlibpath_var=LD_LIBRARY_PATH |
18843 |
- ;; |
18844 |
- |
18845 |
-solaris*) |
18846 |
- version_type=linux |
18847 |
- need_lib_prefix=no |
18848 |
- need_version=no |
18849 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
18850 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18851 |
- shlibpath_var=LD_LIBRARY_PATH |
18852 |
- shlibpath_overrides_runpath=yes |
18853 |
- hardcode_into_libs=yes |
18854 |
- # ldd complains unless libraries are executable |
18855 |
- postinstall_cmds='chmod +x $lib' |
18856 |
- ;; |
18857 |
- |
18858 |
-sunos4*) |
18859 |
- version_type=sunos |
18860 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
18861 |
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' |
18862 |
- shlibpath_var=LD_LIBRARY_PATH |
18863 |
- shlibpath_overrides_runpath=yes |
18864 |
- if test "$with_gnu_ld" = yes; then |
18865 |
- need_lib_prefix=no |
18866 |
- fi |
18867 |
- need_version=yes |
18868 |
- ;; |
18869 |
- |
18870 |
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
18871 |
- version_type=linux |
18872 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
18873 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18874 |
- shlibpath_var=LD_LIBRARY_PATH |
18875 |
- case $host_vendor in |
18876 |
- sni) |
18877 |
- shlibpath_overrides_runpath=no |
18878 |
- need_lib_prefix=no |
18879 |
- export_dynamic_flag_spec='${wl}-Blargedynsym' |
18880 |
- runpath_var=LD_RUN_PATH |
18881 |
- ;; |
18882 |
- siemens) |
18883 |
- need_lib_prefix=no |
18884 |
- ;; |
18885 |
- motorola) |
18886 |
- need_lib_prefix=no |
18887 |
- need_version=no |
18888 |
- shlibpath_overrides_runpath=no |
18889 |
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' |
18890 |
- ;; |
18891 |
- esac |
18892 |
- ;; |
18893 |
- |
18894 |
-sysv4*MP*) |
18895 |
- if test -d /usr/nec ;then |
18896 |
- version_type=linux |
18897 |
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
18898 |
- soname_spec='$libname${shared_ext}.$major' |
18899 |
- shlibpath_var=LD_LIBRARY_PATH |
18900 |
- fi |
18901 |
- ;; |
18902 |
- |
18903 |
-uts4*) |
18904 |
- version_type=linux |
18905 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
18906 |
- soname_spec='${libname}${release}${shared_ext}$major' |
18907 |
- shlibpath_var=LD_LIBRARY_PATH |
18908 |
- ;; |
18909 |
- |
18910 |
-*) |
18911 |
- dynamic_linker=no |
18912 |
- ;; |
18913 |
-esac |
18914 |
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
18915 |
-echo "${ECHO_T}$dynamic_linker" >&6 |
18916 |
-test "$dynamic_linker" = no && can_build_shared=no |
18917 |
- |
18918 |
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
18919 |
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 |
18920 |
-hardcode_action_GCJ= |
18921 |
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \ |
18922 |
- test -n "$runpath_var GCJ" || \ |
18923 |
- test "X$hardcode_automatic_GCJ"="Xyes" ; then |
18924 |
- |
18925 |
- # We can hardcode non-existant directories. |
18926 |
- if test "$hardcode_direct_GCJ" != no && |
18927 |
- # If the only mechanism to avoid hardcoding is shlibpath_var, we |
18928 |
- # have to relink, otherwise we might link with an installed library |
18929 |
- # when we should be linking with a yet-to-be-installed one |
18930 |
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && |
18931 |
- test "$hardcode_minus_L_GCJ" != no; then |
18932 |
- # Linking always hardcodes the temporary library directory. |
18933 |
- hardcode_action_GCJ=relink |
18934 |
- else |
18935 |
- # We can link without hardcoding, and we can hardcode nonexisting dirs. |
18936 |
- hardcode_action_GCJ=immediate |
18937 |
- fi |
18938 |
-else |
18939 |
- # We cannot hardcode anything, or else we can only hardcode existing |
18940 |
- # directories. |
18941 |
- hardcode_action_GCJ=unsupported |
18942 |
-fi |
18943 |
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 |
18944 |
-echo "${ECHO_T}$hardcode_action_GCJ" >&6 |
18945 |
- |
18946 |
-if test "$hardcode_action_GCJ" = relink; then |
18947 |
- # Fast installation is not supported |
18948 |
- enable_fast_install=no |
18949 |
-elif test "$shlibpath_overrides_runpath" = yes || |
18950 |
- test "$enable_shared" = no; then |
18951 |
- # Fast installation is not necessary |
18952 |
- enable_fast_install=needless |
18953 |
-fi |
18954 |
- |
18955 |
-striplib= |
18956 |
-old_striplib= |
18957 |
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 |
18958 |
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 |
18959 |
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then |
18960 |
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" |
18961 |
- test -z "$striplib" && striplib="$STRIP --strip-unneeded" |
18962 |
- echo "$as_me:$LINENO: result: yes" >&5 |
18963 |
-echo "${ECHO_T}yes" >&6 |
18964 |
-else |
18965 |
-# FIXME - insert some real tests, host_os isn't really good enough |
18966 |
- case $host_os in |
18967 |
- darwin*) |
18968 |
- if test -n "$STRIP" ; then |
18969 |
- striplib="$STRIP -x" |
18970 |
- echo "$as_me:$LINENO: result: yes" >&5 |
18971 |
-echo "${ECHO_T}yes" >&6 |
18972 |
- else |
18973 |
- echo "$as_me:$LINENO: result: no" >&5 |
18974 |
-echo "${ECHO_T}no" >&6 |
18975 |
-fi |
18976 |
- ;; |
18977 |
- *) |
18978 |
- echo "$as_me:$LINENO: result: no" >&5 |
18979 |
-echo "${ECHO_T}no" >&6 |
18980 |
- ;; |
18981 |
- esac |
18982 |
-fi |
18983 |
- |
18984 |
-if test "x$enable_dlopen" != xyes; then |
18985 |
- enable_dlopen=unknown |
18986 |
- enable_dlopen_self=unknown |
18987 |
- enable_dlopen_self_static=unknown |
18988 |
-else |
18989 |
- lt_cv_dlopen=no |
18990 |
- lt_cv_dlopen_libs= |
18991 |
- |
18992 |
- case $host_os in |
18993 |
- beos*) |
18994 |
- lt_cv_dlopen="load_add_on" |
18995 |
- lt_cv_dlopen_libs= |
18996 |
- lt_cv_dlopen_self=yes |
18997 |
- ;; |
18998 |
- |
18999 |
- mingw* | pw32*) |
19000 |
- lt_cv_dlopen="LoadLibrary" |
19001 |
- lt_cv_dlopen_libs= |
19002 |
- ;; |
19003 |
- |
19004 |
- cygwin*) |
19005 |
- lt_cv_dlopen="dlopen" |
19006 |
- lt_cv_dlopen_libs= |
19007 |
- ;; |
19008 |
- |
19009 |
- darwin*) |
19010 |
- # if libdl is installed we need to link against it |
19011 |
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 |
19012 |
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 |
19013 |
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then |
19014 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
19015 |
-else |
19016 |
- ac_check_lib_save_LIBS=$LIBS |
19017 |
-LIBS="-ldl $LIBS" |
19018 |
-cat >conftest.$ac_ext <<_ACEOF |
19019 |
-/* confdefs.h. */ |
19020 |
-_ACEOF |
19021 |
-cat confdefs.h >>conftest.$ac_ext |
19022 |
-cat >>conftest.$ac_ext <<_ACEOF |
19023 |
-/* end confdefs.h. */ |
19024 |
- |
19025 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
19026 |
-#ifdef __cplusplus |
19027 |
-extern "C" |
19028 |
-#endif |
19029 |
-/* We use char because int might match the return type of a gcc2 |
19030 |
- builtin and then its argument prototype would still apply. */ |
19031 |
-char dlopen (); |
19032 |
-int |
19033 |
-main () |
19034 |
-{ |
19035 |
-dlopen (); |
19036 |
- ; |
19037 |
- return 0; |
19038 |
-} |
19039 |
-_ACEOF |
19040 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
19041 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
19042 |
- (eval $ac_link) 2>conftest.er1 |
19043 |
- ac_status=$? |
19044 |
- grep -v '^ *+' conftest.er1 >conftest.err |
19045 |
- rm -f conftest.er1 |
19046 |
- cat conftest.err >&5 |
19047 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19048 |
- (exit $ac_status); } && |
19049 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
19050 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19051 |
- (eval $ac_try) 2>&5 |
19052 |
- ac_status=$? |
19053 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19054 |
- (exit $ac_status); }; } && |
19055 |
- { ac_try='test -s conftest$ac_exeext' |
19056 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19057 |
- (eval $ac_try) 2>&5 |
19058 |
- ac_status=$? |
19059 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19060 |
- (exit $ac_status); }; }; then |
19061 |
- ac_cv_lib_dl_dlopen=yes |
19062 |
-else |
19063 |
- echo "$as_me: failed program was:" >&5 |
19064 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
19065 |
- |
19066 |
-ac_cv_lib_dl_dlopen=no |
19067 |
-fi |
19068 |
-rm -f conftest.err conftest.$ac_objext \ |
19069 |
- conftest$ac_exeext conftest.$ac_ext |
19070 |
-LIBS=$ac_check_lib_save_LIBS |
19071 |
-fi |
19072 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 |
19073 |
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 |
19074 |
-if test $ac_cv_lib_dl_dlopen = yes; then |
19075 |
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
19076 |
-else |
19077 |
- |
19078 |
- lt_cv_dlopen="dyld" |
19079 |
- lt_cv_dlopen_libs= |
19080 |
- lt_cv_dlopen_self=yes |
19081 |
- |
19082 |
-fi |
19083 |
- |
19084 |
- ;; |
19085 |
- |
19086 |
- *) |
19087 |
- echo "$as_me:$LINENO: checking for shl_load" >&5 |
19088 |
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 |
19089 |
-if test "${ac_cv_func_shl_load+set}" = set; then |
19090 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
19091 |
-else |
19092 |
- cat >conftest.$ac_ext <<_ACEOF |
19093 |
-/* confdefs.h. */ |
19094 |
-_ACEOF |
19095 |
-cat confdefs.h >>conftest.$ac_ext |
19096 |
-cat >>conftest.$ac_ext <<_ACEOF |
19097 |
-/* end confdefs.h. */ |
19098 |
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. |
19099 |
- For example, HP-UX 11i <limits.h> declares gettimeofday. */ |
19100 |
-#define shl_load innocuous_shl_load |
19101 |
- |
19102 |
-/* System header to define __stub macros and hopefully few prototypes, |
19103 |
- which can conflict with char shl_load (); below. |
19104 |
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
19105 |
- <limits.h> exists even on freestanding compilers. */ |
19106 |
- |
19107 |
-#ifdef __STDC__ |
19108 |
-# include <limits.h> |
19109 |
-#else |
19110 |
-# include <assert.h> |
19111 |
-#endif |
19112 |
- |
19113 |
-#undef shl_load |
19114 |
- |
19115 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
19116 |
-#ifdef __cplusplus |
19117 |
-extern "C" |
19118 |
-{ |
19119 |
-#endif |
19120 |
-/* We use char because int might match the return type of a gcc2 |
19121 |
- builtin and then its argument prototype would still apply. */ |
19122 |
-char shl_load (); |
19123 |
-/* The GNU C library defines this for functions which it implements |
19124 |
- to always fail with ENOSYS. Some functions are actually named |
19125 |
- something starting with __ and the normal name is an alias. */ |
19126 |
-#if defined (__stub_shl_load) || defined (__stub___shl_load) |
19127 |
-choke me |
19128 |
-#else |
19129 |
-char (*f) () = shl_load; |
19130 |
-#endif |
19131 |
-#ifdef __cplusplus |
19132 |
-} |
19133 |
-#endif |
19134 |
- |
19135 |
-int |
19136 |
-main () |
19137 |
-{ |
19138 |
-return f != shl_load; |
19139 |
- ; |
19140 |
- return 0; |
19141 |
-} |
19142 |
-_ACEOF |
19143 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
19144 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
19145 |
- (eval $ac_link) 2>conftest.er1 |
19146 |
- ac_status=$? |
19147 |
- grep -v '^ *+' conftest.er1 >conftest.err |
19148 |
- rm -f conftest.er1 |
19149 |
- cat conftest.err >&5 |
19150 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19151 |
- (exit $ac_status); } && |
19152 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
19153 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19154 |
- (eval $ac_try) 2>&5 |
19155 |
- ac_status=$? |
19156 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19157 |
- (exit $ac_status); }; } && |
19158 |
- { ac_try='test -s conftest$ac_exeext' |
19159 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19160 |
- (eval $ac_try) 2>&5 |
19161 |
- ac_status=$? |
19162 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19163 |
- (exit $ac_status); }; }; then |
19164 |
- ac_cv_func_shl_load=yes |
19165 |
-else |
19166 |
- echo "$as_me: failed program was:" >&5 |
19167 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
19168 |
- |
19169 |
-ac_cv_func_shl_load=no |
19170 |
-fi |
19171 |
-rm -f conftest.err conftest.$ac_objext \ |
19172 |
- conftest$ac_exeext conftest.$ac_ext |
19173 |
-fi |
19174 |
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 |
19175 |
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6 |
19176 |
-if test $ac_cv_func_shl_load = yes; then |
19177 |
- lt_cv_dlopen="shl_load" |
19178 |
-else |
19179 |
- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 |
19180 |
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 |
19181 |
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then |
19182 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
19183 |
-else |
19184 |
- ac_check_lib_save_LIBS=$LIBS |
19185 |
-LIBS="-ldld $LIBS" |
19186 |
-cat >conftest.$ac_ext <<_ACEOF |
19187 |
-/* confdefs.h. */ |
19188 |
-_ACEOF |
19189 |
-cat confdefs.h >>conftest.$ac_ext |
19190 |
-cat >>conftest.$ac_ext <<_ACEOF |
19191 |
-/* end confdefs.h. */ |
19192 |
- |
19193 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
19194 |
-#ifdef __cplusplus |
19195 |
-extern "C" |
19196 |
-#endif |
19197 |
-/* We use char because int might match the return type of a gcc2 |
19198 |
- builtin and then its argument prototype would still apply. */ |
19199 |
-char shl_load (); |
19200 |
-int |
19201 |
-main () |
19202 |
-{ |
19203 |
-shl_load (); |
19204 |
- ; |
19205 |
- return 0; |
19206 |
-} |
19207 |
-_ACEOF |
19208 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
19209 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
19210 |
- (eval $ac_link) 2>conftest.er1 |
19211 |
- ac_status=$? |
19212 |
- grep -v '^ *+' conftest.er1 >conftest.err |
19213 |
- rm -f conftest.er1 |
19214 |
- cat conftest.err >&5 |
19215 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19216 |
- (exit $ac_status); } && |
19217 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
19218 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19219 |
- (eval $ac_try) 2>&5 |
19220 |
- ac_status=$? |
19221 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19222 |
- (exit $ac_status); }; } && |
19223 |
- { ac_try='test -s conftest$ac_exeext' |
19224 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19225 |
- (eval $ac_try) 2>&5 |
19226 |
- ac_status=$? |
19227 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19228 |
- (exit $ac_status); }; }; then |
19229 |
- ac_cv_lib_dld_shl_load=yes |
19230 |
-else |
19231 |
- echo "$as_me: failed program was:" >&5 |
19232 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
19233 |
- |
19234 |
-ac_cv_lib_dld_shl_load=no |
19235 |
-fi |
19236 |
-rm -f conftest.err conftest.$ac_objext \ |
19237 |
- conftest$ac_exeext conftest.$ac_ext |
19238 |
-LIBS=$ac_check_lib_save_LIBS |
19239 |
-fi |
19240 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 |
19241 |
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 |
19242 |
-if test $ac_cv_lib_dld_shl_load = yes; then |
19243 |
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" |
19244 |
-else |
19245 |
- echo "$as_me:$LINENO: checking for dlopen" >&5 |
19246 |
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 |
19247 |
-if test "${ac_cv_func_dlopen+set}" = set; then |
19248 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
19249 |
-else |
19250 |
- cat >conftest.$ac_ext <<_ACEOF |
19251 |
-/* confdefs.h. */ |
19252 |
-_ACEOF |
19253 |
-cat confdefs.h >>conftest.$ac_ext |
19254 |
-cat >>conftest.$ac_ext <<_ACEOF |
19255 |
-/* end confdefs.h. */ |
19256 |
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. |
19257 |
- For example, HP-UX 11i <limits.h> declares gettimeofday. */ |
19258 |
-#define dlopen innocuous_dlopen |
19259 |
- |
19260 |
-/* System header to define __stub macros and hopefully few prototypes, |
19261 |
- which can conflict with char dlopen (); below. |
19262 |
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
19263 |
- <limits.h> exists even on freestanding compilers. */ |
19264 |
- |
19265 |
-#ifdef __STDC__ |
19266 |
-# include <limits.h> |
19267 |
-#else |
19268 |
-# include <assert.h> |
19269 |
-#endif |
19270 |
- |
19271 |
-#undef dlopen |
19272 |
- |
19273 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
19274 |
-#ifdef __cplusplus |
19275 |
-extern "C" |
19276 |
-{ |
19277 |
-#endif |
19278 |
-/* We use char because int might match the return type of a gcc2 |
19279 |
- builtin and then its argument prototype would still apply. */ |
19280 |
-char dlopen (); |
19281 |
-/* The GNU C library defines this for functions which it implements |
19282 |
- to always fail with ENOSYS. Some functions are actually named |
19283 |
- something starting with __ and the normal name is an alias. */ |
19284 |
-#if defined (__stub_dlopen) || defined (__stub___dlopen) |
19285 |
-choke me |
19286 |
-#else |
19287 |
-char (*f) () = dlopen; |
19288 |
-#endif |
19289 |
-#ifdef __cplusplus |
19290 |
-} |
19291 |
-#endif |
19292 |
- |
19293 |
-int |
19294 |
-main () |
19295 |
-{ |
19296 |
-return f != dlopen; |
19297 |
- ; |
19298 |
- return 0; |
19299 |
-} |
19300 |
-_ACEOF |
19301 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
19302 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
19303 |
- (eval $ac_link) 2>conftest.er1 |
19304 |
- ac_status=$? |
19305 |
- grep -v '^ *+' conftest.er1 >conftest.err |
19306 |
- rm -f conftest.er1 |
19307 |
- cat conftest.err >&5 |
19308 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19309 |
- (exit $ac_status); } && |
19310 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
19311 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19312 |
- (eval $ac_try) 2>&5 |
19313 |
- ac_status=$? |
19314 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19315 |
- (exit $ac_status); }; } && |
19316 |
- { ac_try='test -s conftest$ac_exeext' |
19317 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19318 |
- (eval $ac_try) 2>&5 |
19319 |
- ac_status=$? |
19320 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19321 |
- (exit $ac_status); }; }; then |
19322 |
- ac_cv_func_dlopen=yes |
19323 |
-else |
19324 |
- echo "$as_me: failed program was:" >&5 |
19325 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
19326 |
- |
19327 |
-ac_cv_func_dlopen=no |
19328 |
-fi |
19329 |
-rm -f conftest.err conftest.$ac_objext \ |
19330 |
- conftest$ac_exeext conftest.$ac_ext |
19331 |
-fi |
19332 |
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 |
19333 |
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6 |
19334 |
-if test $ac_cv_func_dlopen = yes; then |
19335 |
- lt_cv_dlopen="dlopen" |
19336 |
-else |
19337 |
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 |
19338 |
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 |
19339 |
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then |
19340 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
19341 |
-else |
19342 |
- ac_check_lib_save_LIBS=$LIBS |
19343 |
-LIBS="-ldl $LIBS" |
19344 |
-cat >conftest.$ac_ext <<_ACEOF |
19345 |
-/* confdefs.h. */ |
19346 |
-_ACEOF |
19347 |
-cat confdefs.h >>conftest.$ac_ext |
19348 |
-cat >>conftest.$ac_ext <<_ACEOF |
19349 |
-/* end confdefs.h. */ |
19350 |
- |
19351 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
19352 |
-#ifdef __cplusplus |
19353 |
-extern "C" |
19354 |
-#endif |
19355 |
-/* We use char because int might match the return type of a gcc2 |
19356 |
- builtin and then its argument prototype would still apply. */ |
19357 |
-char dlopen (); |
19358 |
-int |
19359 |
-main () |
19360 |
-{ |
19361 |
-dlopen (); |
19362 |
- ; |
19363 |
- return 0; |
19364 |
-} |
19365 |
-_ACEOF |
19366 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
19367 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
19368 |
- (eval $ac_link) 2>conftest.er1 |
19369 |
- ac_status=$? |
19370 |
- grep -v '^ *+' conftest.er1 >conftest.err |
19371 |
- rm -f conftest.er1 |
19372 |
- cat conftest.err >&5 |
19373 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19374 |
- (exit $ac_status); } && |
19375 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
19376 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19377 |
- (eval $ac_try) 2>&5 |
19378 |
- ac_status=$? |
19379 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19380 |
- (exit $ac_status); }; } && |
19381 |
- { ac_try='test -s conftest$ac_exeext' |
19382 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19383 |
- (eval $ac_try) 2>&5 |
19384 |
- ac_status=$? |
19385 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19386 |
- (exit $ac_status); }; }; then |
19387 |
- ac_cv_lib_dl_dlopen=yes |
19388 |
-else |
19389 |
- echo "$as_me: failed program was:" >&5 |
19390 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
19391 |
- |
19392 |
-ac_cv_lib_dl_dlopen=no |
19393 |
-fi |
19394 |
-rm -f conftest.err conftest.$ac_objext \ |
19395 |
- conftest$ac_exeext conftest.$ac_ext |
19396 |
-LIBS=$ac_check_lib_save_LIBS |
19397 |
-fi |
19398 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 |
19399 |
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 |
19400 |
-if test $ac_cv_lib_dl_dlopen = yes; then |
19401 |
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
19402 |
-else |
19403 |
- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 |
19404 |
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 |
19405 |
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then |
19406 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
19407 |
-else |
19408 |
- ac_check_lib_save_LIBS=$LIBS |
19409 |
-LIBS="-lsvld $LIBS" |
19410 |
-cat >conftest.$ac_ext <<_ACEOF |
19411 |
-/* confdefs.h. */ |
19412 |
-_ACEOF |
19413 |
-cat confdefs.h >>conftest.$ac_ext |
19414 |
-cat >>conftest.$ac_ext <<_ACEOF |
19415 |
-/* end confdefs.h. */ |
19416 |
- |
19417 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
19418 |
-#ifdef __cplusplus |
19419 |
-extern "C" |
19420 |
-#endif |
19421 |
-/* We use char because int might match the return type of a gcc2 |
19422 |
- builtin and then its argument prototype would still apply. */ |
19423 |
-char dlopen (); |
19424 |
-int |
19425 |
-main () |
19426 |
-{ |
19427 |
-dlopen (); |
19428 |
- ; |
19429 |
- return 0; |
19430 |
-} |
19431 |
-_ACEOF |
19432 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
19433 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
19434 |
- (eval $ac_link) 2>conftest.er1 |
19435 |
- ac_status=$? |
19436 |
- grep -v '^ *+' conftest.er1 >conftest.err |
19437 |
- rm -f conftest.er1 |
19438 |
- cat conftest.err >&5 |
19439 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19440 |
- (exit $ac_status); } && |
19441 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
19442 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19443 |
- (eval $ac_try) 2>&5 |
19444 |
- ac_status=$? |
19445 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19446 |
- (exit $ac_status); }; } && |
19447 |
- { ac_try='test -s conftest$ac_exeext' |
19448 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19449 |
- (eval $ac_try) 2>&5 |
19450 |
- ac_status=$? |
19451 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19452 |
- (exit $ac_status); }; }; then |
19453 |
- ac_cv_lib_svld_dlopen=yes |
19454 |
-else |
19455 |
- echo "$as_me: failed program was:" >&5 |
19456 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
19457 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19458 |
+ fi |
19459 |
+ shlibpath_var=LIBPATH |
19460 |
+ fi |
19461 |
+ ;; |
19462 |
|
19463 |
-ac_cv_lib_svld_dlopen=no |
19464 |
-fi |
19465 |
-rm -f conftest.err conftest.$ac_objext \ |
19466 |
- conftest$ac_exeext conftest.$ac_ext |
19467 |
-LIBS=$ac_check_lib_save_LIBS |
19468 |
-fi |
19469 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 |
19470 |
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 |
19471 |
-if test $ac_cv_lib_svld_dlopen = yes; then |
19472 |
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" |
19473 |
-else |
19474 |
- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 |
19475 |
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 |
19476 |
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then |
19477 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
19478 |
-else |
19479 |
- ac_check_lib_save_LIBS=$LIBS |
19480 |
-LIBS="-ldld $LIBS" |
19481 |
-cat >conftest.$ac_ext <<_ACEOF |
19482 |
-/* confdefs.h. */ |
19483 |
-_ACEOF |
19484 |
-cat confdefs.h >>conftest.$ac_ext |
19485 |
-cat >>conftest.$ac_ext <<_ACEOF |
19486 |
-/* end confdefs.h. */ |
19487 |
+amigaos*) |
19488 |
+ library_names_spec='$libname.ixlibrary $libname.a' |
19489 |
+ # Create ${libname}_ixlibrary.a entries in /sys/libs. |
19490 |
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
19491 |
+ ;; |
19492 |
|
19493 |
-/* Override any gcc2 internal prototype to avoid an error. */ |
19494 |
-#ifdef __cplusplus |
19495 |
-extern "C" |
19496 |
-#endif |
19497 |
-/* We use char because int might match the return type of a gcc2 |
19498 |
- builtin and then its argument prototype would still apply. */ |
19499 |
-char dld_link (); |
19500 |
-int |
19501 |
-main () |
19502 |
-{ |
19503 |
-dld_link (); |
19504 |
- ; |
19505 |
- return 0; |
19506 |
-} |
19507 |
-_ACEOF |
19508 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
19509 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
19510 |
- (eval $ac_link) 2>conftest.er1 |
19511 |
- ac_status=$? |
19512 |
- grep -v '^ *+' conftest.er1 >conftest.err |
19513 |
- rm -f conftest.er1 |
19514 |
- cat conftest.err >&5 |
19515 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19516 |
- (exit $ac_status); } && |
19517 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
19518 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19519 |
- (eval $ac_try) 2>&5 |
19520 |
- ac_status=$? |
19521 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19522 |
- (exit $ac_status); }; } && |
19523 |
- { ac_try='test -s conftest$ac_exeext' |
19524 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
19525 |
- (eval $ac_try) 2>&5 |
19526 |
- ac_status=$? |
19527 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19528 |
- (exit $ac_status); }; }; then |
19529 |
- ac_cv_lib_dld_dld_link=yes |
19530 |
-else |
19531 |
- echo "$as_me: failed program was:" >&5 |
19532 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
19533 |
+beos*) |
19534 |
+ library_names_spec='${libname}${shared_ext}' |
19535 |
+ dynamic_linker="$host_os ld.so" |
19536 |
+ shlibpath_var=LIBRARY_PATH |
19537 |
+ ;; |
19538 |
|
19539 |
-ac_cv_lib_dld_dld_link=no |
19540 |
-fi |
19541 |
-rm -f conftest.err conftest.$ac_objext \ |
19542 |
- conftest$ac_exeext conftest.$ac_ext |
19543 |
-LIBS=$ac_check_lib_save_LIBS |
19544 |
-fi |
19545 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 |
19546 |
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 |
19547 |
-if test $ac_cv_lib_dld_dld_link = yes; then |
19548 |
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" |
19549 |
-fi |
19550 |
+bsdi[45]*) |
19551 |
+ version_type=linux |
19552 |
+ need_version=no |
19553 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
19554 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19555 |
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' |
19556 |
+ shlibpath_var=LD_LIBRARY_PATH |
19557 |
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" |
19558 |
+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" |
19559 |
+ # the default ld.so.conf also contains /usr/contrib/lib and |
19560 |
+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow |
19561 |
+ # libtool to hard-code these into programs |
19562 |
+ ;; |
19563 |
|
19564 |
+cygwin* | mingw* | pw32*) |
19565 |
+ version_type=windows |
19566 |
+ shrext_cmds=".dll" |
19567 |
+ need_version=no |
19568 |
+ need_lib_prefix=no |
19569 |
|
19570 |
-fi |
19571 |
+ case $GCC,$host_os in |
19572 |
+ yes,cygwin* | yes,mingw* | yes,pw32*) |
19573 |
+ library_names_spec='$libname.dll.a' |
19574 |
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds |
19575 |
+ postinstall_cmds='base_file=`basename \${file}`~ |
19576 |
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ |
19577 |
+ dldir=$destdir/`dirname \$dlpath`~ |
19578 |
+ test -d \$dldir || mkdir -p \$dldir~ |
19579 |
+ $install_prog $dir/$dlname \$dldir/$dlname~ |
19580 |
+ chmod a+x \$dldir/$dlname' |
19581 |
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
19582 |
+ dlpath=$dir/\$dldll~ |
19583 |
+ $rm \$dlpath' |
19584 |
+ shlibpath_overrides_runpath=yes |
19585 |
|
19586 |
+ case $host_os in |
19587 |
+ cygwin*) |
19588 |
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
19589 |
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
19590 |
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" |
19591 |
+ ;; |
19592 |
+ mingw*) |
19593 |
+ # MinGW DLLs use traditional 'lib' prefix |
19594 |
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
19595 |
+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
19596 |
+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then |
19597 |
+ # It is most probably a Windows format PATH printed by |
19598 |
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search |
19599 |
+ # path with ; separators, and with drive letters. We can handle the |
19600 |
+ # drive letters (cygwin fileutils understands them), so leave them, |
19601 |
+ # especially as we might pass files found there to a mingw objdump, |
19602 |
+ # which wouldn't understand a cygwinified path. Ahh. |
19603 |
+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
19604 |
+ else |
19605 |
+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
19606 |
+ fi |
19607 |
+ ;; |
19608 |
+ pw32*) |
19609 |
+ # pw32 DLLs use 'pw' prefix rather than 'lib' |
19610 |
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
19611 |
+ ;; |
19612 |
+ esac |
19613 |
+ ;; |
19614 |
|
19615 |
-fi |
19616 |
+ *) |
19617 |
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
19618 |
+ ;; |
19619 |
+ esac |
19620 |
+ dynamic_linker='Win32 ld.exe' |
19621 |
+ # FIXME: first we should search . and the directory the executable is in |
19622 |
+ shlibpath_var=PATH |
19623 |
+ ;; |
19624 |
|
19625 |
+darwin* | rhapsody*) |
19626 |
+ dynamic_linker="$host_os dyld" |
19627 |
+ version_type=darwin |
19628 |
+ need_lib_prefix=no |
19629 |
+ need_version=no |
19630 |
+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
19631 |
+ soname_spec='${libname}${release}${major}$shared_ext' |
19632 |
+ shlibpath_overrides_runpath=yes |
19633 |
+ shlibpath_var=DYLD_LIBRARY_PATH |
19634 |
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
19635 |
+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
19636 |
+ if test "$GCC" = yes; then |
19637 |
+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` |
19638 |
+ else |
19639 |
+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' |
19640 |
+ fi |
19641 |
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
19642 |
+ ;; |
19643 |
|
19644 |
-fi |
19645 |
+dgux*) |
19646 |
+ version_type=linux |
19647 |
+ need_lib_prefix=no |
19648 |
+ need_version=no |
19649 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
19650 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19651 |
+ shlibpath_var=LD_LIBRARY_PATH |
19652 |
+ ;; |
19653 |
|
19654 |
+freebsd1*) |
19655 |
+ dynamic_linker=no |
19656 |
+ ;; |
19657 |
|
19658 |
-fi |
19659 |
+kfreebsd*-gnu) |
19660 |
+ version_type=linux |
19661 |
+ need_lib_prefix=no |
19662 |
+ need_version=no |
19663 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
19664 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19665 |
+ shlibpath_var=LD_LIBRARY_PATH |
19666 |
+ shlibpath_overrides_runpath=no |
19667 |
+ hardcode_into_libs=yes |
19668 |
+ dynamic_linker='GNU ld.so' |
19669 |
+ ;; |
19670 |
|
19671 |
+freebsd* | dragonfly*) |
19672 |
+ # DragonFly does not have aout. When/if they implement a new |
19673 |
+ # versioning mechanism, adjust this. |
19674 |
+ if test -x /usr/bin/objformat; then |
19675 |
+ objformat=`/usr/bin/objformat` |
19676 |
+ else |
19677 |
+ case $host_os in |
19678 |
+ freebsd[123]*) objformat=aout ;; |
19679 |
+ *) objformat=elf ;; |
19680 |
+ esac |
19681 |
+ fi |
19682 |
+ version_type=freebsd-$objformat |
19683 |
+ case $version_type in |
19684 |
+ freebsd-elf*) |
19685 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
19686 |
+ need_version=no |
19687 |
+ need_lib_prefix=no |
19688 |
+ ;; |
19689 |
+ freebsd-*) |
19690 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
19691 |
+ need_version=yes |
19692 |
+ ;; |
19693 |
+ esac |
19694 |
+ shlibpath_var=LD_LIBRARY_PATH |
19695 |
+ case $host_os in |
19696 |
+ freebsd2*) |
19697 |
+ shlibpath_overrides_runpath=yes |
19698 |
+ ;; |
19699 |
+ freebsd3.[01]* | freebsdelf3.[01]*) |
19700 |
+ shlibpath_overrides_runpath=yes |
19701 |
+ hardcode_into_libs=yes |
19702 |
+ ;; |
19703 |
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ |
19704 |
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) |
19705 |
+ shlibpath_overrides_runpath=no |
19706 |
+ hardcode_into_libs=yes |
19707 |
+ ;; |
19708 |
+ freebsd*) # from 4.6 on |
19709 |
+ shlibpath_overrides_runpath=yes |
19710 |
+ hardcode_into_libs=yes |
19711 |
+ ;; |
19712 |
+ esac |
19713 |
+ ;; |
19714 |
|
19715 |
-fi |
19716 |
+gnu*) |
19717 |
+ version_type=linux |
19718 |
+ need_lib_prefix=no |
19719 |
+ need_version=no |
19720 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
19721 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19722 |
+ shlibpath_var=LD_LIBRARY_PATH |
19723 |
+ hardcode_into_libs=yes |
19724 |
+ ;; |
19725 |
|
19726 |
+hpux9* | hpux10* | hpux11*) |
19727 |
+ # Give a soname corresponding to the major version so that dld.sl refuses to |
19728 |
+ # link against other versions. |
19729 |
+ version_type=sunos |
19730 |
+ need_lib_prefix=no |
19731 |
+ need_version=no |
19732 |
+ case $host_cpu in |
19733 |
+ ia64*) |
19734 |
+ shrext_cmds='.so' |
19735 |
+ hardcode_into_libs=yes |
19736 |
+ dynamic_linker="$host_os dld.so" |
19737 |
+ shlibpath_var=LD_LIBRARY_PATH |
19738 |
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. |
19739 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
19740 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19741 |
+ if test "X$HPUX_IA64_MODE" = X32; then |
19742 |
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" |
19743 |
+ else |
19744 |
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" |
19745 |
+ fi |
19746 |
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
19747 |
+ ;; |
19748 |
+ hppa*64*) |
19749 |
+ shrext_cmds='.sl' |
19750 |
+ hardcode_into_libs=yes |
19751 |
+ dynamic_linker="$host_os dld.sl" |
19752 |
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH |
19753 |
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. |
19754 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
19755 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19756 |
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" |
19757 |
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
19758 |
+ ;; |
19759 |
+ *) |
19760 |
+ shrext_cmds='.sl' |
19761 |
+ dynamic_linker="$host_os dld.sl" |
19762 |
+ shlibpath_var=SHLIB_PATH |
19763 |
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH |
19764 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
19765 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19766 |
;; |
19767 |
esac |
19768 |
+ # HP-UX runs *really* slowly unless shared libraries are mode 555. |
19769 |
+ postinstall_cmds='chmod 555 $lib' |
19770 |
+ ;; |
19771 |
|
19772 |
- if test "x$lt_cv_dlopen" != xno; then |
19773 |
- enable_dlopen=yes |
19774 |
- else |
19775 |
- enable_dlopen=no |
19776 |
- fi |
19777 |
- |
19778 |
- case $lt_cv_dlopen in |
19779 |
- dlopen) |
19780 |
- save_CPPFLAGS="$CPPFLAGS" |
19781 |
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" |
19782 |
- |
19783 |
- save_LDFLAGS="$LDFLAGS" |
19784 |
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" |
19785 |
- |
19786 |
- save_LIBS="$LIBS" |
19787 |
- LIBS="$lt_cv_dlopen_libs $LIBS" |
19788 |
- |
19789 |
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 |
19790 |
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 |
19791 |
-if test "${lt_cv_dlopen_self+set}" = set; then |
19792 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
19793 |
-else |
19794 |
- if test "$cross_compiling" = yes; then : |
19795 |
- lt_cv_dlopen_self=cross |
19796 |
-else |
19797 |
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
19798 |
- lt_status=$lt_dlunknown |
19799 |
- cat > conftest.$ac_ext <<EOF |
19800 |
-#line 17519 "configure" |
19801 |
-#include "confdefs.h" |
19802 |
+interix3*) |
19803 |
+ version_type=linux |
19804 |
+ need_lib_prefix=no |
19805 |
+ need_version=no |
19806 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
19807 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19808 |
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' |
19809 |
+ shlibpath_var=LD_LIBRARY_PATH |
19810 |
+ shlibpath_overrides_runpath=no |
19811 |
+ hardcode_into_libs=yes |
19812 |
+ ;; |
19813 |
|
19814 |
-#if HAVE_DLFCN_H |
19815 |
-#include <dlfcn.h> |
19816 |
-#endif |
19817 |
+irix5* | irix6* | nonstopux*) |
19818 |
+ case $host_os in |
19819 |
+ nonstopux*) version_type=nonstopux ;; |
19820 |
+ *) |
19821 |
+ if test "$lt_cv_prog_gnu_ld" = yes; then |
19822 |
+ version_type=linux |
19823 |
+ else |
19824 |
+ version_type=irix |
19825 |
+ fi ;; |
19826 |
+ esac |
19827 |
+ need_lib_prefix=no |
19828 |
+ need_version=no |
19829 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19830 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' |
19831 |
+ case $host_os in |
19832 |
+ irix5* | nonstopux*) |
19833 |
+ libsuff= shlibsuff= |
19834 |
+ ;; |
19835 |
+ *) |
19836 |
+ case $LD in # libtool.m4 will add one of these switches to LD |
19837 |
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") |
19838 |
+ libsuff= shlibsuff= libmagic=32-bit;; |
19839 |
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") |
19840 |
+ libsuff=32 shlibsuff=N32 libmagic=N32;; |
19841 |
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") |
19842 |
+ libsuff=64 shlibsuff=64 libmagic=64-bit;; |
19843 |
+ *) libsuff= shlibsuff= libmagic=never-match;; |
19844 |
+ esac |
19845 |
+ ;; |
19846 |
+ esac |
19847 |
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH |
19848 |
+ shlibpath_overrides_runpath=no |
19849 |
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" |
19850 |
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" |
19851 |
+ hardcode_into_libs=yes |
19852 |
+ ;; |
19853 |
|
19854 |
-#include <stdio.h> |
19855 |
+# No shared lib support for Linux oldld, aout, or coff. |
19856 |
+linux*oldld* | linux*aout* | linux*coff*) |
19857 |
+ dynamic_linker=no |
19858 |
+ ;; |
19859 |
|
19860 |
-#ifdef RTLD_GLOBAL |
19861 |
-# define LT_DLGLOBAL RTLD_GLOBAL |
19862 |
-#else |
19863 |
-# ifdef DL_GLOBAL |
19864 |
-# define LT_DLGLOBAL DL_GLOBAL |
19865 |
-# else |
19866 |
-# define LT_DLGLOBAL 0 |
19867 |
-# endif |
19868 |
-#endif |
19869 |
+# This must be Linux ELF. |
19870 |
+linux*) |
19871 |
+ version_type=linux |
19872 |
+ need_lib_prefix=no |
19873 |
+ need_version=no |
19874 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
19875 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19876 |
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
19877 |
+ shlibpath_var=LD_LIBRARY_PATH |
19878 |
+ shlibpath_overrides_runpath=no |
19879 |
+ # This implies no fast_install, which is unacceptable. |
19880 |
+ # Some rework will be needed to allow for fast_install |
19881 |
+ # before this can be enabled. |
19882 |
+ hardcode_into_libs=yes |
19883 |
|
19884 |
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we |
19885 |
- find out it does not work in some platform. */ |
19886 |
-#ifndef LT_DLLAZY_OR_NOW |
19887 |
-# ifdef RTLD_LAZY |
19888 |
-# define LT_DLLAZY_OR_NOW RTLD_LAZY |
19889 |
-# else |
19890 |
-# ifdef DL_LAZY |
19891 |
-# define LT_DLLAZY_OR_NOW DL_LAZY |
19892 |
-# else |
19893 |
-# ifdef RTLD_NOW |
19894 |
-# define LT_DLLAZY_OR_NOW RTLD_NOW |
19895 |
-# else |
19896 |
-# ifdef DL_NOW |
19897 |
-# define LT_DLLAZY_OR_NOW DL_NOW |
19898 |
-# else |
19899 |
-# define LT_DLLAZY_OR_NOW 0 |
19900 |
-# endif |
19901 |
-# endif |
19902 |
-# endif |
19903 |
-# endif |
19904 |
-#endif |
19905 |
+ # Append ld.so.conf contents to the search path |
19906 |
+ if test -f /etc/ld.so.conf; then |
19907 |
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
19908 |
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
19909 |
+ fi |
19910 |
|
19911 |
-#ifdef __cplusplus |
19912 |
-extern "C" void exit (int); |
19913 |
-#endif |
19914 |
+ # We used to test for /lib/ld.so.1 and disable shared libraries on |
19915 |
+ # powerpc, because MkLinux only supported shared libraries with the |
19916 |
+ # GNU dynamic linker. Since this was broken with cross compilers, |
19917 |
+ # most powerpc-linux boxes support dynamic linking these days and |
19918 |
+ # people can always --disable-shared, the test was removed, and we |
19919 |
+ # assume the GNU/Linux dynamic linker is in use. |
19920 |
+ dynamic_linker='GNU/Linux ld.so' |
19921 |
+ ;; |
19922 |
|
19923 |
-void fnord() { int i=42;} |
19924 |
-int main () |
19925 |
-{ |
19926 |
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
19927 |
- int status = $lt_dlunknown; |
19928 |
+netbsdelf*-gnu) |
19929 |
+ version_type=linux |
19930 |
+ need_lib_prefix=no |
19931 |
+ need_version=no |
19932 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
19933 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19934 |
+ shlibpath_var=LD_LIBRARY_PATH |
19935 |
+ shlibpath_overrides_runpath=no |
19936 |
+ hardcode_into_libs=yes |
19937 |
+ dynamic_linker='NetBSD ld.elf_so' |
19938 |
+ ;; |
19939 |
|
19940 |
- if (self) |
19941 |
- { |
19942 |
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
19943 |
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
19944 |
- /* dlclose (self); */ |
19945 |
- } |
19946 |
+knetbsd*-gnu) |
19947 |
+ version_type=linux |
19948 |
+ need_lib_prefix=no |
19949 |
+ need_version=no |
19950 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
19951 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19952 |
+ shlibpath_var=LD_LIBRARY_PATH |
19953 |
+ shlibpath_overrides_runpath=no |
19954 |
+ hardcode_into_libs=yes |
19955 |
+ dynamic_linker='GNU ld.so' |
19956 |
+ ;; |
19957 |
|
19958 |
- exit (status); |
19959 |
-} |
19960 |
-EOF |
19961 |
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
19962 |
- (eval $ac_link) 2>&5 |
19963 |
- ac_status=$? |
19964 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19965 |
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then |
19966 |
- (./conftest; exit; ) 2>/dev/null |
19967 |
- lt_status=$? |
19968 |
- case x$lt_status in |
19969 |
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; |
19970 |
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; |
19971 |
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; |
19972 |
- esac |
19973 |
- else : |
19974 |
- # compilation failed |
19975 |
- lt_cv_dlopen_self=no |
19976 |
+netbsd*) |
19977 |
+ version_type=sunos |
19978 |
+ need_lib_prefix=no |
19979 |
+ need_version=no |
19980 |
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
19981 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
19982 |
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
19983 |
+ dynamic_linker='NetBSD (a.out) ld.so' |
19984 |
+ else |
19985 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
19986 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
19987 |
+ dynamic_linker='NetBSD ld.elf_so' |
19988 |
fi |
19989 |
-fi |
19990 |
-rm -fr conftest* |
19991 |
- |
19992 |
- |
19993 |
-fi |
19994 |
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 |
19995 |
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6 |
19996 |
+ shlibpath_var=LD_LIBRARY_PATH |
19997 |
+ shlibpath_overrides_runpath=yes |
19998 |
+ hardcode_into_libs=yes |
19999 |
+ ;; |
20000 |
|
20001 |
- if test "x$lt_cv_dlopen_self" = xyes; then |
20002 |
- LDFLAGS="$LDFLAGS $link_static_flag" |
20003 |
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 |
20004 |
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 |
20005 |
-if test "${lt_cv_dlopen_self_static+set}" = set; then |
20006 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
20007 |
-else |
20008 |
- if test "$cross_compiling" = yes; then : |
20009 |
- lt_cv_dlopen_self_static=cross |
20010 |
-else |
20011 |
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
20012 |
- lt_status=$lt_dlunknown |
20013 |
- cat > conftest.$ac_ext <<EOF |
20014 |
-#line 17617 "configure" |
20015 |
-#include "confdefs.h" |
20016 |
+newsos6) |
20017 |
+ version_type=linux |
20018 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
20019 |
+ shlibpath_var=LD_LIBRARY_PATH |
20020 |
+ shlibpath_overrides_runpath=yes |
20021 |
+ ;; |
20022 |
|
20023 |
-#if HAVE_DLFCN_H |
20024 |
-#include <dlfcn.h> |
20025 |
-#endif |
20026 |
+nto-qnx*) |
20027 |
+ version_type=linux |
20028 |
+ need_lib_prefix=no |
20029 |
+ need_version=no |
20030 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
20031 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
20032 |
+ shlibpath_var=LD_LIBRARY_PATH |
20033 |
+ shlibpath_overrides_runpath=yes |
20034 |
+ ;; |
20035 |
|
20036 |
-#include <stdio.h> |
20037 |
+openbsd*) |
20038 |
+ version_type=sunos |
20039 |
+ sys_lib_dlsearch_path_spec="/usr/lib" |
20040 |
+ need_lib_prefix=no |
20041 |
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. |
20042 |
+ case $host_os in |
20043 |
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; |
20044 |
+ *) need_version=no ;; |
20045 |
+ esac |
20046 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
20047 |
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
20048 |
+ shlibpath_var=LD_LIBRARY_PATH |
20049 |
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
20050 |
+ case $host_os in |
20051 |
+ openbsd2.[89] | openbsd2.[89].*) |
20052 |
+ shlibpath_overrides_runpath=no |
20053 |
+ ;; |
20054 |
+ *) |
20055 |
+ shlibpath_overrides_runpath=yes |
20056 |
+ ;; |
20057 |
+ esac |
20058 |
+ else |
20059 |
+ shlibpath_overrides_runpath=yes |
20060 |
+ fi |
20061 |
+ ;; |
20062 |
|
20063 |
-#ifdef RTLD_GLOBAL |
20064 |
-# define LT_DLGLOBAL RTLD_GLOBAL |
20065 |
-#else |
20066 |
-# ifdef DL_GLOBAL |
20067 |
-# define LT_DLGLOBAL DL_GLOBAL |
20068 |
-# else |
20069 |
-# define LT_DLGLOBAL 0 |
20070 |
-# endif |
20071 |
-#endif |
20072 |
+os2*) |
20073 |
+ libname_spec='$name' |
20074 |
+ shrext_cmds=".dll" |
20075 |
+ need_lib_prefix=no |
20076 |
+ library_names_spec='$libname${shared_ext} $libname.a' |
20077 |
+ dynamic_linker='OS/2 ld.exe' |
20078 |
+ shlibpath_var=LIBPATH |
20079 |
+ ;; |
20080 |
|
20081 |
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we |
20082 |
- find out it does not work in some platform. */ |
20083 |
-#ifndef LT_DLLAZY_OR_NOW |
20084 |
-# ifdef RTLD_LAZY |
20085 |
-# define LT_DLLAZY_OR_NOW RTLD_LAZY |
20086 |
-# else |
20087 |
-# ifdef DL_LAZY |
20088 |
-# define LT_DLLAZY_OR_NOW DL_LAZY |
20089 |
-# else |
20090 |
-# ifdef RTLD_NOW |
20091 |
-# define LT_DLLAZY_OR_NOW RTLD_NOW |
20092 |
-# else |
20093 |
-# ifdef DL_NOW |
20094 |
-# define LT_DLLAZY_OR_NOW DL_NOW |
20095 |
-# else |
20096 |
-# define LT_DLLAZY_OR_NOW 0 |
20097 |
-# endif |
20098 |
-# endif |
20099 |
-# endif |
20100 |
-# endif |
20101 |
-#endif |
20102 |
+osf3* | osf4* | osf5*) |
20103 |
+ version_type=osf |
20104 |
+ need_lib_prefix=no |
20105 |
+ need_version=no |
20106 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
20107 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
20108 |
+ shlibpath_var=LD_LIBRARY_PATH |
20109 |
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" |
20110 |
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" |
20111 |
+ ;; |
20112 |
|
20113 |
-#ifdef __cplusplus |
20114 |
-extern "C" void exit (int); |
20115 |
-#endif |
20116 |
+solaris*) |
20117 |
+ version_type=linux |
20118 |
+ need_lib_prefix=no |
20119 |
+ need_version=no |
20120 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
20121 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
20122 |
+ shlibpath_var=LD_LIBRARY_PATH |
20123 |
+ shlibpath_overrides_runpath=yes |
20124 |
+ hardcode_into_libs=yes |
20125 |
+ # ldd complains unless libraries are executable |
20126 |
+ postinstall_cmds='chmod +x $lib' |
20127 |
+ ;; |
20128 |
|
20129 |
-void fnord() { int i=42;} |
20130 |
-int main () |
20131 |
-{ |
20132 |
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
20133 |
- int status = $lt_dlunknown; |
20134 |
+sunos4*) |
20135 |
+ version_type=sunos |
20136 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
20137 |
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' |
20138 |
+ shlibpath_var=LD_LIBRARY_PATH |
20139 |
+ shlibpath_overrides_runpath=yes |
20140 |
+ if test "$with_gnu_ld" = yes; then |
20141 |
+ need_lib_prefix=no |
20142 |
+ fi |
20143 |
+ need_version=yes |
20144 |
+ ;; |
20145 |
|
20146 |
- if (self) |
20147 |
- { |
20148 |
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
20149 |
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
20150 |
- /* dlclose (self); */ |
20151 |
- } |
20152 |
+sysv4 | sysv4.3*) |
20153 |
+ version_type=linux |
20154 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
20155 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
20156 |
+ shlibpath_var=LD_LIBRARY_PATH |
20157 |
+ case $host_vendor in |
20158 |
+ sni) |
20159 |
+ shlibpath_overrides_runpath=no |
20160 |
+ need_lib_prefix=no |
20161 |
+ export_dynamic_flag_spec='${wl}-Blargedynsym' |
20162 |
+ runpath_var=LD_RUN_PATH |
20163 |
+ ;; |
20164 |
+ siemens) |
20165 |
+ need_lib_prefix=no |
20166 |
+ ;; |
20167 |
+ motorola) |
20168 |
+ need_lib_prefix=no |
20169 |
+ need_version=no |
20170 |
+ shlibpath_overrides_runpath=no |
20171 |
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' |
20172 |
+ ;; |
20173 |
+ esac |
20174 |
+ ;; |
20175 |
|
20176 |
- exit (status); |
20177 |
-} |
20178 |
-EOF |
20179 |
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
20180 |
- (eval $ac_link) 2>&5 |
20181 |
- ac_status=$? |
20182 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20183 |
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then |
20184 |
- (./conftest; exit; ) 2>/dev/null |
20185 |
- lt_status=$? |
20186 |
- case x$lt_status in |
20187 |
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; |
20188 |
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; |
20189 |
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; |
20190 |
+sysv4*MP*) |
20191 |
+ if test -d /usr/nec ;then |
20192 |
+ version_type=linux |
20193 |
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
20194 |
+ soname_spec='$libname${shared_ext}.$major' |
20195 |
+ shlibpath_var=LD_LIBRARY_PATH |
20196 |
+ fi |
20197 |
+ ;; |
20198 |
+ |
20199 |
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
20200 |
+ version_type=freebsd-elf |
20201 |
+ need_lib_prefix=no |
20202 |
+ need_version=no |
20203 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
20204 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
20205 |
+ shlibpath_var=LD_LIBRARY_PATH |
20206 |
+ hardcode_into_libs=yes |
20207 |
+ if test "$with_gnu_ld" = yes; then |
20208 |
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' |
20209 |
+ shlibpath_overrides_runpath=no |
20210 |
+ else |
20211 |
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' |
20212 |
+ shlibpath_overrides_runpath=yes |
20213 |
+ case $host_os in |
20214 |
+ sco3.2v5*) |
20215 |
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" |
20216 |
+ ;; |
20217 |
esac |
20218 |
- else : |
20219 |
- # compilation failed |
20220 |
- lt_cv_dlopen_self_static=no |
20221 |
fi |
20222 |
-fi |
20223 |
-rm -fr conftest* |
20224 |
+ sys_lib_dlsearch_path_spec='/usr/lib' |
20225 |
+ ;; |
20226 |
+ |
20227 |
+uts4*) |
20228 |
+ version_type=linux |
20229 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
20230 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
20231 |
+ shlibpath_var=LD_LIBRARY_PATH |
20232 |
+ ;; |
20233 |
|
20234 |
+*) |
20235 |
+ dynamic_linker=no |
20236 |
+ ;; |
20237 |
+esac |
20238 |
+echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
20239 |
+echo "${ECHO_T}$dynamic_linker" >&6 |
20240 |
+test "$dynamic_linker" = no && can_build_shared=no |
20241 |
|
20242 |
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
20243 |
+if test "$GCC" = yes; then |
20244 |
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
20245 |
fi |
20246 |
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 |
20247 |
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 |
20248 |
- fi |
20249 |
|
20250 |
- CPPFLAGS="$save_CPPFLAGS" |
20251 |
- LDFLAGS="$save_LDFLAGS" |
20252 |
- LIBS="$save_LIBS" |
20253 |
- ;; |
20254 |
- esac |
20255 |
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
20256 |
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 |
20257 |
+hardcode_action_GCJ= |
20258 |
+if test -n "$hardcode_libdir_flag_spec_GCJ" || \ |
20259 |
+ test -n "$runpath_var_GCJ" || \ |
20260 |
+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then |
20261 |
|
20262 |
- case $lt_cv_dlopen_self in |
20263 |
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; |
20264 |
- *) enable_dlopen_self=unknown ;; |
20265 |
- esac |
20266 |
+ # We can hardcode non-existant directories. |
20267 |
+ if test "$hardcode_direct_GCJ" != no && |
20268 |
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we |
20269 |
+ # have to relink, otherwise we might link with an installed library |
20270 |
+ # when we should be linking with a yet-to-be-installed one |
20271 |
+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && |
20272 |
+ test "$hardcode_minus_L_GCJ" != no; then |
20273 |
+ # Linking always hardcodes the temporary library directory. |
20274 |
+ hardcode_action_GCJ=relink |
20275 |
+ else |
20276 |
+ # We can link without hardcoding, and we can hardcode nonexisting dirs. |
20277 |
+ hardcode_action_GCJ=immediate |
20278 |
+ fi |
20279 |
+else |
20280 |
+ # We cannot hardcode anything, or else we can only hardcode existing |
20281 |
+ # directories. |
20282 |
+ hardcode_action_GCJ=unsupported |
20283 |
+fi |
20284 |
+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 |
20285 |
+echo "${ECHO_T}$hardcode_action_GCJ" >&6 |
20286 |
|
20287 |
- case $lt_cv_dlopen_self_static in |
20288 |
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; |
20289 |
- *) enable_dlopen_self_static=unknown ;; |
20290 |
- esac |
20291 |
+if test "$hardcode_action_GCJ" = relink; then |
20292 |
+ # Fast installation is not supported |
20293 |
+ enable_fast_install=no |
20294 |
+elif test "$shlibpath_overrides_runpath" = yes || |
20295 |
+ test "$enable_shared" = no; then |
20296 |
+ # Fast installation is not necessary |
20297 |
+ enable_fast_install=needless |
20298 |
fi |
20299 |
|
20300 |
|
20301 |
@@ -17731,7 +17201,7 @@ |
20302 |
# Now quote all the things that may contain metacharacters while being |
20303 |
# careful not to overquote the AC_SUBSTed values. We take copies of the |
20304 |
# variables and quote the copies for generation of the libtool script. |
20305 |
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ |
20306 |
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ |
20307 |
SED SHELL STRIP \ |
20308 |
libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
20309 |
old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
20310 |
@@ -17832,6 +17302,12 @@ |
20311 |
# The host system. |
20312 |
host_alias=$host_alias |
20313 |
host=$host |
20314 |
+host_os=$host_os |
20315 |
+ |
20316 |
+# The build system. |
20317 |
+build_alias=$build_alias |
20318 |
+build=$build |
20319 |
+build_os=$build_os |
20320 |
|
20321 |
# An echo program that does not interpret backslashes. |
20322 |
echo=$lt_echo |
20323 |
@@ -17843,6 +17319,9 @@ |
20324 |
# A C compiler. |
20325 |
LTCC=$lt_LTCC |
20326 |
|
20327 |
+# LTCC compiler flags. |
20328 |
+LTCFLAGS=$lt_LTCFLAGS |
20329 |
+ |
20330 |
# A language-specific compiler. |
20331 |
CC=$lt_compiler_GCJ |
20332 |
|
20333 |
@@ -17908,7 +17387,7 @@ |
20334 |
# Does compiler simultaneously support -c and -o options? |
20335 |
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ |
20336 |
|
20337 |
-# Must we lock files when doing compilation ? |
20338 |
+# Must we lock files when doing compilation? |
20339 |
need_locks=$lt_need_locks |
20340 |
|
20341 |
# Do we need the lib prefix for modules? |
20342 |
@@ -18152,15 +17631,42 @@ |
20343 |
# If no C compiler was specified, use CC. |
20344 |
LTCC=${LTCC-"$CC"} |
20345 |
|
20346 |
+# If no C compiler flags were specified, use CFLAGS. |
20347 |
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} |
20348 |
+ |
20349 |
# Allow CC to be a program name with arguments. |
20350 |
compiler=$CC |
20351 |
|
20352 |
|
20353 |
+# save warnings/boilerplate of simple test code |
20354 |
+ac_outfile=conftest.$ac_objext |
20355 |
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext |
20356 |
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
20357 |
+_lt_compiler_boilerplate=`cat conftest.err` |
20358 |
+$rm conftest* |
20359 |
+ |
20360 |
+ac_outfile=conftest.$ac_objext |
20361 |
+printf "$lt_simple_link_test_code" >conftest.$ac_ext |
20362 |
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
20363 |
+_lt_linker_boilerplate=`cat conftest.err` |
20364 |
+$rm conftest* |
20365 |
+ |
20366 |
+ |
20367 |
# Allow CC to be a program name with arguments. |
20368 |
lt_save_CC="$CC" |
20369 |
CC=${RC-"windres"} |
20370 |
compiler=$CC |
20371 |
compiler_RC=$CC |
20372 |
+for cc_temp in $compiler""; do |
20373 |
+ case $cc_temp in |
20374 |
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; |
20375 |
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; |
20376 |
+ \-*) ;; |
20377 |
+ *) break;; |
20378 |
+ esac |
20379 |
+done |
20380 |
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
20381 |
+ |
20382 |
lt_cv_prog_compiler_c_o_RC=yes |
20383 |
|
20384 |
# The else clause should only fire when bootstrapping the |
20385 |
@@ -18176,7 +17682,7 @@ |
20386 |
# Now quote all the things that may contain metacharacters while being |
20387 |
# careful not to overquote the AC_SUBSTed values. We take copies of the |
20388 |
# variables and quote the copies for generation of the libtool script. |
20389 |
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ |
20390 |
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ |
20391 |
SED SHELL STRIP \ |
20392 |
libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
20393 |
old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
20394 |
@@ -18277,6 +17783,12 @@ |
20395 |
# The host system. |
20396 |
host_alias=$host_alias |
20397 |
host=$host |
20398 |
+host_os=$host_os |
20399 |
+ |
20400 |
+# The build system. |
20401 |
+build_alias=$build_alias |
20402 |
+build=$build |
20403 |
+build_os=$build_os |
20404 |
|
20405 |
# An echo program that does not interpret backslashes. |
20406 |
echo=$lt_echo |
20407 |
@@ -18288,6 +17800,9 @@ |
20408 |
# A C compiler. |
20409 |
LTCC=$lt_LTCC |
20410 |
|
20411 |
+# LTCC compiler flags. |
20412 |
+LTCFLAGS=$lt_LTCFLAGS |
20413 |
+ |
20414 |
# A language-specific compiler. |
20415 |
CC=$lt_compiler_RC |
20416 |
|
20417 |
@@ -18353,7 +17868,7 @@ |
20418 |
# Does compiler simultaneously support -c and -o options? |
20419 |
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC |
20420 |
|
20421 |
-# Must we lock files when doing compilation ? |
20422 |
+# Must we lock files when doing compilation? |
20423 |
need_locks=$lt_need_locks |
20424 |
|
20425 |
# Do we need the lib prefix for modules? |
20426 |
@@ -21237,7 +20752,7 @@ |
20427 |
int |
20428 |
main () |
20429 |
{ |
20430 |
-{int x; asm volatile("movl %%eax, %%ebx\n":: |
20431 |
+{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal":: |
20432 |
"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x), |
20433 |
"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));} |
20434 |
; |
20435 |
@@ -22408,7 +21923,7 @@ |
20436 |
cat confdefs.h >>conftest.$ac_ext |
20437 |
cat >>conftest.$ac_ext <<_ACEOF |
20438 |
/* end confdefs.h. */ |
20439 |
-#include <X11/Intrinsic.h> |
20440 |
+#include <X11/Xlib.h> |
20441 |
_ACEOF |
20442 |
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
20443 |
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
20444 |
@@ -22435,7 +21950,7 @@ |
20445 |
sed 's/^/| /' conftest.$ac_ext >&5 |
20446 |
|
20447 |
for ac_dir in $ac_x_header_dirs; do |
20448 |
- if test -r "$ac_dir/X11/Intrinsic.h"; then |
20449 |
+ if test -r "$ac_dir/X11/Xlib.h"; then |
20450 |
ac_x_includes=$ac_dir |
20451 |
break |
20452 |
fi |
20453 |
@@ -22449,18 +21964,18 @@ |
20454 |
# See if we find them without any special options. |
20455 |
# Don't add to $LIBS permanently. |
20456 |
ac_save_LIBS=$LIBS |
20457 |
- LIBS="-lXt $LIBS" |
20458 |
+ LIBS="-lX11 $LIBS" |
20459 |
cat >conftest.$ac_ext <<_ACEOF |
20460 |
/* confdefs.h. */ |
20461 |
_ACEOF |
20462 |
cat confdefs.h >>conftest.$ac_ext |
20463 |
cat >>conftest.$ac_ext <<_ACEOF |
20464 |
/* end confdefs.h. */ |
20465 |
-#include <X11/Intrinsic.h> |
20466 |
+#include <X11/Xlib.h> |
20467 |
int |
20468 |
main () |
20469 |
{ |
20470 |
-XtMalloc (0) |
20471 |
+XrmInitialize () |
20472 |
; |
20473 |
return 0; |
20474 |
} |
20475 |
@@ -22498,7 +22013,7 @@ |
20476 |
do |
20477 |
# Don't even attempt the hair of trying to link an X program! |
20478 |
for ac_extension in a so sl; do |
20479 |
- if test -r $ac_dir/libXt.$ac_extension; then |
20480 |
+ if test -r $ac_dir/libX11.$ac_extension; then |
20481 |
ac_x_libraries=$ac_dir |
20482 |
break 2 |
20483 |
fi |
20484 |
@@ -26267,7 +25782,9 @@ |
20485 |
|
20486 |
fi; |
20487 |
|
20488 |
-appspath=$with_gnustepdir |
20489 |
+if test "x`echo $with_gnustepdir | grep ^/`" != "x"; then |
20490 |
+ appspath=$with_gnustepdir |
20491 |
+fi |
20492 |
|
20493 |
if test "x$appspath$GNUSTEP_LOCAL_ROOT" = "x"; then |
20494 |
wprefs_base_dir=${prefix} |
20495 |
diff -uhrN WindowMaker-0.92.0/configure.ac WindowMaker-CVS-20060123/configure.ac |
20496 |
--- WindowMaker-0.92.0/configure.ac 2005-01-06 16:31:40.000000000 +0100 |
20497 |
+++ WindowMaker-CVS-20060123/configure.ac 2005-08-22 23:48:20.000000000 +0200 |
20498 |
@@ -197,7 +197,7 @@ |
20499 |
|
20500 |
AC_CACHE_CHECK(whether gcc supports x86 inline asm, |
20501 |
ac_cv_c_inline_asm, |
20502 |
- [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n":: |
20503 |
+ [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal":: |
20504 |
"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x), |
20505 |
"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}], |
20506 |
ac_cv_c_inline_asm=yes, |
20507 |
@@ -831,7 +831,9 @@ |
20508 |
AC_ARG_WITH(appspath, |
20509 |
[ --with-gnustepdir=PATH specify the directory for GNUstep applications]) |
20510 |
|
20511 |
-appspath=$with_gnustepdir |
20512 |
+if test "x`echo $with_gnustepdir | grep ^/`" != "x"; then |
20513 |
+ appspath=$with_gnustepdir |
20514 |
+fi |
20515 |
|
20516 |
if test "x$appspath$GNUSTEP_LOCAL_ROOT" = "x"; then |
20517 |
wprefs_base_dir=${prefix} |
20518 |
diff -uhrN WindowMaker-0.92.0/ltmain.sh WindowMaker-CVS-20060123/ltmain.sh |
20519 |
--- WindowMaker-0.92.0/ltmain.sh 2005-06-19 05:22:56.000000000 +0200 |
20520 |
+++ WindowMaker-CVS-20060123/ltmain.sh 2006-01-09 16:21:15.000000000 +0100 |
20521 |
@@ -1,7 +1,7 @@ |
20522 |
# ltmain.sh - Provide generalized library-building support services. |
20523 |
# NOTE: Changing this file will not affect anything until you rerun configure. |
20524 |
# |
20525 |
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 |
20526 |
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 |
20527 |
# Free Software Foundation, Inc. |
20528 |
# Originally by Gordon Matzigkeit <gord@××××××××××.edu>, 1996 |
20529 |
# |
20530 |
@@ -17,7 +17,7 @@ |
20531 |
# |
20532 |
# You should have received a copy of the GNU General Public License |
20533 |
# along with this program; if not, write to the Free Software |
20534 |
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
20535 |
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
20536 |
# |
20537 |
# As a special exception to the GNU General Public License, if you |
20538 |
# distribute this file as part of a program that contains a |
20539 |
@@ -43,9 +43,14 @@ |
20540 |
|
20541 |
PROGRAM=ltmain.sh |
20542 |
PACKAGE=libtool |
20543 |
-VERSION=1.5.6 |
20544 |
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $" |
20545 |
+VERSION="1.5.22 Debian 1.5.22-2" |
20546 |
+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" |
20547 |
|
20548 |
+# See if we are running on zsh, and set the options which allow our |
20549 |
+# commands through without removal of \ escapes. |
20550 |
+if test -n "${ZSH_VERSION+set}" ; then |
20551 |
+ setopt NO_GLOB_SUBST |
20552 |
+fi |
20553 |
|
20554 |
# Check that we have a working $echo. |
20555 |
if test "X$1" = X--no-reexec; then |
20556 |
@@ -83,14 +88,15 @@ |
20557 |
Xsed="${SED}"' -e 1s/^X//' |
20558 |
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' |
20559 |
# test EBCDIC or ASCII |
20560 |
-case `echo A|tr A '\301'` in |
20561 |
- A) # EBCDIC based system |
20562 |
- SP2NL="tr '\100' '\n'" |
20563 |
- NL2SP="tr '\r\n' '\100\100'" |
20564 |
+case `echo X|tr X '\101'` in |
20565 |
+ A) # ASCII based system |
20566 |
+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr |
20567 |
+ SP2NL='tr \040 \012' |
20568 |
+ NL2SP='tr \015\012 \040\040' |
20569 |
;; |
20570 |
- *) # Assume ASCII based system |
20571 |
- SP2NL="tr '\040' '\012'" |
20572 |
- NL2SP="tr '\015\012' '\040\040'" |
20573 |
+ *) # EBCDIC based system |
20574 |
+ SP2NL='tr \100 \n' |
20575 |
+ NL2SP='tr \r\n \100\100' |
20576 |
;; |
20577 |
esac |
20578 |
|
20579 |
@@ -107,8 +113,9 @@ |
20580 |
fi |
20581 |
|
20582 |
# Make sure IFS has a sensible default |
20583 |
-: ${IFS=" |
20584 |
-"} |
20585 |
+lt_nl=' |
20586 |
+' |
20587 |
+IFS=" $lt_nl" |
20588 |
|
20589 |
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then |
20590 |
$echo "$modename: not configured to build any kind of library" 1>&2 |
20591 |
@@ -125,6 +132,8 @@ |
20592 |
show="$echo" |
20593 |
show_help= |
20594 |
execute_dlfiles= |
20595 |
+duplicate_deps=no |
20596 |
+preserve_args= |
20597 |
lo2o="s/\\.lo\$/.${objext}/" |
20598 |
o2lo="s/\\.${objext}\$/.lo/" |
20599 |
|
20600 |
@@ -132,13 +141,51 @@ |
20601 |
# Shell function definitions: |
20602 |
# This seems to be the best place for them |
20603 |
|
20604 |
+# func_mktempdir [string] |
20605 |
+# Make a temporary directory that won't clash with other running |
20606 |
+# libtool processes, and avoids race conditions if possible. If |
20607 |
+# given, STRING is the basename for that directory. |
20608 |
+func_mktempdir () |
20609 |
+{ |
20610 |
+ my_template="${TMPDIR-/tmp}/${1-$progname}" |
20611 |
+ |
20612 |
+ if test "$run" = ":"; then |
20613 |
+ # Return a directory name, but don't create it in dry-run mode |
20614 |
+ my_tmpdir="${my_template}-$$" |
20615 |
+ else |
20616 |
+ |
20617 |
+ # If mktemp works, use that first and foremost |
20618 |
+ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` |
20619 |
+ |
20620 |
+ if test ! -d "$my_tmpdir"; then |
20621 |
+ # Failing that, at least try and use $RANDOM to avoid a race |
20622 |
+ my_tmpdir="${my_template}-${RANDOM-0}$$" |
20623 |
+ |
20624 |
+ save_mktempdir_umask=`umask` |
20625 |
+ umask 0077 |
20626 |
+ $mkdir "$my_tmpdir" |
20627 |
+ umask $save_mktempdir_umask |
20628 |
+ fi |
20629 |
+ |
20630 |
+ # If we're not in dry-run mode, bomb out on failure |
20631 |
+ test -d "$my_tmpdir" || { |
20632 |
+ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 |
20633 |
+ exit $EXIT_FAILURE |
20634 |
+ } |
20635 |
+ fi |
20636 |
+ |
20637 |
+ $echo "X$my_tmpdir" | $Xsed |
20638 |
+} |
20639 |
+ |
20640 |
+ |
20641 |
# func_win32_libid arg |
20642 |
# return the library type of file 'arg' |
20643 |
# |
20644 |
# Need a lot of goo to handle *both* DLLs and import libs |
20645 |
# Has to be a shell function in order to 'eat' the argument |
20646 |
# that is supplied when $file_magic_command is called. |
20647 |
-func_win32_libid () { |
20648 |
+func_win32_libid () |
20649 |
+{ |
20650 |
win32_libid_type="unknown" |
20651 |
win32_fileres=`file -L $1 2>/dev/null` |
20652 |
case $win32_fileres in |
20653 |
@@ -149,12 +196,11 @@ |
20654 |
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ |
20655 |
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then |
20656 |
win32_nmres=`eval $NM -f posix -A $1 | \ |
20657 |
- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` |
20658 |
- if test "X$win32_nmres" = "Ximport" ; then |
20659 |
- win32_libid_type="x86 archive import" |
20660 |
- else |
20661 |
- win32_libid_type="x86 archive static" |
20662 |
- fi |
20663 |
+ $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` |
20664 |
+ case $win32_nmres in |
20665 |
+ import*) win32_libid_type="x86 archive import";; |
20666 |
+ *) win32_libid_type="x86 archive static";; |
20667 |
+ esac |
20668 |
fi |
20669 |
;; |
20670 |
*DLL*) |
20671 |
@@ -178,7 +224,8 @@ |
20672 |
# Only attempt this if the compiler in the base compile |
20673 |
# command doesn't match the default compiler. |
20674 |
# arg is usually of the form 'gcc ...' |
20675 |
-func_infer_tag () { |
20676 |
+func_infer_tag () |
20677 |
+{ |
20678 |
if test -n "$available_tags" && test -z "$tagname"; then |
20679 |
CC_quoted= |
20680 |
for arg in $CC; do |
20681 |
@@ -235,12 +282,116 @@ |
20682 |
esac |
20683 |
fi |
20684 |
} |
20685 |
+ |
20686 |
+ |
20687 |
+# func_extract_an_archive dir oldlib |
20688 |
+func_extract_an_archive () |
20689 |
+{ |
20690 |
+ f_ex_an_ar_dir="$1"; shift |
20691 |
+ f_ex_an_ar_oldlib="$1" |
20692 |
+ |
20693 |
+ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" |
20694 |
+ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? |
20695 |
+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then |
20696 |
+ : |
20697 |
+ else |
20698 |
+ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 |
20699 |
+ exit $EXIT_FAILURE |
20700 |
+ fi |
20701 |
+} |
20702 |
+ |
20703 |
+# func_extract_archives gentop oldlib ... |
20704 |
+func_extract_archives () |
20705 |
+{ |
20706 |
+ my_gentop="$1"; shift |
20707 |
+ my_oldlibs=${1+"$@"} |
20708 |
+ my_oldobjs="" |
20709 |
+ my_xlib="" |
20710 |
+ my_xabs="" |
20711 |
+ my_xdir="" |
20712 |
+ my_status="" |
20713 |
+ |
20714 |
+ $show "${rm}r $my_gentop" |
20715 |
+ $run ${rm}r "$my_gentop" |
20716 |
+ $show "$mkdir $my_gentop" |
20717 |
+ $run $mkdir "$my_gentop" |
20718 |
+ my_status=$? |
20719 |
+ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then |
20720 |
+ exit $my_status |
20721 |
+ fi |
20722 |
+ |
20723 |
+ for my_xlib in $my_oldlibs; do |
20724 |
+ # Extract the objects. |
20725 |
+ case $my_xlib in |
20726 |
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; |
20727 |
+ *) my_xabs=`pwd`"/$my_xlib" ;; |
20728 |
+ esac |
20729 |
+ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` |
20730 |
+ my_xdir="$my_gentop/$my_xlib" |
20731 |
+ |
20732 |
+ $show "${rm}r $my_xdir" |
20733 |
+ $run ${rm}r "$my_xdir" |
20734 |
+ $show "$mkdir $my_xdir" |
20735 |
+ $run $mkdir "$my_xdir" |
20736 |
+ exit_status=$? |
20737 |
+ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then |
20738 |
+ exit $exit_status |
20739 |
+ fi |
20740 |
+ case $host in |
20741 |
+ *-darwin*) |
20742 |
+ $show "Extracting $my_xabs" |
20743 |
+ # Do not bother doing anything if just a dry run |
20744 |
+ if test -z "$run"; then |
20745 |
+ darwin_orig_dir=`pwd` |
20746 |
+ cd $my_xdir || exit $? |
20747 |
+ darwin_archive=$my_xabs |
20748 |
+ darwin_curdir=`pwd` |
20749 |
+ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` |
20750 |
+ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` |
20751 |
+ if test -n "$darwin_arches"; then |
20752 |
+ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` |
20753 |
+ darwin_arch= |
20754 |
+ $show "$darwin_base_archive has multiple architectures $darwin_arches" |
20755 |
+ for darwin_arch in $darwin_arches ; do |
20756 |
+ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" |
20757 |
+ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" |
20758 |
+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" |
20759 |
+ func_extract_an_archive "`pwd`" "${darwin_base_archive}" |
20760 |
+ cd "$darwin_curdir" |
20761 |
+ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" |
20762 |
+ done # $darwin_arches |
20763 |
+ ## Okay now we have a bunch of thin objects, gotta fatten them up :) |
20764 |
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` |
20765 |
+ darwin_file= |
20766 |
+ darwin_files= |
20767 |
+ for darwin_file in $darwin_filelist; do |
20768 |
+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` |
20769 |
+ lipo -create -output "$darwin_file" $darwin_files |
20770 |
+ done # $darwin_filelist |
20771 |
+ ${rm}r unfat-$$ |
20772 |
+ cd "$darwin_orig_dir" |
20773 |
+ else |
20774 |
+ cd "$darwin_orig_dir" |
20775 |
+ func_extract_an_archive "$my_xdir" "$my_xabs" |
20776 |
+ fi # $darwin_arches |
20777 |
+ fi # $run |
20778 |
+ ;; |
20779 |
+ *) |
20780 |
+ func_extract_an_archive "$my_xdir" "$my_xabs" |
20781 |
+ ;; |
20782 |
+ esac |
20783 |
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` |
20784 |
+ done |
20785 |
+ func_extract_archives_result="$my_oldobjs" |
20786 |
+} |
20787 |
# End of Shell function definitions |
20788 |
##################################### |
20789 |
|
20790 |
# Darwin sucks |
20791 |
eval std_shrext=\"$shrext_cmds\" |
20792 |
|
20793 |
+disable_libs=no |
20794 |
+ |
20795 |
# Parse our command line options once, thoroughly. |
20796 |
while test "$#" -gt 0 |
20797 |
do |
20798 |
@@ -305,10 +456,10 @@ |
20799 |
--version) |
20800 |
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" |
20801 |
$echo |
20802 |
- $echo "Copyright (C) 2003 Free Software Foundation, Inc." |
20803 |
+ $echo "Copyright (C) 2005 Free Software Foundation, Inc." |
20804 |
$echo "This is free software; see the source for copying conditions. There is NO" |
20805 |
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
20806 |
- exit $EXIT_SUCCESS |
20807 |
+ exit $? |
20808 |
;; |
20809 |
|
20810 |
--config) |
20811 |
@@ -317,7 +468,7 @@ |
20812 |
for tagname in $taglist; do |
20813 |
${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" |
20814 |
done |
20815 |
- exit $EXIT_SUCCESS |
20816 |
+ exit $? |
20817 |
;; |
20818 |
|
20819 |
--debug) |
20820 |
@@ -342,7 +493,7 @@ |
20821 |
else |
20822 |
$echo "disable static libraries" |
20823 |
fi |
20824 |
- exit $EXIT_SUCCESS |
20825 |
+ exit $? |
20826 |
;; |
20827 |
|
20828 |
--finish) mode="finish" ;; |
20829 |
@@ -357,7 +508,11 @@ |
20830 |
preserve_args="$preserve_args $arg" |
20831 |
;; |
20832 |
|
20833 |
- --tag) prevopt="--tag" prev=tag ;; |
20834 |
+ --tag) |
20835 |
+ prevopt="--tag" |
20836 |
+ prev=tag |
20837 |
+ preserve_args="$preserve_args --tag" |
20838 |
+ ;; |
20839 |
--tag=*) |
20840 |
set tag "$optarg" ${1+"$@"} |
20841 |
shift |
20842 |
@@ -389,6 +544,18 @@ |
20843 |
exit $EXIT_FAILURE |
20844 |
fi |
20845 |
|
20846 |
+case $disable_libs in |
20847 |
+no) |
20848 |
+ ;; |
20849 |
+shared) |
20850 |
+ build_libtool_libs=no |
20851 |
+ build_old_libs=yes |
20852 |
+ ;; |
20853 |
+static) |
20854 |
+ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` |
20855 |
+ ;; |
20856 |
+esac |
20857 |
+ |
20858 |
# If this variable is set in any of the actions, the command in it |
20859 |
# will be execed at the end. This prevents here-documents from being |
20860 |
# left over by shells. |
20861 |
@@ -399,7 +566,7 @@ |
20862 |
# Infer the operation mode. |
20863 |
if test -z "$mode"; then |
20864 |
$echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 |
20865 |
- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 |
20866 |
+ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 |
20867 |
case $nonopt in |
20868 |
*cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) |
20869 |
mode=link |
20870 |
@@ -465,7 +632,7 @@ |
20871 |
|
20872 |
for arg |
20873 |
do |
20874 |
- case "$arg_mode" in |
20875 |
+ case $arg_mode in |
20876 |
arg ) |
20877 |
# do not "continue". Instead, add this to base_compile |
20878 |
lastarg="$arg" |
20879 |
@@ -547,7 +714,10 @@ |
20880 |
case $lastarg in |
20881 |
# Double-quote args containing other shell metacharacters. |
20882 |
# Many Bourne shells cannot handle close brackets correctly |
20883 |
- # in scan sets, so we specify it separately. |
20884 |
+ # in scan sets, and some SunOS ksh mistreat backslash-escaping |
20885 |
+ # in scan sets (worked around with variable expansion), |
20886 |
+ # and furthermore cannot handle '|' '&' '(' ')' in scan sets |
20887 |
+ # at all, so we specify them separately. |
20888 |
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") |
20889 |
lastarg="\"$lastarg\"" |
20890 |
;; |
20891 |
@@ -621,6 +791,14 @@ |
20892 |
esac |
20893 |
done |
20894 |
|
20895 |
+ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` |
20896 |
+ case $qlibobj in |
20897 |
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") |
20898 |
+ qlibobj="\"$qlibobj\"" ;; |
20899 |
+ esac |
20900 |
+ test "X$libobj" != "X$qlibobj" \ |
20901 |
+ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ |
20902 |
+ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." |
20903 |
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` |
20904 |
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` |
20905 |
if test "X$xdir" = "X$obj"; then |
20906 |
@@ -693,12 +871,17 @@ |
20907 |
$run $rm $removelist |
20908 |
exit $EXIT_FAILURE |
20909 |
fi |
20910 |
- $echo $srcfile > "$lockfile" |
20911 |
+ $echo "$srcfile" > "$lockfile" |
20912 |
fi |
20913 |
|
20914 |
if test -n "$fix_srcfile_path"; then |
20915 |
eval srcfile=\"$fix_srcfile_path\" |
20916 |
fi |
20917 |
+ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` |
20918 |
+ case $qsrcfile in |
20919 |
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") |
20920 |
+ qsrcfile="\"$qsrcfile\"" ;; |
20921 |
+ esac |
20922 |
|
20923 |
$run $rm "$libobj" "${libobj}T" |
20924 |
|
20925 |
@@ -720,18 +903,18 @@ |
20926 |
fbsd_hideous_sh_bug=$base_compile |
20927 |
|
20928 |
if test "$pic_mode" != no; then |
20929 |
- command="$base_compile $srcfile $pic_flag" |
20930 |
+ command="$base_compile $qsrcfile $pic_flag" |
20931 |
else |
20932 |
# Don't build PIC code |
20933 |
- command="$base_compile $srcfile" |
20934 |
+ command="$base_compile $qsrcfile" |
20935 |
fi |
20936 |
|
20937 |
if test ! -d "${xdir}$objdir"; then |
20938 |
$show "$mkdir ${xdir}$objdir" |
20939 |
$run $mkdir ${xdir}$objdir |
20940 |
- status=$? |
20941 |
- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then |
20942 |
- exit $status |
20943 |
+ exit_status=$? |
20944 |
+ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then |
20945 |
+ exit $exit_status |
20946 |
fi |
20947 |
fi |
20948 |
|
20949 |
@@ -803,9 +986,9 @@ |
20950 |
if test "$build_old_libs" = yes; then |
20951 |
if test "$pic_mode" != yes; then |
20952 |
# Don't build PIC code |
20953 |
- command="$base_compile $srcfile" |
20954 |
+ command="$base_compile $qsrcfile" |
20955 |
else |
20956 |
- command="$base_compile $srcfile $pic_flag" |
20957 |
+ command="$base_compile $qsrcfile $pic_flag" |
20958 |
fi |
20959 |
if test "$compiler_c_o" = yes; then |
20960 |
command="$command -o $obj" |
20961 |
@@ -934,6 +1117,7 @@ |
20962 |
no_install=no |
20963 |
objs= |
20964 |
non_pic_objects= |
20965 |
+ notinst_path= # paths that contain not-installed libtool libraries |
20966 |
precious_files_regex= |
20967 |
prefer_static_libs=no |
20968 |
preload=no |
20969 |
@@ -962,14 +1146,15 @@ |
20970 |
if test -n "$link_static_flag"; then |
20971 |
dlopen_self=$dlopen_self_static |
20972 |
fi |
20973 |
+ prefer_static_libs=yes |
20974 |
else |
20975 |
if test -z "$pic_flag" && test -n "$link_static_flag"; then |
20976 |
dlopen_self=$dlopen_self_static |
20977 |
fi |
20978 |
+ prefer_static_libs=built |
20979 |
fi |
20980 |
build_libtool_libs=no |
20981 |
build_old_libs=yes |
20982 |
- prefer_static_libs=yes |
20983 |
break |
20984 |
;; |
20985 |
esac |
20986 |
@@ -1144,6 +1329,11 @@ |
20987 |
if test -z "$pic_object" || test "$pic_object" = none ; then |
20988 |
arg="$non_pic_object" |
20989 |
fi |
20990 |
+ else |
20991 |
+ # If the PIC object exists, use it instead. |
20992 |
+ # $xdir was prepended to $pic_object above. |
20993 |
+ non_pic_object="$pic_object" |
20994 |
+ non_pic_objects="$non_pic_objects $non_pic_object" |
20995 |
fi |
20996 |
else |
20997 |
# Only an error if not doing a dry-run. |
20998 |
@@ -1227,6 +1417,13 @@ |
20999 |
prev= |
21000 |
continue |
21001 |
;; |
21002 |
+ darwin_framework|darwin_framework_skip) |
21003 |
+ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" |
21004 |
+ compile_command="$compile_command $arg" |
21005 |
+ finalize_command="$finalize_command $arg" |
21006 |
+ prev= |
21007 |
+ continue |
21008 |
+ ;; |
21009 |
*) |
21010 |
eval "$prev=\"\$arg\"" |
21011 |
prev= |
21012 |
@@ -1285,6 +1482,18 @@ |
21013 |
continue |
21014 |
;; |
21015 |
|
21016 |
+ -framework|-arch|-isysroot) |
21017 |
+ case " $CC " in |
21018 |
+ *" ${arg} ${1} "* | *" ${arg} ${1} "*) |
21019 |
+ prev=darwin_framework_skip ;; |
21020 |
+ *) compiler_flags="$compiler_flags $arg" |
21021 |
+ prev=darwin_framework ;; |
21022 |
+ esac |
21023 |
+ compile_command="$compile_command $arg" |
21024 |
+ finalize_command="$finalize_command $arg" |
21025 |
+ continue |
21026 |
+ ;; |
21027 |
+ |
21028 |
-inst-prefix-dir) |
21029 |
prev=inst_prefix |
21030 |
continue |
21031 |
@@ -1311,7 +1520,8 @@ |
21032 |
absdir=`cd "$dir" && pwd` |
21033 |
if test -z "$absdir"; then |
21034 |
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 |
21035 |
- exit $EXIT_FAILURE |
21036 |
+ absdir="$dir" |
21037 |
+ notinst_path="$notinst_path $dir" |
21038 |
fi |
21039 |
dir="$absdir" |
21040 |
;; |
21041 |
@@ -1325,10 +1535,15 @@ |
21042 |
esac |
21043 |
case $host in |
21044 |
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) |
21045 |
+ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` |
21046 |
case :$dllsearchpath: in |
21047 |
*":$dir:"*) ;; |
21048 |
*) dllsearchpath="$dllsearchpath:$dir";; |
21049 |
esac |
21050 |
+ case :$dllsearchpath: in |
21051 |
+ *":$testbindir:"*) ;; |
21052 |
+ *) dllsearchpath="$dllsearchpath:$testbindir";; |
21053 |
+ esac |
21054 |
;; |
21055 |
esac |
21056 |
continue |
21057 |
@@ -1337,15 +1552,15 @@ |
21058 |
-l*) |
21059 |
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then |
21060 |
case $host in |
21061 |
- *-*-cygwin* | *-*-pw32* | *-*-beos*) |
21062 |
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) |
21063 |
# These systems don't actually have a C or math library (as such) |
21064 |
continue |
21065 |
;; |
21066 |
- *-*-mingw* | *-*-os2*) |
21067 |
+ *-*-os2*) |
21068 |
# These systems don't actually have a C library (as such) |
21069 |
test "X$arg" = "X-lc" && continue |
21070 |
;; |
21071 |
- *-*-openbsd* | *-*-freebsd*) |
21072 |
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) |
21073 |
# Do not include libc due to us having libc/libc_r. |
21074 |
test "X$arg" = "X-lc" && continue |
21075 |
;; |
21076 |
@@ -1353,10 +1568,19 @@ |
21077 |
# Rhapsody C and math libraries are in the System framework |
21078 |
deplibs="$deplibs -framework System" |
21079 |
continue |
21080 |
+ ;; |
21081 |
+ *-*-sco3.2v5* | *-*-sco5v6*) |
21082 |
+ # Causes problems with __ctype |
21083 |
+ test "X$arg" = "X-lc" && continue |
21084 |
+ ;; |
21085 |
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) |
21086 |
+ # Compiler inserts libc in the correct place for threads to work |
21087 |
+ test "X$arg" = "X-lc" && continue |
21088 |
+ ;; |
21089 |
esac |
21090 |
elif test "X$arg" = "X-lc_r"; then |
21091 |
case $host in |
21092 |
- *-*-openbsd* | *-*-freebsd*) |
21093 |
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) |
21094 |
# Do not include libc_r directly, use -pthread flag. |
21095 |
continue |
21096 |
;; |
21097 |
@@ -1366,8 +1590,20 @@ |
21098 |
continue |
21099 |
;; |
21100 |
|
21101 |
+ # Tru64 UNIX uses -model [arg] to determine the layout of C++ |
21102 |
+ # classes, name mangling, and exception handling. |
21103 |
+ -model) |
21104 |
+ compile_command="$compile_command $arg" |
21105 |
+ compiler_flags="$compiler_flags $arg" |
21106 |
+ finalize_command="$finalize_command $arg" |
21107 |
+ prev=xcompiler |
21108 |
+ continue |
21109 |
+ ;; |
21110 |
+ |
21111 |
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) |
21112 |
- deplibs="$deplibs $arg" |
21113 |
+ compiler_flags="$compiler_flags $arg" |
21114 |
+ compile_command="$compile_command $arg" |
21115 |
+ finalize_command="$finalize_command $arg" |
21116 |
continue |
21117 |
;; |
21118 |
|
21119 |
@@ -1376,13 +1612,19 @@ |
21120 |
continue |
21121 |
;; |
21122 |
|
21123 |
- # gcc -m* arguments should be passed to the linker via $compiler_flags |
21124 |
- # in order to pass architecture information to the linker |
21125 |
- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo |
21126 |
- # but this is not reliable with gcc because gcc may use -mfoo to |
21127 |
- # select a different linker, different libraries, etc, while |
21128 |
- # -Wl,-mfoo simply passes -mfoo to the linker. |
21129 |
- -m*) |
21130 |
+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler |
21131 |
+ # -r[0-9][0-9]* specifies the processor on the SGI compiler |
21132 |
+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler |
21133 |
+ # +DA*, +DD* enable 64-bit mode on the HP compiler |
21134 |
+ # -q* pass through compiler args for the IBM compiler |
21135 |
+ # -m* pass through architecture-specific compiler args for GCC |
21136 |
+ # -m*, -t[45]*, -txscale* pass through architecture-specific |
21137 |
+ # compiler args for GCC |
21138 |
+ # -pg pass through profiling flag for GCC |
21139 |
+ # @file GCC response files |
21140 |
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ |
21141 |
+ -t[45]*|-txscale*|@*) |
21142 |
+ |
21143 |
# Unknown arguments in both finalize_command and compile_command need |
21144 |
# to be aesthetically quoted because they are evaled later. |
21145 |
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` |
21146 |
@@ -1393,9 +1635,7 @@ |
21147 |
esac |
21148 |
compile_command="$compile_command $arg" |
21149 |
finalize_command="$finalize_command $arg" |
21150 |
- if test "$with_gcc" = "yes" ; then |
21151 |
- compiler_flags="$compiler_flags $arg" |
21152 |
- fi |
21153 |
+ compiler_flags="$compiler_flags $arg" |
21154 |
continue |
21155 |
;; |
21156 |
|
21157 |
@@ -1633,6 +1873,11 @@ |
21158 |
if test -z "$pic_object" || test "$pic_object" = none ; then |
21159 |
arg="$non_pic_object" |
21160 |
fi |
21161 |
+ else |
21162 |
+ # If the PIC object exists, use it instead. |
21163 |
+ # $xdir was prepended to $pic_object above. |
21164 |
+ non_pic_object="$pic_object" |
21165 |
+ non_pic_objects="$non_pic_objects $non_pic_object" |
21166 |
fi |
21167 |
else |
21168 |
# Only an error if not doing a dry-run. |
21169 |
@@ -1738,9 +1983,9 @@ |
21170 |
if test ! -d "$output_objdir"; then |
21171 |
$show "$mkdir $output_objdir" |
21172 |
$run $mkdir $output_objdir |
21173 |
- status=$? |
21174 |
- if test "$status" -ne 0 && test ! -d "$output_objdir"; then |
21175 |
- exit $status |
21176 |
+ exit_status=$? |
21177 |
+ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then |
21178 |
+ exit $exit_status |
21179 |
fi |
21180 |
fi |
21181 |
|
21182 |
@@ -1803,7 +2048,6 @@ |
21183 |
newlib_search_path= |
21184 |
need_relink=no # whether we're linking any uninstalled libtool libraries |
21185 |
notinst_deplibs= # not-installed libtool libraries |
21186 |
- notinst_path= # paths that contain not-installed libtool libraries |
21187 |
case $linkmode in |
21188 |
lib) |
21189 |
passes="conv link" |
21190 |
@@ -1858,7 +2102,7 @@ |
21191 |
compile_deplibs="$deplib $compile_deplibs" |
21192 |
finalize_deplibs="$deplib $finalize_deplibs" |
21193 |
else |
21194 |
- deplibs="$deplib $deplibs" |
21195 |
+ compiler_flags="$compiler_flags $deplib" |
21196 |
fi |
21197 |
continue |
21198 |
;; |
21199 |
@@ -1977,7 +2221,22 @@ |
21200 |
fi |
21201 |
case $linkmode in |
21202 |
lib) |
21203 |
- if test "$deplibs_check_method" != pass_all; then |
21204 |
+ valid_a_lib=no |
21205 |
+ case $deplibs_check_method in |
21206 |
+ match_pattern*) |
21207 |
+ set dummy $deplibs_check_method |
21208 |
+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` |
21209 |
+ if eval $echo \"$deplib\" 2>/dev/null \ |
21210 |
+ | $SED 10q \ |
21211 |
+ | $EGREP "$match_pattern_regex" > /dev/null; then |
21212 |
+ valid_a_lib=yes |
21213 |
+ fi |
21214 |
+ ;; |
21215 |
+ pass_all) |
21216 |
+ valid_a_lib=yes |
21217 |
+ ;; |
21218 |
+ esac |
21219 |
+ if test "$valid_a_lib" != yes; then |
21220 |
$echo |
21221 |
$echo "*** Warning: Trying to link with static lib archive $deplib." |
21222 |
$echo "*** I have the capability to make that library automatically link in when" |
21223 |
@@ -2027,7 +2286,7 @@ |
21224 |
esac # case $deplib |
21225 |
if test "$found" = yes || test -f "$lib"; then : |
21226 |
else |
21227 |
- $echo "$modename: cannot find the library \`$lib'" 1>&2 |
21228 |
+ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 |
21229 |
exit $EXIT_FAILURE |
21230 |
fi |
21231 |
|
21232 |
@@ -2051,6 +2310,8 @@ |
21233 |
# it will not redefine variables installed, or shouldnotlink |
21234 |
installed=yes |
21235 |
shouldnotlink=no |
21236 |
+ avoidtemprpath= |
21237 |
+ |
21238 |
|
21239 |
# Read the .la file |
21240 |
case $lib in |
21241 |
@@ -2149,11 +2410,19 @@ |
21242 |
dir="$libdir" |
21243 |
absdir="$libdir" |
21244 |
fi |
21245 |
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes |
21246 |
else |
21247 |
- dir="$ladir/$objdir" |
21248 |
- absdir="$abs_ladir/$objdir" |
21249 |
- # Remove this search path later |
21250 |
- notinst_path="$notinst_path $abs_ladir" |
21251 |
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then |
21252 |
+ dir="$ladir" |
21253 |
+ absdir="$abs_ladir" |
21254 |
+ # Remove this search path later |
21255 |
+ notinst_path="$notinst_path $abs_ladir" |
21256 |
+ else |
21257 |
+ dir="$ladir/$objdir" |
21258 |
+ absdir="$abs_ladir/$objdir" |
21259 |
+ # Remove this search path later |
21260 |
+ notinst_path="$notinst_path $abs_ladir" |
21261 |
+ fi |
21262 |
fi # $installed = yes |
21263 |
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` |
21264 |
|
21265 |
@@ -2226,12 +2495,12 @@ |
21266 |
if test -n "$library_names" && |
21267 |
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then |
21268 |
# We need to hardcode the library path |
21269 |
- if test -n "$shlibpath_var"; then |
21270 |
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then |
21271 |
# Make sure the rpath contains only unique directories. |
21272 |
case "$temp_rpath " in |
21273 |
*" $dir "*) ;; |
21274 |
*" $absdir "*) ;; |
21275 |
- *) temp_rpath="$temp_rpath $dir" ;; |
21276 |
+ *) temp_rpath="$temp_rpath $absdir" ;; |
21277 |
esac |
21278 |
fi |
21279 |
|
21280 |
@@ -2268,8 +2537,12 @@ |
21281 |
fi |
21282 |
|
21283 |
link_static=no # Whether the deplib will be linked statically |
21284 |
+ use_static_libs=$prefer_static_libs |
21285 |
+ if test "$use_static_libs" = built && test "$installed" = yes ; then |
21286 |
+ use_static_libs=no |
21287 |
+ fi |
21288 |
if test -n "$library_names" && |
21289 |
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then |
21290 |
+ { test "$use_static_libs" = no || test -z "$old_library"; }; then |
21291 |
if test "$installed" = no; then |
21292 |
notinst_deplibs="$notinst_deplibs $lib" |
21293 |
need_relink=yes |
21294 |
@@ -2382,11 +2655,15 @@ |
21295 |
if test "$hardcode_direct" = no; then |
21296 |
add="$dir/$linklib" |
21297 |
case $host in |
21298 |
- *-*-sco3.2v5* ) add_dir="-L$dir" ;; |
21299 |
+ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; |
21300 |
+ *-*-sysv4*uw2*) add_dir="-L$dir" ;; |
21301 |
+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ |
21302 |
+ *-*-unixware7*) add_dir="-L$dir" ;; |
21303 |
*-*-darwin* ) |
21304 |
# if the lib is a module then we can not link against |
21305 |
# it, someone is ignoring the new warnings I added |
21306 |
- if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then |
21307 |
+ if /usr/bin/file -L $add 2> /dev/null | |
21308 |
+ $EGREP ": [^:]* bundle" >/dev/null ; then |
21309 |
$echo "** Warning, lib $linklib is a module, not a shared library" |
21310 |
if test -z "$old_library" ; then |
21311 |
$echo |
21312 |
@@ -2417,7 +2694,7 @@ |
21313 |
add_dir="-L$dir" |
21314 |
# Try looking first in the location we're being installed to. |
21315 |
if test -n "$inst_prefix_dir"; then |
21316 |
- case "$libdir" in |
21317 |
+ case $libdir in |
21318 |
[\\/]*) |
21319 |
add_dir="$add_dir -L$inst_prefix_dir$libdir" |
21320 |
;; |
21321 |
@@ -2490,7 +2767,7 @@ |
21322 |
add_dir="-L$libdir" |
21323 |
# Try looking first in the location we're being installed to. |
21324 |
if test -n "$inst_prefix_dir"; then |
21325 |
- case "$libdir" in |
21326 |
+ case $libdir in |
21327 |
[\\/]*) |
21328 |
add_dir="$add_dir -L$inst_prefix_dir$libdir" |
21329 |
;; |
21330 |
@@ -2551,8 +2828,6 @@ |
21331 |
fi |
21332 |
fi |
21333 |
else |
21334 |
- convenience="$convenience $dir/$old_library" |
21335 |
- old_convenience="$old_convenience $dir/$old_library" |
21336 |
deplibs="$dir/$old_library $deplibs" |
21337 |
link_static=yes |
21338 |
fi |
21339 |
@@ -2670,12 +2945,12 @@ |
21340 |
*) continue ;; |
21341 |
esac |
21342 |
case " $deplibs " in |
21343 |
- *" $depdepl "*) ;; |
21344 |
- *) deplibs="$depdepl $deplibs" ;; |
21345 |
+ *" $path "*) ;; |
21346 |
+ *) deplibs="$path $deplibs" ;; |
21347 |
esac |
21348 |
case " $deplibs " in |
21349 |
- *" $path "*) ;; |
21350 |
- *) deplibs="$deplibs $path" ;; |
21351 |
+ *" $depdepl "*) ;; |
21352 |
+ *) deplibs="$depdepl $deplibs" ;; |
21353 |
esac |
21354 |
done |
21355 |
fi # link_all_deplibs != no |
21356 |
@@ -2947,7 +3222,7 @@ |
21357 |
case $current in |
21358 |
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; |
21359 |
*) |
21360 |
- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 |
21361 |
+ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 |
21362 |
$echo "$modename: \`$vinfo' is not valid version information" 1>&2 |
21363 |
exit $EXIT_FAILURE |
21364 |
;; |
21365 |
@@ -2956,7 +3231,7 @@ |
21366 |
case $revision in |
21367 |
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; |
21368 |
*) |
21369 |
- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 |
21370 |
+ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 |
21371 |
$echo "$modename: \`$vinfo' is not valid version information" 1>&2 |
21372 |
exit $EXIT_FAILURE |
21373 |
;; |
21374 |
@@ -2965,7 +3240,7 @@ |
21375 |
case $age in |
21376 |
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; |
21377 |
*) |
21378 |
- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 |
21379 |
+ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 |
21380 |
$echo "$modename: \`$vinfo' is not valid version information" 1>&2 |
21381 |
exit $EXIT_FAILURE |
21382 |
;; |
21383 |
@@ -2991,7 +3266,7 @@ |
21384 |
versuffix="$major.$age.$revision" |
21385 |
# Darwin ld doesn't like 0 for these options... |
21386 |
minor_current=`expr $current + 1` |
21387 |
- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" |
21388 |
+ verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" |
21389 |
;; |
21390 |
|
21391 |
freebsd-aout) |
21392 |
@@ -3144,9 +3419,9 @@ |
21393 |
|
21394 |
# Eliminate all temporary directories. |
21395 |
for path in $notinst_path; do |
21396 |
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` |
21397 |
- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` |
21398 |
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` |
21399 |
+ lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` |
21400 |
+ deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` |
21401 |
+ dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` |
21402 |
done |
21403 |
|
21404 |
if test -n "$xrpath"; then |
21405 |
@@ -3197,9 +3472,14 @@ |
21406 |
*-*-netbsd*) |
21407 |
# Don't link with libc until the a.out ld.so is fixed. |
21408 |
;; |
21409 |
- *-*-openbsd* | *-*-freebsd*) |
21410 |
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) |
21411 |
# Do not include libc due to us having libc/libc_r. |
21412 |
- test "X$arg" = "X-lc" && continue |
21413 |
+ ;; |
21414 |
+ *-*-sco3.2v5* | *-*-sco5v6*) |
21415 |
+ # Causes problems with __ctype |
21416 |
+ ;; |
21417 |
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) |
21418 |
+ # Compiler inserts libc in the correct place for threads to work |
21419 |
;; |
21420 |
*) |
21421 |
# Add libc to deplibs on all other systems if necessary. |
21422 |
@@ -3243,11 +3523,11 @@ |
21423 |
int main() { return 0; } |
21424 |
EOF |
21425 |
$rm conftest |
21426 |
- $LTCC -o conftest conftest.c $deplibs |
21427 |
+ $LTCC $LTCFLAGS -o conftest conftest.c $deplibs |
21428 |
if test "$?" -eq 0 ; then |
21429 |
ldd_output=`ldd conftest` |
21430 |
for i in $deplibs; do |
21431 |
- name="`expr $i : '-l\(.*\)'`" |
21432 |
+ name=`expr $i : '-l\(.*\)'` |
21433 |
# If $name is empty we are operating on a -L argument. |
21434 |
if test "$name" != "" && test "$name" -ne "0"; then |
21435 |
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
21436 |
@@ -3284,11 +3564,11 @@ |
21437 |
# Error occurred in the first compile. Let's try to salvage |
21438 |
# the situation: Compile a separate program for each library. |
21439 |
for i in $deplibs; do |
21440 |
- name="`expr $i : '-l\(.*\)'`" |
21441 |
+ name=`expr $i : '-l\(.*\)'` |
21442 |
# If $name is empty we are operating on a -L argument. |
21443 |
if test "$name" != "" && test "$name" != "0"; then |
21444 |
$rm conftest |
21445 |
- $LTCC -o conftest conftest.c $i |
21446 |
+ $LTCC $LTCFLAGS -o conftest conftest.c $i |
21447 |
# Did it work? |
21448 |
if test "$?" -eq 0 ; then |
21449 |
ldd_output=`ldd conftest` |
21450 |
@@ -3336,7 +3616,7 @@ |
21451 |
set dummy $deplibs_check_method |
21452 |
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` |
21453 |
for a_deplib in $deplibs; do |
21454 |
- name="`expr $a_deplib : '-l\(.*\)'`" |
21455 |
+ name=`expr $a_deplib : '-l\(.*\)'` |
21456 |
# If $name is empty we are operating on a -L argument. |
21457 |
if test "$name" != "" && test "$name" != "0"; then |
21458 |
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
21459 |
@@ -3405,7 +3685,7 @@ |
21460 |
set dummy $deplibs_check_method |
21461 |
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` |
21462 |
for a_deplib in $deplibs; do |
21463 |
- name="`expr $a_deplib : '-l\(.*\)'`" |
21464 |
+ name=`expr $a_deplib : '-l\(.*\)'` |
21465 |
# If $name is empty we are operating on a -L argument. |
21466 |
if test -n "$name" && test "$name" != "0"; then |
21467 |
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
21468 |
@@ -3535,6 +3815,35 @@ |
21469 |
deplibs=$newdeplibs |
21470 |
fi |
21471 |
|
21472 |
+ |
21473 |
+ # move library search paths that coincide with paths to not yet |
21474 |
+ # installed libraries to the beginning of the library search list |
21475 |
+ new_libs= |
21476 |
+ for path in $notinst_path; do |
21477 |
+ case " $new_libs " in |
21478 |
+ *" -L$path/$objdir "*) ;; |
21479 |
+ *) |
21480 |
+ case " $deplibs " in |
21481 |
+ *" -L$path/$objdir "*) |
21482 |
+ new_libs="$new_libs -L$path/$objdir" ;; |
21483 |
+ esac |
21484 |
+ ;; |
21485 |
+ esac |
21486 |
+ done |
21487 |
+ for deplib in $deplibs; do |
21488 |
+ case $deplib in |
21489 |
+ -L*) |
21490 |
+ case " $new_libs " in |
21491 |
+ *" $deplib "*) ;; |
21492 |
+ *) new_libs="$new_libs $deplib" ;; |
21493 |
+ esac |
21494 |
+ ;; |
21495 |
+ *) new_libs="$new_libs $deplib" ;; |
21496 |
+ esac |
21497 |
+ done |
21498 |
+ deplibs="$new_libs" |
21499 |
+ |
21500 |
+ |
21501 |
# All the library-specific variables (install_libdir is set above). |
21502 |
library_names= |
21503 |
old_library= |
21504 |
@@ -3618,6 +3927,7 @@ |
21505 |
fi |
21506 |
|
21507 |
lib="$output_objdir/$realname" |
21508 |
+ linknames= |
21509 |
for link |
21510 |
do |
21511 |
linknames="$linknames $link" |
21512 |
@@ -3646,6 +3956,9 @@ |
21513 |
# The command line is too long to execute in one step. |
21514 |
$show "using reloadable object file for export list..." |
21515 |
skipped_export=: |
21516 |
+ # Break out early, otherwise skipped_export may be |
21517 |
+ # set to false by a later but shorter cmd. |
21518 |
+ break |
21519 |
fi |
21520 |
done |
21521 |
IFS="$save_ifs" |
21522 |
@@ -3679,67 +3992,13 @@ |
21523 |
eval libobjs=\"\$libobjs $whole_archive_flag_spec\" |
21524 |
else |
21525 |
gentop="$output_objdir/${outputname}x" |
21526 |
- $show "${rm}r $gentop" |
21527 |
- $run ${rm}r "$gentop" |
21528 |
- $show "$mkdir $gentop" |
21529 |
- $run $mkdir "$gentop" |
21530 |
- status=$? |
21531 |
- if test "$status" -ne 0 && test ! -d "$gentop"; then |
21532 |
- exit $status |
21533 |
- fi |
21534 |
generated="$generated $gentop" |
21535 |
|
21536 |
- for xlib in $convenience; do |
21537 |
- # Extract the objects. |
21538 |
- case $xlib in |
21539 |
- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; |
21540 |
- *) xabs=`pwd`"/$xlib" ;; |
21541 |
- esac |
21542 |
- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` |
21543 |
- xdir="$gentop/$xlib" |
21544 |
- |
21545 |
- $show "${rm}r $xdir" |
21546 |
- $run ${rm}r "$xdir" |
21547 |
- $show "$mkdir $xdir" |
21548 |
- $run $mkdir "$xdir" |
21549 |
- status=$? |
21550 |
- if test "$status" -ne 0 && test ! -d "$xdir"; then |
21551 |
- exit $status |
21552 |
- fi |
21553 |
- # We will extract separately just the conflicting names and we will no |
21554 |
- # longer touch any unique names. It is faster to leave these extract |
21555 |
- # automatically by $AR in one run. |
21556 |
- $show "(cd $xdir && $AR x $xabs)" |
21557 |
- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? |
21558 |
- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then |
21559 |
- : |
21560 |
- else |
21561 |
- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 |
21562 |
- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 |
21563 |
- $AR t "$xabs" | sort | uniq -cd | while read -r count name |
21564 |
- do |
21565 |
- i=1 |
21566 |
- while test "$i" -le "$count" |
21567 |
- do |
21568 |
- # Put our $i before any first dot (extension) |
21569 |
- # Never overwrite any file |
21570 |
- name_to="$name" |
21571 |
- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" |
21572 |
- do |
21573 |
- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` |
21574 |
- done |
21575 |
- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" |
21576 |
- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? |
21577 |
- i=`expr $i + 1` |
21578 |
- done |
21579 |
- done |
21580 |
- fi |
21581 |
- |
21582 |
- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` |
21583 |
- done |
21584 |
+ func_extract_archives $gentop $convenience |
21585 |
+ libobjs="$libobjs $func_extract_archives_result" |
21586 |
fi |
21587 |
fi |
21588 |
- |
21589 |
+ |
21590 |
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then |
21591 |
eval flag=\"$thread_safe_flag_spec\" |
21592 |
linker_flags="$linker_flags $flag" |
21593 |
@@ -3769,7 +4028,8 @@ |
21594 |
fi |
21595 |
fi |
21596 |
|
21597 |
- if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && |
21598 |
+ if test "X$skipped_export" != "X:" && |
21599 |
+ len=`expr "X$test_cmds" : ".*" 2>/dev/null` && |
21600 |
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then |
21601 |
: |
21602 |
else |
21603 |
@@ -3788,6 +4048,7 @@ |
21604 |
save_libobjs=$libobjs |
21605 |
fi |
21606 |
save_output=$output |
21607 |
+ output_la=`$echo "X$output" | $Xsed -e "$basename"` |
21608 |
|
21609 |
# Clear the reloadable object creation command queue and |
21610 |
# initialize k to one. |
21611 |
@@ -3797,13 +4058,13 @@ |
21612 |
delfiles= |
21613 |
last_robj= |
21614 |
k=1 |
21615 |
- output=$output_objdir/$save_output-${k}.$objext |
21616 |
+ output=$output_objdir/$output_la-${k}.$objext |
21617 |
# Loop over the list of objects to be linked. |
21618 |
for obj in $save_libobjs |
21619 |
do |
21620 |
eval test_cmds=\"$reload_cmds $objlist $last_robj\" |
21621 |
if test "X$objlist" = X || |
21622 |
- { len=`expr "X$test_cmds" : ".*"` && |
21623 |
+ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && |
21624 |
test "$len" -le "$max_cmd_len"; }; then |
21625 |
objlist="$objlist $obj" |
21626 |
else |
21627 |
@@ -3817,9 +4078,9 @@ |
21628 |
# the last one created. |
21629 |
eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" |
21630 |
fi |
21631 |
- last_robj=$output_objdir/$save_output-${k}.$objext |
21632 |
+ last_robj=$output_objdir/$output_la-${k}.$objext |
21633 |
k=`expr $k + 1` |
21634 |
- output=$output_objdir/$save_output-${k}.$objext |
21635 |
+ output=$output_objdir/$output_la-${k}.$objext |
21636 |
objlist=$obj |
21637 |
len=1 |
21638 |
fi |
21639 |
@@ -3839,13 +4100,13 @@ |
21640 |
eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" |
21641 |
fi |
21642 |
|
21643 |
- # Set up a command to remove the reloadale object files |
21644 |
+ # Set up a command to remove the reloadable object files |
21645 |
# after they are used. |
21646 |
i=0 |
21647 |
while test "$i" -lt "$k" |
21648 |
do |
21649 |
i=`expr $i + 1` |
21650 |
- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" |
21651 |
+ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" |
21652 |
done |
21653 |
|
21654 |
$echo "creating a temporary reloadable object file: $output" |
21655 |
@@ -3893,13 +4154,30 @@ |
21656 |
IFS="$save_ifs" |
21657 |
eval cmd=\"$cmd\" |
21658 |
$show "$cmd" |
21659 |
- $run eval "$cmd" || exit $? |
21660 |
+ $run eval "$cmd" || { |
21661 |
+ lt_exit=$? |
21662 |
+ |
21663 |
+ # Restore the uninstalled library and exit |
21664 |
+ if test "$mode" = relink; then |
21665 |
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' |
21666 |
+ fi |
21667 |
+ |
21668 |
+ exit $lt_exit |
21669 |
+ } |
21670 |
done |
21671 |
IFS="$save_ifs" |
21672 |
|
21673 |
# Restore the uninstalled library and exit |
21674 |
if test "$mode" = relink; then |
21675 |
$run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? |
21676 |
+ |
21677 |
+ if test -n "$convenience"; then |
21678 |
+ if test -z "$whole_archive_flag_spec"; then |
21679 |
+ $show "${rm}r $gentop" |
21680 |
+ $run ${rm}r "$gentop" |
21681 |
+ fi |
21682 |
+ fi |
21683 |
+ |
21684 |
exit $EXIT_SUCCESS |
21685 |
fi |
21686 |
|
21687 |
@@ -3977,64 +4255,10 @@ |
21688 |
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" |
21689 |
else |
21690 |
gentop="$output_objdir/${obj}x" |
21691 |
- $show "${rm}r $gentop" |
21692 |
- $run ${rm}r "$gentop" |
21693 |
- $show "$mkdir $gentop" |
21694 |
- $run $mkdir "$gentop" |
21695 |
- status=$? |
21696 |
- if test "$status" -ne 0 && test ! -d "$gentop"; then |
21697 |
- exit $status |
21698 |
- fi |
21699 |
generated="$generated $gentop" |
21700 |
|
21701 |
- for xlib in $convenience; do |
21702 |
- # Extract the objects. |
21703 |
- case $xlib in |
21704 |
- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; |
21705 |
- *) xabs=`pwd`"/$xlib" ;; |
21706 |
- esac |
21707 |
- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` |
21708 |
- xdir="$gentop/$xlib" |
21709 |
- |
21710 |
- $show "${rm}r $xdir" |
21711 |
- $run ${rm}r "$xdir" |
21712 |
- $show "$mkdir $xdir" |
21713 |
- $run $mkdir "$xdir" |
21714 |
- status=$? |
21715 |
- if test "$status" -ne 0 && test ! -d "$xdir"; then |
21716 |
- exit $status |
21717 |
- fi |
21718 |
- # We will extract separately just the conflicting names and we will no |
21719 |
- # longer touch any unique names. It is faster to leave these extract |
21720 |
- # automatically by $AR in one run. |
21721 |
- $show "(cd $xdir && $AR x $xabs)" |
21722 |
- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? |
21723 |
- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then |
21724 |
- : |
21725 |
- else |
21726 |
- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 |
21727 |
- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 |
21728 |
- $AR t "$xabs" | sort | uniq -cd | while read -r count name |
21729 |
- do |
21730 |
- i=1 |
21731 |
- while test "$i" -le "$count" |
21732 |
- do |
21733 |
- # Put our $i before any first dot (extension) |
21734 |
- # Never overwrite any file |
21735 |
- name_to="$name" |
21736 |
- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" |
21737 |
- do |
21738 |
- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` |
21739 |
- done |
21740 |
- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" |
21741 |
- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? |
21742 |
- i=`expr $i + 1` |
21743 |
- done |
21744 |
- done |
21745 |
- fi |
21746 |
- |
21747 |
- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` |
21748 |
- done |
21749 |
+ func_extract_archives $gentop $convenience |
21750 |
+ reload_conv_objs="$reload_objs $func_extract_archives_result" |
21751 |
fi |
21752 |
fi |
21753 |
|
21754 |
@@ -4135,6 +4359,35 @@ |
21755 |
;; |
21756 |
esac |
21757 |
|
21758 |
+ |
21759 |
+ # move library search paths that coincide with paths to not yet |
21760 |
+ # installed libraries to the beginning of the library search list |
21761 |
+ new_libs= |
21762 |
+ for path in $notinst_path; do |
21763 |
+ case " $new_libs " in |
21764 |
+ *" -L$path/$objdir "*) ;; |
21765 |
+ *) |
21766 |
+ case " $compile_deplibs " in |
21767 |
+ *" -L$path/$objdir "*) |
21768 |
+ new_libs="$new_libs -L$path/$objdir" ;; |
21769 |
+ esac |
21770 |
+ ;; |
21771 |
+ esac |
21772 |
+ done |
21773 |
+ for deplib in $compile_deplibs; do |
21774 |
+ case $deplib in |
21775 |
+ -L*) |
21776 |
+ case " $new_libs " in |
21777 |
+ *" $deplib "*) ;; |
21778 |
+ *) new_libs="$new_libs $deplib" ;; |
21779 |
+ esac |
21780 |
+ ;; |
21781 |
+ *) new_libs="$new_libs $deplib" ;; |
21782 |
+ esac |
21783 |
+ done |
21784 |
+ compile_deplibs="$new_libs" |
21785 |
+ |
21786 |
+ |
21787 |
compile_command="$compile_command $compile_deplibs" |
21788 |
finalize_command="$finalize_command $finalize_deplibs" |
21789 |
|
21790 |
@@ -4179,10 +4432,15 @@ |
21791 |
fi |
21792 |
case $host in |
21793 |
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) |
21794 |
+ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` |
21795 |
case :$dllsearchpath: in |
21796 |
*":$libdir:"*) ;; |
21797 |
*) dllsearchpath="$dllsearchpath:$libdir";; |
21798 |
esac |
21799 |
+ case :$dllsearchpath: in |
21800 |
+ *":$testbindir:"*) ;; |
21801 |
+ *) dllsearchpath="$dllsearchpath:$testbindir";; |
21802 |
+ esac |
21803 |
;; |
21804 |
esac |
21805 |
done |
21806 |
@@ -4296,13 +4554,25 @@ |
21807 |
|
21808 |
# Prepare the list of exported symbols |
21809 |
if test -z "$export_symbols"; then |
21810 |
- export_symbols="$output_objdir/$output.exp" |
21811 |
+ export_symbols="$output_objdir/$outputname.exp" |
21812 |
$run $rm $export_symbols |
21813 |
- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' |
21814 |
+ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' |
21815 |
+ case $host in |
21816 |
+ *cygwin* | *mingw* ) |
21817 |
+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' |
21818 |
+ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' |
21819 |
+ ;; |
21820 |
+ esac |
21821 |
else |
21822 |
- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' |
21823 |
- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' |
21824 |
+ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' |
21825 |
+ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' |
21826 |
$run eval 'mv "$nlist"T "$nlist"' |
21827 |
+ case $host in |
21828 |
+ *cygwin* | *mingw* ) |
21829 |
+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' |
21830 |
+ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' |
21831 |
+ ;; |
21832 |
+ esac |
21833 |
fi |
21834 |
fi |
21835 |
|
21836 |
@@ -4353,7 +4623,26 @@ |
21837 |
#endif |
21838 |
|
21839 |
/* The mapping between symbol names and symbols. */ |
21840 |
+" |
21841 |
+ |
21842 |
+ case $host in |
21843 |
+ *cygwin* | *mingw* ) |
21844 |
+ $echo >> "$output_objdir/$dlsyms" "\ |
21845 |
+/* DATA imports from DLLs on WIN32 can't be const, because |
21846 |
+ runtime relocations are performed -- see ld's documentation |
21847 |
+ on pseudo-relocs */ |
21848 |
+struct { |
21849 |
+" |
21850 |
+ ;; |
21851 |
+ * ) |
21852 |
+ $echo >> "$output_objdir/$dlsyms" "\ |
21853 |
const struct { |
21854 |
+" |
21855 |
+ ;; |
21856 |
+ esac |
21857 |
+ |
21858 |
+ |
21859 |
+ $echo >> "$output_objdir/$dlsyms" "\ |
21860 |
const char *name; |
21861 |
lt_ptr address; |
21862 |
} |
21863 |
@@ -4400,16 +4689,29 @@ |
21864 |
esac |
21865 |
|
21866 |
# Now compile the dynamic symbol file. |
21867 |
- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" |
21868 |
- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? |
21869 |
+ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" |
21870 |
+ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? |
21871 |
|
21872 |
# Clean up the generated files. |
21873 |
$show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" |
21874 |
$run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" |
21875 |
|
21876 |
# Transform the symbol file into the correct name. |
21877 |
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` |
21878 |
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` |
21879 |
+ case $host in |
21880 |
+ *cygwin* | *mingw* ) |
21881 |
+ if test -f "$output_objdir/${outputname}.def" ; then |
21882 |
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` |
21883 |
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` |
21884 |
+ else |
21885 |
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` |
21886 |
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` |
21887 |
+ fi |
21888 |
+ ;; |
21889 |
+ * ) |
21890 |
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` |
21891 |
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` |
21892 |
+ ;; |
21893 |
+ esac |
21894 |
;; |
21895 |
*) |
21896 |
$echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 |
21897 |
@@ -4434,7 +4736,7 @@ |
21898 |
# We have no uninstalled library dependencies, so finalize right now. |
21899 |
$show "$link_command" |
21900 |
$run eval "$link_command" |
21901 |
- status=$? |
21902 |
+ exit_status=$? |
21903 |
|
21904 |
# Delete the generated files. |
21905 |
if test -n "$dlsyms"; then |
21906 |
@@ -4442,7 +4744,7 @@ |
21907 |
$run $rm "$output_objdir/${outputname}S.${objext}" |
21908 |
fi |
21909 |
|
21910 |
- exit $status |
21911 |
+ exit $exit_status |
21912 |
fi |
21913 |
|
21914 |
if test -n "$shlibpath_var"; then |
21915 |
@@ -4582,10 +4884,12 @@ |
21916 |
esac |
21917 |
case $host in |
21918 |
*cygwin* | *mingw* ) |
21919 |
- cwrappersource=`$echo ${objdir}/lt-${output}.c` |
21920 |
- cwrapper=`$echo ${output}.exe` |
21921 |
- $rm $cwrappersource $cwrapper |
21922 |
- trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 |
21923 |
+ output_name=`basename $output` |
21924 |
+ output_path=`dirname $output` |
21925 |
+ cwrappersource="$output_path/$objdir/lt-$output_name.c" |
21926 |
+ cwrapper="$output_path/$output_name.exe" |
21927 |
+ $rm $cwrappersource $cwrapper |
21928 |
+ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 |
21929 |
|
21930 |
cat > $cwrappersource <<EOF |
21931 |
|
21932 |
@@ -4610,6 +4914,9 @@ |
21933 |
#include <malloc.h> |
21934 |
#include <stdarg.h> |
21935 |
#include <assert.h> |
21936 |
+#include <string.h> |
21937 |
+#include <ctype.h> |
21938 |
+#include <sys/stat.h> |
21939 |
|
21940 |
#if defined(PATH_MAX) |
21941 |
# define LT_PATHMAX PATH_MAX |
21942 |
@@ -4620,15 +4927,19 @@ |
21943 |
#endif |
21944 |
|
21945 |
#ifndef DIR_SEPARATOR |
21946 |
-#define DIR_SEPARATOR '/' |
21947 |
+# define DIR_SEPARATOR '/' |
21948 |
+# define PATH_SEPARATOR ':' |
21949 |
#endif |
21950 |
|
21951 |
#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ |
21952 |
defined (__OS2__) |
21953 |
-#define HAVE_DOS_BASED_FILE_SYSTEM |
21954 |
-#ifndef DIR_SEPARATOR_2 |
21955 |
-#define DIR_SEPARATOR_2 '\\' |
21956 |
-#endif |
21957 |
+# define HAVE_DOS_BASED_FILE_SYSTEM |
21958 |
+# ifndef DIR_SEPARATOR_2 |
21959 |
+# define DIR_SEPARATOR_2 '\\' |
21960 |
+# endif |
21961 |
+# ifndef PATH_SEPARATOR_2 |
21962 |
+# define PATH_SEPARATOR_2 ';' |
21963 |
+# endif |
21964 |
#endif |
21965 |
|
21966 |
#ifndef DIR_SEPARATOR_2 |
21967 |
@@ -4638,17 +4949,32 @@ |
21968 |
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) |
21969 |
#endif /* DIR_SEPARATOR_2 */ |
21970 |
|
21971 |
+#ifndef PATH_SEPARATOR_2 |
21972 |
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) |
21973 |
+#else /* PATH_SEPARATOR_2 */ |
21974 |
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) |
21975 |
+#endif /* PATH_SEPARATOR_2 */ |
21976 |
+ |
21977 |
#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) |
21978 |
#define XFREE(stale) do { \ |
21979 |
if (stale) { free ((void *) stale); stale = 0; } \ |
21980 |
} while (0) |
21981 |
|
21982 |
+/* -DDEBUG is fairly common in CFLAGS. */ |
21983 |
+#undef DEBUG |
21984 |
+#if defined DEBUGWRAPPER |
21985 |
+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) |
21986 |
+#else |
21987 |
+# define DEBUG(format, ...) |
21988 |
+#endif |
21989 |
+ |
21990 |
const char *program_name = NULL; |
21991 |
|
21992 |
void * xmalloc (size_t num); |
21993 |
char * xstrdup (const char *string); |
21994 |
-char * basename (const char *name); |
21995 |
-char * fnqualify(const char *path); |
21996 |
+const char * base_name (const char *name); |
21997 |
+char * find_executable(const char *wrapper); |
21998 |
+int check_executable(const char *path); |
21999 |
char * strendzap(char *str, const char *pat); |
22000 |
void lt_fatal (const char *message, ...); |
22001 |
|
22002 |
@@ -4658,29 +4984,51 @@ |
22003 |
char **newargz; |
22004 |
int i; |
22005 |
|
22006 |
- program_name = (char *) xstrdup ((char *) basename (argv[0])); |
22007 |
+ program_name = (char *) xstrdup (base_name (argv[0])); |
22008 |
+ DEBUG("(main) argv[0] : %s\n",argv[0]); |
22009 |
+ DEBUG("(main) program_name : %s\n",program_name); |
22010 |
newargz = XMALLOC(char *, argc+2); |
22011 |
EOF |
22012 |
|
22013 |
- cat >> $cwrappersource <<EOF |
22014 |
- newargz[0] = "$SHELL"; |
22015 |
+ cat >> $cwrappersource <<EOF |
22016 |
+ newargz[0] = (char *) xstrdup("$SHELL"); |
22017 |
EOF |
22018 |
|
22019 |
- cat >> $cwrappersource <<"EOF" |
22020 |
- newargz[1] = fnqualify(argv[0]); |
22021 |
+ cat >> $cwrappersource <<"EOF" |
22022 |
+ newargz[1] = find_executable(argv[0]); |
22023 |
+ if (newargz[1] == NULL) |
22024 |
+ lt_fatal("Couldn't find %s", argv[0]); |
22025 |
+ DEBUG("(main) found exe at : %s\n",newargz[1]); |
22026 |
/* we know the script has the same name, without the .exe */ |
22027 |
/* so make sure newargz[1] doesn't end in .exe */ |
22028 |
strendzap(newargz[1],".exe"); |
22029 |
for (i = 1; i < argc; i++) |
22030 |
newargz[i+1] = xstrdup(argv[i]); |
22031 |
newargz[argc+1] = NULL; |
22032 |
+ |
22033 |
+ for (i=0; i<argc+1; i++) |
22034 |
+ { |
22035 |
+ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); |
22036 |
+ ; |
22037 |
+ } |
22038 |
+ |
22039 |
EOF |
22040 |
|
22041 |
- cat >> $cwrappersource <<EOF |
22042 |
+ case $host_os in |
22043 |
+ mingw*) |
22044 |
+ cat >> $cwrappersource <<EOF |
22045 |
+ execv("$SHELL",(char const **)newargz); |
22046 |
+EOF |
22047 |
+ ;; |
22048 |
+ *) |
22049 |
+ cat >> $cwrappersource <<EOF |
22050 |
execv("$SHELL",newargz); |
22051 |
EOF |
22052 |
+ ;; |
22053 |
+ esac |
22054 |
|
22055 |
- cat >> $cwrappersource <<"EOF" |
22056 |
+ cat >> $cwrappersource <<"EOF" |
22057 |
+ return 127; |
22058 |
} |
22059 |
|
22060 |
void * |
22061 |
@@ -4700,48 +5048,148 @@ |
22062 |
; |
22063 |
} |
22064 |
|
22065 |
-char * |
22066 |
-basename (const char *name) |
22067 |
+const char * |
22068 |
+base_name (const char *name) |
22069 |
{ |
22070 |
const char *base; |
22071 |
|
22072 |
#if defined (HAVE_DOS_BASED_FILE_SYSTEM) |
22073 |
/* Skip over the disk name in MSDOS pathnames. */ |
22074 |
- if (isalpha (name[0]) && name[1] == ':') |
22075 |
+ if (isalpha ((unsigned char)name[0]) && name[1] == ':') |
22076 |
name += 2; |
22077 |
#endif |
22078 |
|
22079 |
for (base = name; *name; name++) |
22080 |
if (IS_DIR_SEPARATOR (*name)) |
22081 |
base = name + 1; |
22082 |
- return (char *) base; |
22083 |
+ return base; |
22084 |
} |
22085 |
|
22086 |
+int |
22087 |
+check_executable(const char * path) |
22088 |
+{ |
22089 |
+ struct stat st; |
22090 |
+ |
22091 |
+ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); |
22092 |
+ if ((!path) || (!*path)) |
22093 |
+ return 0; |
22094 |
+ |
22095 |
+ if ((stat (path, &st) >= 0) && |
22096 |
+ ( |
22097 |
+ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ |
22098 |
+#if defined (S_IXOTH) |
22099 |
+ ((st.st_mode & S_IXOTH) == S_IXOTH) || |
22100 |
+#endif |
22101 |
+#if defined (S_IXGRP) |
22102 |
+ ((st.st_mode & S_IXGRP) == S_IXGRP) || |
22103 |
+#endif |
22104 |
+ ((st.st_mode & S_IXUSR) == S_IXUSR)) |
22105 |
+ ) |
22106 |
+ return 1; |
22107 |
+ else |
22108 |
+ return 0; |
22109 |
+} |
22110 |
+ |
22111 |
+/* Searches for the full path of the wrapper. Returns |
22112 |
+ newly allocated full path name if found, NULL otherwise */ |
22113 |
char * |
22114 |
-fnqualify(const char *path) |
22115 |
+find_executable (const char* wrapper) |
22116 |
{ |
22117 |
- size_t size; |
22118 |
- char *p; |
22119 |
+ int has_slash = 0; |
22120 |
+ const char* p; |
22121 |
+ const char* p_next; |
22122 |
+ /* static buffer for getcwd */ |
22123 |
char tmp[LT_PATHMAX + 1]; |
22124 |
+ int tmp_len; |
22125 |
+ char* concat_name; |
22126 |
|
22127 |
- assert(path != NULL); |
22128 |
+ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); |
22129 |
|
22130 |
- /* Is it qualified already? */ |
22131 |
+ if ((wrapper == NULL) || (*wrapper == '\0')) |
22132 |
+ return NULL; |
22133 |
+ |
22134 |
+ /* Absolute path? */ |
22135 |
#if defined (HAVE_DOS_BASED_FILE_SYSTEM) |
22136 |
- if (isalpha (path[0]) && path[1] == ':') |
22137 |
- return xstrdup (path); |
22138 |
+ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') |
22139 |
+ { |
22140 |
+ concat_name = xstrdup (wrapper); |
22141 |
+ if (check_executable(concat_name)) |
22142 |
+ return concat_name; |
22143 |
+ XFREE(concat_name); |
22144 |
+ } |
22145 |
+ else |
22146 |
+ { |
22147 |
+#endif |
22148 |
+ if (IS_DIR_SEPARATOR (wrapper[0])) |
22149 |
+ { |
22150 |
+ concat_name = xstrdup (wrapper); |
22151 |
+ if (check_executable(concat_name)) |
22152 |
+ return concat_name; |
22153 |
+ XFREE(concat_name); |
22154 |
+ } |
22155 |
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) |
22156 |
+ } |
22157 |
#endif |
22158 |
- if (IS_DIR_SEPARATOR (path[0])) |
22159 |
- return xstrdup (path); |
22160 |
|
22161 |
- /* prepend the current directory */ |
22162 |
- /* doesn't handle '~' */ |
22163 |
+ for (p = wrapper; *p; p++) |
22164 |
+ if (*p == '/') |
22165 |
+ { |
22166 |
+ has_slash = 1; |
22167 |
+ break; |
22168 |
+ } |
22169 |
+ if (!has_slash) |
22170 |
+ { |
22171 |
+ /* no slashes; search PATH */ |
22172 |
+ const char* path = getenv ("PATH"); |
22173 |
+ if (path != NULL) |
22174 |
+ { |
22175 |
+ for (p = path; *p; p = p_next) |
22176 |
+ { |
22177 |
+ const char* q; |
22178 |
+ size_t p_len; |
22179 |
+ for (q = p; *q; q++) |
22180 |
+ if (IS_PATH_SEPARATOR(*q)) |
22181 |
+ break; |
22182 |
+ p_len = q - p; |
22183 |
+ p_next = (*q == '\0' ? q : q + 1); |
22184 |
+ if (p_len == 0) |
22185 |
+ { |
22186 |
+ /* empty path: current directory */ |
22187 |
+ if (getcwd (tmp, LT_PATHMAX) == NULL) |
22188 |
+ lt_fatal ("getcwd failed"); |
22189 |
+ tmp_len = strlen(tmp); |
22190 |
+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); |
22191 |
+ memcpy (concat_name, tmp, tmp_len); |
22192 |
+ concat_name[tmp_len] = '/'; |
22193 |
+ strcpy (concat_name + tmp_len + 1, wrapper); |
22194 |
+ } |
22195 |
+ else |
22196 |
+ { |
22197 |
+ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); |
22198 |
+ memcpy (concat_name, p, p_len); |
22199 |
+ concat_name[p_len] = '/'; |
22200 |
+ strcpy (concat_name + p_len + 1, wrapper); |
22201 |
+ } |
22202 |
+ if (check_executable(concat_name)) |
22203 |
+ return concat_name; |
22204 |
+ XFREE(concat_name); |
22205 |
+ } |
22206 |
+ } |
22207 |
+ /* not found in PATH; assume curdir */ |
22208 |
+ } |
22209 |
+ /* Relative path | not found in path: prepend cwd */ |
22210 |
if (getcwd (tmp, LT_PATHMAX) == NULL) |
22211 |
lt_fatal ("getcwd failed"); |
22212 |
- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ |
22213 |
- p = XMALLOC(char, size); |
22214 |
- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); |
22215 |
- return p; |
22216 |
+ tmp_len = strlen(tmp); |
22217 |
+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); |
22218 |
+ memcpy (concat_name, tmp, tmp_len); |
22219 |
+ concat_name[tmp_len] = '/'; |
22220 |
+ strcpy (concat_name + tmp_len + 1, wrapper); |
22221 |
+ |
22222 |
+ if (check_executable(concat_name)) |
22223 |
+ return concat_name; |
22224 |
+ XFREE(concat_name); |
22225 |
+ return NULL; |
22226 |
} |
22227 |
|
22228 |
char * |
22229 |
@@ -4785,16 +5233,16 @@ |
22230 |
va_end (ap); |
22231 |
} |
22232 |
EOF |
22233 |
- # we should really use a build-platform specific compiler |
22234 |
- # here, but OTOH, the wrappers (shell script and this C one) |
22235 |
- # are only useful if you want to execute the "real" binary. |
22236 |
- # Since the "real" binary is built for $host, then this |
22237 |
- # wrapper might as well be built for $host, too. |
22238 |
- $run $LTCC -s -o $cwrapper $cwrappersource |
22239 |
- ;; |
22240 |
- esac |
22241 |
- $rm $output |
22242 |
- trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 |
22243 |
+ # we should really use a build-platform specific compiler |
22244 |
+ # here, but OTOH, the wrappers (shell script and this C one) |
22245 |
+ # are only useful if you want to execute the "real" binary. |
22246 |
+ # Since the "real" binary is built for $host, then this |
22247 |
+ # wrapper might as well be built for $host, too. |
22248 |
+ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource |
22249 |
+ ;; |
22250 |
+ esac |
22251 |
+ $rm $output |
22252 |
+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 |
22253 |
|
22254 |
$echo > $output "\ |
22255 |
#! $SHELL |
22256 |
@@ -4815,7 +5263,7 @@ |
22257 |
|
22258 |
# The HP-UX ksh and POSIX shell print the target directory to stdout |
22259 |
# if CDPATH is set. |
22260 |
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi |
22261 |
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
22262 |
|
22263 |
relink_command=\"$relink_command\" |
22264 |
|
22265 |
@@ -4944,13 +5392,13 @@ |
22266 |
# Backslashes separate directories on plain windows |
22267 |
*-*-mingw | *-*-os2*) |
22268 |
$echo >> $output "\ |
22269 |
- exec \$progdir\\\\\$program \${1+\"\$@\"} |
22270 |
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} |
22271 |
" |
22272 |
;; |
22273 |
|
22274 |
*) |
22275 |
$echo >> $output "\ |
22276 |
- exec \$progdir/\$program \${1+\"\$@\"} |
22277 |
+ exec \"\$progdir/\$program\" \${1+\"\$@\"} |
22278 |
" |
22279 |
;; |
22280 |
esac |
22281 |
@@ -4960,7 +5408,7 @@ |
22282 |
fi |
22283 |
else |
22284 |
# The program doesn't exist. |
22285 |
- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 |
22286 |
+ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 |
22287 |
\$echo \"This script is just a wrapper for \$program.\" 1>&2 |
22288 |
$echo \"See the $PACKAGE documentation for more information.\" 1>&2 |
22289 |
exit $EXIT_FAILURE |
22290 |
@@ -4992,71 +5440,73 @@ |
22291 |
|
22292 |
if test -n "$addlibs"; then |
22293 |
gentop="$output_objdir/${outputname}x" |
22294 |
- $show "${rm}r $gentop" |
22295 |
- $run ${rm}r "$gentop" |
22296 |
- $show "$mkdir $gentop" |
22297 |
- $run $mkdir "$gentop" |
22298 |
- status=$? |
22299 |
- if test "$status" -ne 0 && test ! -d "$gentop"; then |
22300 |
- exit $status |
22301 |
- fi |
22302 |
generated="$generated $gentop" |
22303 |
|
22304 |
- # Add in members from convenience archives. |
22305 |
- for xlib in $addlibs; do |
22306 |
- # Extract the objects. |
22307 |
- case $xlib in |
22308 |
- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; |
22309 |
- *) xabs=`pwd`"/$xlib" ;; |
22310 |
- esac |
22311 |
- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` |
22312 |
- xdir="$gentop/$xlib" |
22313 |
- |
22314 |
- $show "${rm}r $xdir" |
22315 |
- $run ${rm}r "$xdir" |
22316 |
- $show "$mkdir $xdir" |
22317 |
- $run $mkdir "$xdir" |
22318 |
- status=$? |
22319 |
- if test "$status" -ne 0 && test ! -d "$xdir"; then |
22320 |
- exit $status |
22321 |
- fi |
22322 |
- # We will extract separately just the conflicting names and we will no |
22323 |
- # longer touch any unique names. It is faster to leave these extract |
22324 |
- # automatically by $AR in one run. |
22325 |
- $show "(cd $xdir && $AR x $xabs)" |
22326 |
- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? |
22327 |
- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then |
22328 |
- : |
22329 |
- else |
22330 |
- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 |
22331 |
- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 |
22332 |
- $AR t "$xabs" | sort | uniq -cd | while read -r count name |
22333 |
- do |
22334 |
- i=1 |
22335 |
- while test "$i" -le "$count" |
22336 |
- do |
22337 |
- # Put our $i before any first dot (extension) |
22338 |
- # Never overwrite any file |
22339 |
- name_to="$name" |
22340 |
- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" |
22341 |
- do |
22342 |
- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` |
22343 |
- done |
22344 |
- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" |
22345 |
- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? |
22346 |
- i=`expr $i + 1` |
22347 |
- done |
22348 |
- done |
22349 |
- fi |
22350 |
- |
22351 |
- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` |
22352 |
- done |
22353 |
+ func_extract_archives $gentop $addlibs |
22354 |
+ oldobjs="$oldobjs $func_extract_archives_result" |
22355 |
fi |
22356 |
|
22357 |
# Do each command in the archive commands. |
22358 |
if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then |
22359 |
cmds=$old_archive_from_new_cmds |
22360 |
else |
22361 |
+ # POSIX demands no paths to be encoded in archives. We have |
22362 |
+ # to avoid creating archives with duplicate basenames if we |
22363 |
+ # might have to extract them afterwards, e.g., when creating a |
22364 |
+ # static archive out of a convenience library, or when linking |
22365 |
+ # the entirety of a libtool archive into another (currently |
22366 |
+ # not supported by libtool). |
22367 |
+ if (for obj in $oldobjs |
22368 |
+ do |
22369 |
+ $echo "X$obj" | $Xsed -e 's%^.*/%%' |
22370 |
+ done | sort | sort -uc >/dev/null 2>&1); then |
22371 |
+ : |
22372 |
+ else |
22373 |
+ $echo "copying selected object files to avoid basename conflicts..." |
22374 |
+ |
22375 |
+ if test -z "$gentop"; then |
22376 |
+ gentop="$output_objdir/${outputname}x" |
22377 |
+ generated="$generated $gentop" |
22378 |
+ |
22379 |
+ $show "${rm}r $gentop" |
22380 |
+ $run ${rm}r "$gentop" |
22381 |
+ $show "$mkdir $gentop" |
22382 |
+ $run $mkdir "$gentop" |
22383 |
+ exit_status=$? |
22384 |
+ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then |
22385 |
+ exit $exit_status |
22386 |
+ fi |
22387 |
+ fi |
22388 |
+ |
22389 |
+ save_oldobjs=$oldobjs |
22390 |
+ oldobjs= |
22391 |
+ counter=1 |
22392 |
+ for obj in $save_oldobjs |
22393 |
+ do |
22394 |
+ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` |
22395 |
+ case " $oldobjs " in |
22396 |
+ " ") oldobjs=$obj ;; |
22397 |
+ *[\ /]"$objbase "*) |
22398 |
+ while :; do |
22399 |
+ # Make sure we don't pick an alternate name that also |
22400 |
+ # overlaps. |
22401 |
+ newobj=lt$counter-$objbase |
22402 |
+ counter=`expr $counter + 1` |
22403 |
+ case " $oldobjs " in |
22404 |
+ *[\ /]"$newobj "*) ;; |
22405 |
+ *) if test ! -f "$gentop/$newobj"; then break; fi ;; |
22406 |
+ esac |
22407 |
+ done |
22408 |
+ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" |
22409 |
+ $run ln "$obj" "$gentop/$newobj" || |
22410 |
+ $run cp "$obj" "$gentop/$newobj" |
22411 |
+ oldobjs="$oldobjs $gentop/$newobj" |
22412 |
+ ;; |
22413 |
+ *) oldobjs="$oldobjs $obj" ;; |
22414 |
+ esac |
22415 |
+ done |
22416 |
+ fi |
22417 |
+ |
22418 |
eval cmds=\"$old_archive_cmds\" |
22419 |
|
22420 |
if len=`expr "X$cmds" : ".*"` && |
22421 |
@@ -5070,20 +5520,7 @@ |
22422 |
objlist= |
22423 |
concat_cmds= |
22424 |
save_oldobjs=$oldobjs |
22425 |
- # GNU ar 2.10+ was changed to match POSIX; thus no paths are |
22426 |
- # encoded into archives. This makes 'ar r' malfunction in |
22427 |
- # this piecewise linking case whenever conflicting object |
22428 |
- # names appear in distinct ar calls; check, warn and compensate. |
22429 |
- if (for obj in $save_oldobjs |
22430 |
- do |
22431 |
- $echo "X$obj" | $Xsed -e 's%^.*/%%' |
22432 |
- done | sort | sort -uc >/dev/null 2>&1); then |
22433 |
- : |
22434 |
- else |
22435 |
- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 |
22436 |
- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 |
22437 |
- AR_FLAGS=cq |
22438 |
- fi |
22439 |
+ |
22440 |
# Is there a better way of finding the last object in the list? |
22441 |
for obj in $save_oldobjs |
22442 |
do |
22443 |
@@ -5094,7 +5531,7 @@ |
22444 |
oldobjs="$objlist $obj" |
22445 |
objlist="$objlist $obj" |
22446 |
eval test_cmds=\"$old_archive_cmds\" |
22447 |
- if len=`expr "X$test_cmds" : ".*"` && |
22448 |
+ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && |
22449 |
test "$len" -le "$max_cmd_len"; then |
22450 |
: |
22451 |
else |
22452 |
@@ -5291,11 +5728,11 @@ |
22453 |
# install_prog (especially on Windows NT). |
22454 |
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || |
22455 |
# Allow the use of GNU shtool's install command. |
22456 |
- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then |
22457 |
+ $echo "X$nonopt" | grep shtool > /dev/null; then |
22458 |
# Aesthetically quote it. |
22459 |
arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` |
22460 |
case $arg in |
22461 |
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) |
22462 |
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") |
22463 |
arg="\"$arg\"" |
22464 |
;; |
22465 |
esac |
22466 |
@@ -5304,14 +5741,14 @@ |
22467 |
shift |
22468 |
else |
22469 |
install_prog= |
22470 |
- arg="$nonopt" |
22471 |
+ arg=$nonopt |
22472 |
fi |
22473 |
|
22474 |
# The real first argument should be the name of the installation program. |
22475 |
# Aesthetically quote it. |
22476 |
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` |
22477 |
case $arg in |
22478 |
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) |
22479 |
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") |
22480 |
arg="\"$arg\"" |
22481 |
;; |
22482 |
esac |
22483 |
@@ -5329,28 +5766,31 @@ |
22484 |
do |
22485 |
if test -n "$dest"; then |
22486 |
files="$files $dest" |
22487 |
- dest="$arg" |
22488 |
+ dest=$arg |
22489 |
continue |
22490 |
fi |
22491 |
|
22492 |
case $arg in |
22493 |
-d) isdir=yes ;; |
22494 |
- -f) prev="-f" ;; |
22495 |
- -g) prev="-g" ;; |
22496 |
- -m) prev="-m" ;; |
22497 |
- -o) prev="-o" ;; |
22498 |
+ -f) |
22499 |
+ case " $install_prog " in |
22500 |
+ *[\\\ /]cp\ *) ;; |
22501 |
+ *) prev=$arg ;; |
22502 |
+ esac |
22503 |
+ ;; |
22504 |
+ -g | -m | -o) prev=$arg ;; |
22505 |
-s) |
22506 |
stripme=" -s" |
22507 |
continue |
22508 |
;; |
22509 |
- -*) ;; |
22510 |
- |
22511 |
+ -*) |
22512 |
+ ;; |
22513 |
*) |
22514 |
# If the previous option needed an argument, then skip it. |
22515 |
if test -n "$prev"; then |
22516 |
prev= |
22517 |
else |
22518 |
- dest="$arg" |
22519 |
+ dest=$arg |
22520 |
continue |
22521 |
fi |
22522 |
;; |
22523 |
@@ -5359,7 +5799,7 @@ |
22524 |
# Aesthetically quote the argument. |
22525 |
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` |
22526 |
case $arg in |
22527 |
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) |
22528 |
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") |
22529 |
arg="\"$arg\"" |
22530 |
;; |
22531 |
esac |
22532 |
@@ -5528,11 +5968,14 @@ |
22533 |
|
22534 |
if test "$#" -gt 0; then |
22535 |
# Delete the old symlinks, and create new ones. |
22536 |
+ # Try `ln -sf' first, because the `ln' binary might depend on |
22537 |
+ # the symlink we replace! Solaris /bin/ln does not understand -f, |
22538 |
+ # so we also need to try rm && ln -s. |
22539 |
for linkname |
22540 |
do |
22541 |
if test "$linkname" != "$realname"; then |
22542 |
- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" |
22543 |
- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" |
22544 |
+ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" |
22545 |
+ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" |
22546 |
fi |
22547 |
done |
22548 |
fi |
22549 |
@@ -5545,7 +5988,16 @@ |
22550 |
IFS="$save_ifs" |
22551 |
eval cmd=\"$cmd\" |
22552 |
$show "$cmd" |
22553 |
- $run eval "$cmd" || exit $? |
22554 |
+ $run eval "$cmd" || { |
22555 |
+ lt_exit=$? |
22556 |
+ |
22557 |
+ # Restore the uninstalled library and exit |
22558 |
+ if test "$mode" = relink; then |
22559 |
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' |
22560 |
+ fi |
22561 |
+ |
22562 |
+ exit $lt_exit |
22563 |
+ } |
22564 |
done |
22565 |
IFS="$save_ifs" |
22566 |
fi |
22567 |
@@ -5639,17 +6091,15 @@ |
22568 |
notinst_deplibs= |
22569 |
relink_command= |
22570 |
|
22571 |
- # To insure that "foo" is sourced, and not "foo.exe", |
22572 |
- # finese the cygwin/MSYS system by explicitly sourcing "foo." |
22573 |
- # which disallows the automatic-append-.exe behavior. |
22574 |
- case $build in |
22575 |
- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; |
22576 |
- *) wrapperdot=${wrapper} ;; |
22577 |
- esac |
22578 |
+ # Note that it is not necessary on cygwin/mingw to append a dot to |
22579 |
+ # foo even if both foo and FILE.exe exist: automatic-append-.exe |
22580 |
+ # behavior happens only for exec(3), not for open(2)! Also, sourcing |
22581 |
+ # `FILE.' does not work on cygwin managed mounts. |
22582 |
+ # |
22583 |
# If there is no directory component, then add one. |
22584 |
- case $file in |
22585 |
- */* | *\\*) . ${wrapperdot} ;; |
22586 |
- *) . ./${wrapperdot} ;; |
22587 |
+ case $wrapper in |
22588 |
+ */* | *\\*) . ${wrapper} ;; |
22589 |
+ *) . ./${wrapper} ;; |
22590 |
esac |
22591 |
|
22592 |
# Check the variables that should have been set. |
22593 |
@@ -5677,34 +6127,21 @@ |
22594 |
done |
22595 |
|
22596 |
relink_command= |
22597 |
- # To insure that "foo" is sourced, and not "foo.exe", |
22598 |
- # finese the cygwin/MSYS system by explicitly sourcing "foo." |
22599 |
- # which disallows the automatic-append-.exe behavior. |
22600 |
- case $build in |
22601 |
- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; |
22602 |
- *) wrapperdot=${wrapper} ;; |
22603 |
- esac |
22604 |
+ # Note that it is not necessary on cygwin/mingw to append a dot to |
22605 |
+ # foo even if both foo and FILE.exe exist: automatic-append-.exe |
22606 |
+ # behavior happens only for exec(3), not for open(2)! Also, sourcing |
22607 |
+ # `FILE.' does not work on cygwin managed mounts. |
22608 |
+ # |
22609 |
# If there is no directory component, then add one. |
22610 |
- case $file in |
22611 |
- */* | *\\*) . ${wrapperdot} ;; |
22612 |
- *) . ./${wrapperdot} ;; |
22613 |
+ case $wrapper in |
22614 |
+ */* | *\\*) . ${wrapper} ;; |
22615 |
+ *) . ./${wrapper} ;; |
22616 |
esac |
22617 |
|
22618 |
outputname= |
22619 |
if test "$fast_install" = no && test -n "$relink_command"; then |
22620 |
if test "$finalize" = yes && test -z "$run"; then |
22621 |
- tmpdir="/tmp" |
22622 |
- test -n "$TMPDIR" && tmpdir="$TMPDIR" |
22623 |
- tmpdir="$tmpdir/libtool-$$" |
22624 |
- save_umask=`umask` |
22625 |
- umask 0077 |
22626 |
- if $mkdir "$tmpdir"; then |
22627 |
- umask $save_umask |
22628 |
- else |
22629 |
- umask $save_umask |
22630 |
- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 |
22631 |
- continue |
22632 |
- fi |
22633 |
+ tmpdir=`func_mktempdir` |
22634 |
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` |
22635 |
outputname="$tmpdir/$file" |
22636 |
# Replace the output file specification. |
22637 |
@@ -5728,7 +6165,7 @@ |
22638 |
fi |
22639 |
|
22640 |
# remove .exe since cygwin /usr/bin/install will append another |
22641 |
- # one anyways |
22642 |
+ # one anyway |
22643 |
case $install_prog,$host in |
22644 |
*/usr/bin/install*,*cygwin*) |
22645 |
case $file:$destfile in |
22646 |
@@ -5828,7 +6265,7 @@ |
22647 |
# Exit here if they wanted silent mode. |
22648 |
test "$show" = : && exit $EXIT_SUCCESS |
22649 |
|
22650 |
- $echo "----------------------------------------------------------------------" |
22651 |
+ $echo "X----------------------------------------------------------------------" | $Xsed |
22652 |
$echo "Libraries have been installed in:" |
22653 |
for libdir in $libdirs; do |
22654 |
$echo " $libdir" |
22655 |
@@ -5861,7 +6298,7 @@ |
22656 |
$echo |
22657 |
$echo "See any operating system documentation about shared libraries for" |
22658 |
$echo "more information, such as the ld(1) and ld.so(8) manual pages." |
22659 |
- $echo "----------------------------------------------------------------------" |
22660 |
+ $echo "X----------------------------------------------------------------------" | $Xsed |
22661 |
exit $EXIT_SUCCESS |
22662 |
;; |
22663 |
|
22664 |
@@ -6078,9 +6515,17 @@ |
22665 |
rmfiles="$rmfiles $objdir/$n" |
22666 |
done |
22667 |
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" |
22668 |
- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" |
22669 |
|
22670 |
- if test "$mode" = uninstall; then |
22671 |
+ case "$mode" in |
22672 |
+ clean) |
22673 |
+ case " $library_names " in |
22674 |
+ # " " in the beginning catches empty $dlname |
22675 |
+ *" $dlname "*) ;; |
22676 |
+ *) rmfiles="$rmfiles $objdir/$dlname" ;; |
22677 |
+ esac |
22678 |
+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" |
22679 |
+ ;; |
22680 |
+ uninstall) |
22681 |
if test -n "$library_names"; then |
22682 |
# Do each command in the postuninstall commands. |
22683 |
cmds=$postuninstall_cmds |
22684 |
@@ -6113,7 +6558,8 @@ |
22685 |
IFS="$save_ifs" |
22686 |
fi |
22687 |
# FIXME: should reinstall the best remaining shared library. |
22688 |
- fi |
22689 |
+ ;; |
22690 |
+ esac |
22691 |
fi |
22692 |
;; |
22693 |
|
22694 |
@@ -6398,7 +6844,7 @@ |
22695 |
$echo |
22696 |
$echo "Try \`$modename --help' for more information about other modes." |
22697 |
|
22698 |
-exit $EXIT_SUCCESS |
22699 |
+exit $? |
22700 |
|
22701 |
# The TAGs below are defined such that we never get into a situation |
22702 |
# in which we disable both kinds of libraries. Given conflicting |
22703 |
@@ -6412,12 +6858,11 @@ |
22704 |
# configuration. But we'll never go from static-only to shared-only. |
22705 |
|
22706 |
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared |
22707 |
-build_libtool_libs=no |
22708 |
-build_old_libs=yes |
22709 |
+disable_libs=shared |
22710 |
# ### END LIBTOOL TAG CONFIG: disable-shared |
22711 |
|
22712 |
# ### BEGIN LIBTOOL TAG CONFIG: disable-static |
22713 |
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` |
22714 |
+disable_libs=static |
22715 |
# ### END LIBTOOL TAG CONFIG: disable-static |
22716 |
|
22717 |
# Local Variables: |
22718 |
diff -uhrN WindowMaker-0.92.0/po/de.po WindowMaker-CVS-20060123/po/de.po |
22719 |
--- WindowMaker-0.92.0/po/de.po 2004-10-26 05:52:38.000000000 +0200 |
22720 |
+++ WindowMaker-CVS-20060123/po/de.po 2005-07-05 21:39:14.000000000 +0200 |
22721 |
@@ -1,38 +1,44 @@ |
22722 |
-# SOME DESCRIPTIVE TITLE. |
22723 |
-# Copyright (C) YEAR Free Software Foundation, Inc. |
22724 |
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
22725 |
# |
22726 |
+# German Message Catalog for Window Maker |
22727 |
+# |
22728 |
+# Initial translation |
22729 |
+# Gudio Scholz <guido.scholz@××××××××××.de> |
22730 |
+# Bernd Eggert <Bernd.Eggert@××××××××.de> |
22731 |
+# |
22732 |
+# Adapted to versions 0.80 ff. |
22733 |
+# Torsten Marek <shlomme@×××.net> |
22734 |
+# |
22735 |
+ |
22736 |
msgid "" |
22737 |
msgstr "" |
22738 |
-"Project-Id-Version: WindowMaker 0.80.0\n" |
22739 |
-"POT-Creation-Date: 2002-01-22 21:20+0100\n" |
22740 |
-"PO-Revision-Date: 2002-01-25 16:42GMT\n" |
22741 |
-"Last-Translator: Torsten Marek <shlomme@×××.net>\n" |
22742 |
-"Language-Team: German \n" |
22743 |
+"Project-Id-Version: Window Maker 0.91\n" |
22744 |
+"POT-Creation-Date: 2004-11-01 16:17+0100\n" |
22745 |
+"PO-Revision-Date: 2004-11-08 22:58+0100\n" |
22746 |
+"Last-Translator: shlomme@×××.net\n" |
22747 |
+"Language-Team: German\n" |
22748 |
"MIME-Version: 1.0\n" |
22749 |
"Content-Type: text/plain; charset=UTF-8\n" |
22750 |
"Content-Transfer-Encoding: 8bit\n" |
22751 |
-"X-Generator: KBabel 0.9.6\n" |
22752 |
|
22753 |
-#: ../src/appicon.c:426 ../src/dialog.c:282 ../src/dock.c:3325 |
22754 |
-#: ../src/dockedapp.c:230 ../src/main.c:273 ../src/rootmenu.c:1850 |
22755 |
-#: ../src/winspector.c:389 ../src/winspector.c:406 |
22756 |
+#: ../src/appicon.c:415 ../src/dialog.c:295 ../src/dock.c:3335 |
22757 |
+#: ../src/dockedapp.c:231 ../src/main.c:271 ../src/rootmenu.c:1854 |
22758 |
+#: ../src/winspector.c:394 ../src/winspector.c:411 |
22759 |
msgid "Error" |
22760 |
msgstr "Fehler" |
22761 |
|
22762 |
-#: ../src/appicon.c:427 |
22763 |
+#: ../src/appicon.c:416 |
22764 |
msgid "Could not open specified icon file" |
22765 |
msgstr "Symboldatei konnte nicht geöffnet werden" |
22766 |
|
22767 |
-#: ../src/appicon.c:428 ../src/dialog.c:179 ../src/dialog.c:282 |
22768 |
-#: ../src/dialog.c:729 ../src/dialog.c:1814 ../src/dock.c:526 |
22769 |
-#: ../src/dock.c:534 ../src/dock.c:558 ../src/dock.c:3326 |
22770 |
-#: ../src/dockedapp.c:231 ../src/dockedapp.c:426 ../src/main.c:273 |
22771 |
-#: ../src/rootmenu.c:1854 ../src/winspector.c:390 ../src/winspector.c:407 |
22772 |
+#: ../src/appicon.c:417 ../src/dialog.c:192 ../src/dialog.c:295 |
22773 |
+#: ../src/dialog.c:725 ../src/dialog.c:1796 ../src/dock.c:515 |
22774 |
+#: ../src/dock.c:523 ../src/dock.c:547 ../src/dock.c:3336 |
22775 |
+#: ../src/dockedapp.c:232 ../src/dockedapp.c:427 ../src/main.c:271 |
22776 |
+#: ../src/rootmenu.c:1858 ../src/winspector.c:395 ../src/winspector.c:412 |
22777 |
msgid "OK" |
22778 |
msgstr "OK" |
22779 |
|
22780 |
-#: ../src/appicon.c:456 ../src/dock.c:264 |
22781 |
+#: ../src/appicon.c:445 ../src/dock.c:244 |
22782 |
msgid "" |
22783 |
" will be forcibly closed.\n" |
22784 |
"Any unsaved changes will be lost.\n" |
22785 |
@@ -42,344 +48,369 @@ |
22786 |
"Alle ungespeicherten Ãnderungen gehen dabei verloren.\n" |
22787 |
"Bitte bestätigen." |
22788 |
|
22789 |
-#: ../src/appicon.c:464 ../src/dock.c:283 ../src/winmenu.c:124 |
22790 |
+#: ../src/appicon.c:453 ../src/dock.c:263 ../src/winmenu.c:124 |
22791 |
msgid "Kill Application" |
22792 |
msgstr "Anwendung töten" |
22793 |
|
22794 |
-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126 |
22795 |
+#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126 |
22796 |
msgid "Yes" |
22797 |
msgstr "Ja" |
22798 |
|
22799 |
-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126 |
22800 |
+#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126 |
22801 |
msgid "No" |
22802 |
msgstr "Nein" |
22803 |
|
22804 |
-#: ../src/appicon.c:495 ../src/dock.c:1177 ../src/dock.c:3491 |
22805 |
+#: ../src/appicon.c:484 ../src/dock.c:1168 ../src/dock.c:3501 |
22806 |
msgid "Unhide Here" |
22807 |
msgstr "Hier wiederherstellen" |
22808 |
|
22809 |
-#: ../src/appicon.c:496 ../src/appicon.c:521 ../src/dock.c:1179 |
22810 |
-#: ../src/dock.c:1181 ../src/dock.c:3503 ../src/winmenu.c:461 |
22811 |
+#: ../src/appicon.c:485 ../src/appicon.c:510 ../src/dock.c:1170 |
22812 |
+#: ../src/dock.c:1172 ../src/dock.c:3513 ../src/winmenu.c:461 |
22813 |
msgid "Hide" |
22814 |
msgstr "Verstecken" |
22815 |
|
22816 |
-#: ../src/appicon.c:497 |
22817 |
+#: ../src/appicon.c:486 |
22818 |
msgid "Set Icon..." |
22819 |
msgstr "Symbol wählen..." |
22820 |
|
22821 |
-#: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248 |
22822 |
+#: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248 |
22823 |
#: ../src/rootmenu.c:264 ../src/winmenu.c:508 |
22824 |
msgid "Kill" |
22825 |
msgstr "Töten" |
22826 |
|
22827 |
-#: ../src/appicon.c:519 ../src/dock.c:3501 |
22828 |
+#: ../src/appicon.c:508 ../src/dock.c:3511 |
22829 |
msgid "Unhide" |
22830 |
msgstr "Wiederherstellen" |
22831 |
|
22832 |
-#: ../src/application.c:398 |
22833 |
+#: ../src/application.c:405 |
22834 |
#, c-format |
22835 |
msgid "recreating missing icon '%s'" |
22836 |
msgstr "fehlendes Symbol '%s' wird wiederhergestellt" |
22837 |
|
22838 |
-#: ../src/defaults.c:919 ../src/defaults.c:1008 |
22839 |
+#: ../src/defaults.c:930 ../src/defaults.c:1092 |
22840 |
#, c-format |
22841 |
msgid "Domain %s (%s) of global defaults database is corrupted!" |
22842 |
msgstr "Domäne %s (%s) in globaler Standarddatenbank ist fehlerhaft!" |
22843 |
|
22844 |
-#: ../src/defaults.c:924 |
22845 |
+#: ../src/defaults.c:935 |
22846 |
#, c-format |
22847 |
msgid "could not load domain %s from global defaults database" |
22848 |
msgstr "Domäne %s aus globaler Standarddatenbank konnte nicht geladen werden" |
22849 |
|
22850 |
-#: ../src/defaults.c:946 ../src/startup.c:884 ../src/startup.c:902 |
22851 |
-#: ../src/startup.c:908 |
22852 |
+#: ../src/defaults.c:987 ../src/defaults.c:1002 |
22853 |
+#, c-format |
22854 |
+msgid "invalid global menu file %s" |
22855 |
+msgstr "Ungültige Datei %s für globales Menü" |
22856 |
+ |
22857 |
+#: ../src/defaults.c:1030 ../src/startup.c:762 ../src/startup.c:780 |
22858 |
+#: ../src/startup.c:787 |
22859 |
#, c-format |
22860 |
msgid "could not read domain \"%s\" from defaults database" |
22861 |
-msgstr "Dömane \"%s\" aus Standarddatenbank konnte nicht gelesen werden" |
22862 |
+msgstr "Dömane \"%s\" aus der Standarddatenbank konnte nicht gelesen werden" |
22863 |
|
22864 |
-#: ../src/defaults.c:992 ../src/defaults.c:1096 ../src/defaults.c:1137 |
22865 |
-#: ../src/defaults.c:1193 |
22866 |
+#: ../src/defaults.c:1076 ../src/defaults.c:1181 ../src/defaults.c:1222 |
22867 |
+#: ../src/defaults.c:1278 |
22868 |
#, c-format |
22869 |
msgid "Domain %s (%s) of defaults database is corrupted!" |
22870 |
-msgstr "Domäne %s (%s) aus Standarddatenbank ist fehlerhaft!" |
22871 |
+msgstr "Domäne %s (%s) aus der Standarddatenbank ist fehlerhaft!" |
22872 |
|
22873 |
-#: ../src/defaults.c:997 ../src/defaults.c:1116 ../src/defaults.c:1173 |
22874 |
-#: ../src/defaults.c:1202 |
22875 |
+#: ../src/defaults.c:1081 ../src/defaults.c:1201 ../src/defaults.c:1258 |
22876 |
+#: ../src/defaults.c:1288 |
22877 |
#, c-format |
22878 |
msgid "could not load domain %s from user defaults database" |
22879 |
msgstr "Domäne %s aus Benutzer-Standarddatenbank konnte nicht geladen werden" |
22880 |
|
22881 |
-#: ../src/defaults.c:1027 |
22882 |
+#: ../src/defaults.c:1111 |
22883 |
#, c-format |
22884 |
msgid "could not load domain %s from global defaults database (%s)" |
22885 |
msgstr "Dömane %s konnte nicht aus globaler Standarddatenbank (%s) gelesen werden" |
22886 |
|
22887 |
-#: ../src/defaults.c:1163 ../src/screen.c:458 |
22888 |
+#: ../src/defaults.c:1248 ../src/screen.c:419 |
22889 |
#, c-format |
22890 |
msgid "could not load logo image for panels: %s" |
22891 |
msgstr "Panel-Logo konnte nicht geladen werden: %s" |
22892 |
|
22893 |
#. --------------------------- Local ----------------------- |
22894 |
-#: ../src/defaults.c:1411 ../src/defaults.c:1553 ../src/defaults.c:1665 |
22895 |
-#: ../src/defaults.c:2144 ../src/defaults.c:2161 ../src/defaults.c:2206 |
22896 |
-#: ../src/defaults.c:2253 ../src/defaults.c:2726 ../src/wdefaults.c:571 |
22897 |
-#: ../src/wdefaults.c:607 |
22898 |
+#: ../src/defaults.c:1497 ../src/defaults.c:1636 ../src/defaults.c:1756 |
22899 |
+#: ../src/defaults.c:2234 ../src/defaults.c:2251 ../src/defaults.c:2296 |
22900 |
+#: ../src/defaults.c:2343 ../src/defaults.c:2816 ../src/wdefaults.c:571 |
22901 |
+#: ../src/wdefaults.c:604 |
22902 |
#, c-format |
22903 |
msgid "Wrong option format for key \"%s\". Should be %s." |
22904 |
msgstr "Falsches Optionsformat für Schlüssel \"%s\". %s erwartet." |
22905 |
|
22906 |
-#: ../src/defaults.c:1413 ../src/defaults.c:1494 ../src/defaults.c:1526 |
22907 |
-#: ../src/defaults.c:1558 ../src/defaults.c:1571 ../src/defaults.c:1586 |
22908 |
-#: ../src/defaults.c:1600 ../src/defaults.c:1670 ../src/defaults.c:1682 |
22909 |
-#: ../src/defaults.c:2149 ../src/defaults.c:2166 ../src/defaults.c:2179 |
22910 |
-#: ../src/defaults.c:2211 ../src/defaults.c:2227 ../src/defaults.c:2258 |
22911 |
-#: ../src/defaults.c:2345 ../src/defaults.c:2731 ../src/defaults.c:2742 |
22912 |
+#: ../src/defaults.c:1499 ../src/defaults.c:1580 ../src/defaults.c:1610 |
22913 |
+#: ../src/defaults.c:1641 ../src/defaults.c:1654 ../src/defaults.c:1669 |
22914 |
+#: ../src/defaults.c:1683 ../src/defaults.c:1761 ../src/defaults.c:1773 |
22915 |
+#: ../src/defaults.c:2239 ../src/defaults.c:2256 ../src/defaults.c:2269 |
22916 |
+#: ../src/defaults.c:2301 ../src/defaults.c:2317 ../src/defaults.c:2348 |
22917 |
+#: ../src/defaults.c:2435 ../src/defaults.c:2821 ../src/defaults.c:2832 |
22918 |
#, c-format |
22919 |
msgid "using default \"%s\" instead" |
22920 |
-msgstr "benutze Standardeinstellung \"%s\" anderenstatt" |
22921 |
+msgstr "benutze Standardeinstellung \"%s\" anstatt" |
22922 |
|
22923 |
-#: ../src/defaults.c:1444 |
22924 |
+#: ../src/defaults.c:1530 |
22925 |
#, c-format |
22926 |
msgid "wrong option value for key \"%s\". Should be one of %s" |
22927 |
msgstr "falscher Eigenschaftenwert für Schlüssel \"%s\". Wert aus %s erwartet" |
22928 |
|
22929 |
-#: ../src/defaults.c:1489 |
22930 |
+#: ../src/defaults.c:1575 |
22931 |
#, c-format |
22932 |
msgid "can't convert \"%s\" to boolean for key \"%s\"" |
22933 |
-msgstr "\"%s\" konnte nicht in Wahrheitswert für Schlüssel \"%s\" konvertiert werden" |
22934 |
+msgstr "\"%s\" konnte nicht in Boolean für Schlüssel \"%s\" konvertiert werden" |
22935 |
|
22936 |
-#: ../src/defaults.c:1523 |
22937 |
+#: ../src/defaults.c:1607 |
22938 |
#, c-format |
22939 |
msgid "can't convert \"%s\" to integer for key \"%s\"" |
22940 |
-msgstr "\"%s\" konnte nicht in Ganzzahl für Schlüssel \"%s\" konvertiert werden" |
22941 |
+msgstr "\"%s\" konnte nicht in Integer für Schlüssel \"%s\" konvertiert werden" |
22942 |
|
22943 |
-#: ../src/defaults.c:1566 |
22944 |
+#: ../src/defaults.c:1649 |
22945 |
#, c-format |
22946 |
msgid "Incorrect number of elements in array for key \"%s\"." |
22947 |
msgstr "Falsche Anzahl von Argumenten für Schlüssel \"%s\"" |
22948 |
|
22949 |
-#: ../src/defaults.c:1581 |
22950 |
+#: ../src/defaults.c:1664 |
22951 |
#, c-format |
22952 |
msgid "Wrong value for key \"%s\". Should be Coordinate." |
22953 |
-msgstr "Falscher Wert für Schlüssel \"%s\". Koordinate erwartet." |
22954 |
+msgstr "Falscher Wert für Schlüssel \"%s\". Koordinaten erwartet." |
22955 |
|
22956 |
-#: ../src/defaults.c:1596 |
22957 |
+#: ../src/defaults.c:1679 |
22958 |
#, c-format |
22959 |
msgid "can't convert array to integers for \"%s\"." |
22960 |
-msgstr "Feld konnte nicht in Ganzzahlen für \"%s\" konvertiert werden." |
22961 |
+msgstr "Feld konnte nicht in Integer für \"%s\" konvertiert werden." |
22962 |
|
22963 |
-#: ../src/defaults.c:1794 ../src/defaults.c:1826 ../src/defaults.c:1842 |
22964 |
-#: ../src/defaults.c:1871 ../src/defaults.c:1894 ../src/defaults.c:1947 |
22965 |
-#: ../src/defaults.c:1987 ../src/defaults.c:2025 ../src/defaults.c:2041 |
22966 |
+#: ../src/defaults.c:1884 ../src/defaults.c:1916 ../src/defaults.c:1932 |
22967 |
+#: ../src/defaults.c:1961 ../src/defaults.c:1984 ../src/defaults.c:2037 |
22968 |
+#: ../src/defaults.c:2077 ../src/defaults.c:2115 ../src/defaults.c:2131 |
22969 |
#, c-format |
22970 |
msgid "\"%s\" is not a valid color name" |
22971 |
msgstr "\"%s\" ist kein gültiger Farbname" |
22972 |
|
22973 |
-#: ../src/defaults.c:1807 ../src/defaults.c:1859 |
22974 |
+#: ../src/defaults.c:1897 ../src/defaults.c:1949 |
22975 |
msgid "bad number of arguments in gradient specification" |
22976 |
msgstr "falsche Anzahl von Argumenten in Farbverlaufsbeschreibung" |
22977 |
|
22978 |
-#: ../src/defaults.c:1920 |
22979 |
+#: ../src/defaults.c:2010 |
22980 |
msgid "too few arguments in multicolor gradient specification" |
22981 |
msgstr "zuwenig Argumente in Mehrfarbverlaufsbeschreibung" |
22982 |
|
22983 |
-#: ../src/defaults.c:2014 |
22984 |
+#: ../src/defaults.c:2104 |
22985 |
msgid "bad number of arguments in textured gradient specification" |
22986 |
msgstr "falsche Anzahl von Argumenten in Texturverlaufsbeschreibung" |
22987 |
|
22988 |
-#: ../src/defaults.c:2057 |
22989 |
+#: ../src/defaults.c:2147 |
22990 |
#, c-format |
22991 |
msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]" |
22992 |
msgstr "falscher Transparenzwert für Textur \"%s\". [0..255] erwartet." |
22993 |
|
22994 |
-#: ../src/defaults.c:2117 |
22995 |
+#: ../src/defaults.c:2207 |
22996 |
#, c-format |
22997 |
msgid "could not initialize library %s" |
22998 |
msgstr "Bibliothek %s konnte nicht initialisiert werden" |
22999 |
|
23000 |
-#: ../src/defaults.c:2120 |
23001 |
+#: ../src/defaults.c:2210 |
23002 |
#, c-format |
23003 |
msgid "could not find function %s::%s" |
23004 |
msgstr "Funktion %s::%s konnte nicht gefunden werden" |
23005 |
|
23006 |
-#: ../src/defaults.c:2127 |
23007 |
+#: ../src/defaults.c:2217 |
23008 |
#, c-format |
23009 |
msgid "invalid texture type %s" |
23010 |
msgstr "ungültiger Texturtyp %s" |
23011 |
|
23012 |
-#: ../src/defaults.c:2174 |
23013 |
+#: ../src/defaults.c:2264 |
23014 |
#, c-format |
23015 |
msgid "Error in texture specification for key \"%s\"" |
23016 |
msgstr "fehlerhafte Texturbeschreibung für Schlüssel \"%s\"" |
23017 |
|
23018 |
-#: ../src/defaults.c:2223 |
23019 |
+#: ../src/defaults.c:2313 |
23020 |
msgid "Wrong type for workspace background. Should be a texture type." |
23021 |
msgstr "Falscher Typ für Arbeitsflächen-Hintergrund. Textur erwartet." |
23022 |
|
23023 |
-#: ../src/defaults.c:2271 |
23024 |
+#: ../src/defaults.c:2361 |
23025 |
#, c-format |
23026 |
msgid "Wrong type for background of workspace %i. Should be a texture." |
23027 |
msgstr "Falscher Typ für Arbeitsflächen-Hintergrund %i. Textur erwartet." |
23028 |
|
23029 |
-#: ../src/defaults.c:2313 |
23030 |
+#: ../src/defaults.c:2403 |
23031 |
msgid "could not load any usable font!!!" |
23032 |
msgstr "keine brauchbaren Schriften konnten geladen werden!!!" |
23033 |
|
23034 |
-#: ../src/defaults.c:2340 |
23035 |
+#: ../src/defaults.c:2430 |
23036 |
#, c-format |
23037 |
msgid "could not get color for key \"%s\"" |
23038 |
msgstr "Farbe für Schlüssel \"%s\" konnte nicht ermittelt werden" |
23039 |
|
23040 |
-#: ../src/defaults.c:2398 ../src/rootmenu.c:523 |
23041 |
+#: ../src/defaults.c:2488 ../src/rootmenu.c:531 |
23042 |
#, c-format |
23043 |
msgid "%s:invalid key modifier \"%s\"" |
23044 |
msgstr "%s: ungültiger Schlüsselmodifikator \"%s\"" |
23045 |
|
23046 |
-#: ../src/defaults.c:2410 |
23047 |
+#: ../src/defaults.c:2500 |
23048 |
#, c-format |
23049 |
msgid "%s:invalid kbd shortcut specification \"%s\"" |
23050 |
msgstr "%s: ungültiges Tastaturkürzel \"%s\"" |
23051 |
|
23052 |
-#: ../src/defaults.c:2417 |
23053 |
+#: ../src/defaults.c:2507 |
23054 |
#, c-format |
23055 |
msgid "%s:invalid key in shortcut \"%s\"" |
23056 |
-msgstr "%s: ungülige Taste in Kürzel \"%s\"" |
23057 |
+msgstr "%s: ungültige Taste in Kürzel \"%s\"" |
23058 |
|
23059 |
-#: ../src/defaults.c:2442 |
23060 |
+#: ../src/defaults.c:2532 |
23061 |
#, c-format |
23062 |
msgid "%s: modifier key %s is not valid" |
23063 |
-msgstr "%s: ungültige Umschalttaste %s" |
23064 |
+msgstr "%s: ungültige Tastenmodifikator %s" |
23065 |
|
23066 |
-#: ../src/defaults.c:2474 |
23067 |
+#: ../src/defaults.c:2564 |
23068 |
#, c-format |
23069 |
msgid "could not load image in option %s: %s" |
23070 |
msgstr "Bild aus Eigenschaft %s konnte nicht geladen werden (%s)" |
23071 |
|
23072 |
-#: ../src/defaults.c:2591 |
23073 |
+#: ../src/defaults.c:2681 |
23074 |
#, c-format |
23075 |
msgid "failed to open bitmap file \"%s\"" |
23076 |
msgstr "Bitmap-Datei \"%s\" konnte nicht geladen werden" |
23077 |
|
23078 |
-#: ../src/defaults.c:2594 |
23079 |
+#: ../src/defaults.c:2684 |
23080 |
#, c-format |
23081 |
msgid "\"%s\" is not a valid bitmap file" |
23082 |
msgstr "\"%s\" ist keine gültige Bitmap-Datei" |
23083 |
|
23084 |
-#: ../src/defaults.c:2597 |
23085 |
+#: ../src/defaults.c:2687 |
23086 |
#, c-format |
23087 |
msgid "out of memory reading bitmap file \"%s\"" |
23088 |
msgstr "zuwenig Speicher beim Lesen der Bitmap \"%s\"" |
23089 |
|
23090 |
-#: ../src/defaults.c:2636 ../src/defaults.c:2669 |
23091 |
+#: ../src/defaults.c:2726 ../src/defaults.c:2759 |
23092 |
msgid "bad number of arguments in cursor specification" |
23093 |
msgstr "falsche Anzahl von Argumente in Mauszeigerbeschreibung" |
23094 |
|
23095 |
-#: ../src/defaults.c:2652 |
23096 |
+#: ../src/defaults.c:2742 |
23097 |
#, c-format |
23098 |
msgid "unknown builtin cursor name \"%s\"" |
23099 |
msgstr "unbekannter interner Mauszeiger \"%s\"" |
23100 |
|
23101 |
-#: ../src/defaults.c:2679 ../src/defaults.c:2691 |
23102 |
+#: ../src/defaults.c:2769 ../src/defaults.c:2781 |
23103 |
#, c-format |
23104 |
msgid "could not find cursor bitmap file \"%s\"" |
23105 |
msgstr "Bitmap-Datei \"%s\" konnte nicht geladen werden" |
23106 |
|
23107 |
-#: ../src/defaults.c:2738 |
23108 |
+#: ../src/defaults.c:2828 |
23109 |
#, c-format |
23110 |
msgid "Error in cursor specification for key \"%s\"" |
23111 |
msgstr "Fehler in Mauszeigerbeschreibung für Schlüssel \"%s\"" |
23112 |
|
23113 |
-#: ../src/defaults.c:2823 |
23114 |
+#: ../src/defaults.c:2913 |
23115 |
msgid "could not render texture for icon background" |
23116 |
msgstr "Textur für Symbolhintergrund konnte nicht angezeigt werden" |
23117 |
|
23118 |
-#: ../src/dialog.c:135 |
23119 |
+#: ../src/defaults.c:3541 ../src/defaults.c:3616 |
23120 |
+#, c-format |
23121 |
+msgid "Invalid arguments for option \"%s\"" |
23122 |
+msgstr "Falsche Argument für Option \"%s\"" |
23123 |
+ |
23124 |
+#: ../src/defaults.c:3548 ../src/defaults.c:3623 |
23125 |
+#, c-format |
23126 |
+msgid "Could not find image \"%s\" for option \"%s\"" |
23127 |
+msgstr "Bild \"%s\" aus Eigenschaft \"%s\" konnte nicht gefunden werden" |
23128 |
+ |
23129 |
+#: ../src/defaults.c:3554 ../src/defaults.c:3631 |
23130 |
+#, c-format |
23131 |
+msgid "Could not load image \"%s\" for option \"%s\"" |
23132 |
+msgstr "Bild \"%s\"aus Eigenschaft \"%s\" konnte nicht geladen werden" |
23133 |
+ |
23134 |
+#: ../src/defaults.c:3566 |
23135 |
+msgid "Invalid split sizes for SwitchPanel back image." |
23136 |
+msgstr "Ungültige Unterteilungsangaben für SwitchPanel-Hintergrundbild." |
23137 |
+ |
23138 |
+#: ../src/defaults.c:3639 |
23139 |
+#, c-format |
23140 |
+msgid "Invalid number of arguments for option \"%s\"" |
23141 |
+msgstr "Falsche Anzahl von Argumente für Option \"%s\"" |
23142 |
+ |
23143 |
+#: ../src/dialog.c:147 |
23144 |
msgid "Save workspace state" |
23145 |
msgstr "Sitzung speichern" |
23146 |
|
23147 |
-#: ../src/dialog.c:173 ?? |
23148 |
-msgid "Shutdown Computer" |
23149 |
-msgstr "Computer herunterfahren" |
23150 |
- |
23151 |
-#: ../src/dialog.c:179 ../src/dialog.c:736 ../src/dock.c:558 |
23152 |
-#: ../src/dockedapp.c:431 ../src/rootmenu.c:198 ../src/rootmenu.c:248 |
23153 |
+#: ../src/dialog.c:192 ../src/dialog.c:732 ../src/dock.c:547 |
23154 |
+#: ../src/dockedapp.c:432 ../src/rootmenu.c:198 ../src/rootmenu.c:248 |
23155 |
#: ../src/rootmenu.c:264 |
23156 |
msgid "Cancel" |
23157 |
msgstr "Abbrechen" |
23158 |
|
23159 |
-#: ../src/dialog.c:277 |
23160 |
+#: ../src/dialog.c:290 |
23161 |
msgid "Could not open directory " |
23162 |
msgstr "Verzeichnis konnte nicht geöffnet werden" |
23163 |
|
23164 |
-#: ../src/dialog.c:332 |
23165 |
+#: ../src/dialog.c:345 |
23166 |
msgid "Could not load image file " |
23167 |
msgstr "Bilddatei konnte nicht geöffnet werden" |
23168 |
|
23169 |
-#: ../src/dialog.c:663 |
23170 |
+#: ../src/dialog.c:659 |
23171 |
msgid "Directories" |
23172 |
msgstr "Verzeichnisse" |
23173 |
|
23174 |
-#: ../src/dialog.c:672 |
23175 |
+#: ../src/dialog.c:668 |
23176 |
msgid "Icons" |
23177 |
msgstr "Symbole" |
23178 |
|
23179 |
-#: ../src/dialog.c:705 |
23180 |
+#: ../src/dialog.c:701 |
23181 |
msgid "Preview" |
23182 |
msgstr "Vorschau" |
23183 |
|
23184 |
-#: ../src/dialog.c:718 |
23185 |
+#: ../src/dialog.c:714 |
23186 |
msgid "File Name:" |
23187 |
msgstr "Dateiname:" |
23188 |
|
23189 |
-#: ../src/dialog.c:742 |
23190 |
+#: ../src/dialog.c:738 |
23191 |
msgid "Choose File" |
23192 |
msgstr "Datei auswählen" |
23193 |
|
23194 |
-#: ../src/dialog.c:760 ../src/dialog.c:762 |
23195 |
+#: ../src/dialog.c:757 ../src/dialog.c:759 |
23196 |
msgid "Icon Chooser" |
23197 |
msgstr "Symbol-Wähler" |
23198 |
|
23199 |
-#: ../src/dialog.c:1241 ../src/dialog.c:1351 |
23200 |
+#: ../src/dialog.c:1196 ../src/dialog.c:1304 |
23201 |
#, c-format |
23202 |
msgid "Version %s" |
23203 |
msgstr "Version %s" |
23204 |
|
23205 |
-#: ../src/dialog.c:1348 |
23206 |
+#: ../src/dialog.c:1302 |
23207 |
msgid "Window Manager for X" |
23208 |
msgstr "Windowmanager für X" |
23209 |
|
23210 |
-#: ../src/dialog.c:1371 |
23211 |
+#: ../src/dialog.c:1325 |
23212 |
#, c-format |
23213 |
msgid "Using visual 0x%x: %s %ibpp " |
23214 |
msgstr "Benutze Visual 0x%x %s %ibpp " |
23215 |
|
23216 |
-#: ../src/dialog.c:1379 |
23217 |
+#: ../src/dialog.c:1333 |
23218 |
msgid "(32 thousand colors)\n" |
23219 |
msgstr "(32.000 Farben)\n" |
23220 |
|
23221 |
-#: ../src/dialog.c:1382 |
23222 |
+#: ../src/dialog.c:1336 |
23223 |
msgid "(64 thousand colors)\n" |
23224 |
msgstr "(64.000 Farben)\n" |
23225 |
|
23226 |
-#: ../src/dialog.c:1386 |
23227 |
+#: ../src/dialog.c:1340 |
23228 |
msgid "(16 million colors)\n" |
23229 |
msgstr "(16 Millionen Farben)\n" |
23230 |
|
23231 |
-#: ../src/dialog.c:1389 |
23232 |
+#: ../src/dialog.c:1343 |
23233 |
#, c-format |
23234 |
msgid "(%d colors)\n" |
23235 |
msgstr "(%d Farben)\n" |
23236 |
|
23237 |
-#: ../src/dialog.c:1399 |
23238 |
+#: ../src/dialog.c:1353 |
23239 |
#, c-format |
23240 |
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n" |
23241 |
msgstr "Gesamter belegter Speicher: %i kB. Gesamter benutzter Speicher: %i kB.\n" |
23242 |
|
23243 |
-#: ../src/dialog.c:1406 |
23244 |
+#: ../src/dialog.c:1360 |
23245 |
msgid "Supported image formats: " |
23246 |
msgstr "Unterstütze Grafikformate: " |
23247 |
|
23248 |
-#: ../src/dialog.c:1413 |
23249 |
+#: ../src/dialog.c:1367 |
23250 |
msgid "" |
23251 |
"\n" |
23252 |
"Additional support for: " |
23253 |
@@ -387,11 +418,11 @@ |
23254 |
"\n" |
23255 |
"Zusätzliche Unterstützung für: " |
23256 |
|
23257 |
-#: ../src/dialog.c:1436 |
23258 |
+#: ../src/dialog.c:1384 |
23259 |
msgid " and " |
23260 |
msgstr " und " |
23261 |
|
23262 |
-#: ../src/dialog.c:1446 |
23263 |
+#: ../src/dialog.c:1394 |
23264 |
msgid "" |
23265 |
"\n" |
23266 |
"Sound disabled" |
23267 |
@@ -399,7 +430,7 @@ |
23268 |
"\n" |
23269 |
"Ton ausgeschaltet" |
23270 |
|
23271 |
-#: ../src/dialog.c:1448 |
23272 |
+#: ../src/dialog.c:1396 |
23273 |
msgid "" |
23274 |
"\n" |
23275 |
"Sound enabled" |
23276 |
@@ -407,89 +438,105 @@ |
23277 |
"\n" |
23278 |
"Ton eingeschaltet" |
23279 |
|
23280 |
-#: ../src/dialog.c:1472 |
23281 |
+#: ../src/dialog.c:1401 |
23282 |
+msgid ", VirtualDesktop enabled" |
23283 |
+msgstr ", VirtualDesktop aktiviert" |
23284 |
+ |
23285 |
+#: ../src/dialog.c:1403 |
23286 |
+msgid ", VirtualDesktop disabled" |
23287 |
+msgstr ", VirtualDesktop deaktiviert" |
23288 |
+ |
23289 |
+#: ../src/dialog.c:1407 |
23290 |
+msgid "\n" |
23291 |
+msgstr "" |
23292 |
+ |
23293 |
+#: ../src/dialog.c:1409 |
23294 |
+msgid "Solaris " |
23295 |
+msgstr "" |
23296 |
+ |
23297 |
+#: ../src/dialog.c:1411 |
23298 |
+msgid "Xinerama: " |
23299 |
+msgstr "" |
23300 |
+ |
23301 |
+#: ../src/dialog.c:1445 |
23302 |
msgid "Info" |
23303 |
msgstr "Info" |
23304 |
|
23305 |
-#: ../src/dialog.c:1495 |
23306 |
+#: ../src/dialog.c:1469 |
23307 |
msgid "Merry Christmas!" |
23308 |
msgstr "Frohe Weihnachten!" |
23309 |
|
23310 |
-#: ../src/dialog.c:1565 |
23311 |
+#: ../src/dialog.c:1539 |
23312 |
msgid "" |
23313 |
" Window Maker is free software; you can redistribute it and/or\n" |
23314 |
"modify it under the terms of the GNU General Public License as\n" |
23315 |
"published by the Free Software Foundation; either version 2 of the\n" |
23316 |
"License, or (at your option) any later version.\n" |
23317 |
"\n" |
23318 |
-"\n" |
23319 |
" Window Maker is distributed in the hope that it will be useful,\n" |
23320 |
"but WITHOUT ANY WARRANTY; without even the implied warranty\n" |
23321 |
"of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
23322 |
"See the GNU General Public License for more details.\n" |
23323 |
"\n" |
23324 |
-"\n" |
23325 |
" You should have received a copy of the GNU General Public\n" |
23326 |
"License along with this program; if not, write to the Free Software\n" |
23327 |
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" |
23328 |
"02111-1307, USA." |
23329 |
msgstr "" |
23330 |
|
23331 |
-#: ../src/dialog.c:1586 |
23332 |
+#: ../src/dialog.c:1563 |
23333 |
msgid "Legal" |
23334 |
msgstr "Rechtliches" |
23335 |
|
23336 |
-#: ../src/dialog.c:1737 ../src/startup.c:395 |
23337 |
+#: ../src/dialog.c:1719 |
23338 |
msgid "cannot open connection for crashing dialog panel. Aborting." |
23339 |
-msgstr "Verbindung zum Absturz-Dialog konnte nicht erstellt werden" |
23340 |
+msgstr "Verbindung zum Absturz-Dialog konnte nicht erstellt werden. Abbruch." |
23341 |
|
23342 |
-#: ../src/dialog.c:1763 |
23343 |
+#: ../src/dialog.c:1745 |
23344 |
msgid "Fatal error" |
23345 |
msgstr "Fataler Fehler" |
23346 |
|
23347 |
-#: ../src/dialog.c:1774 |
23348 |
+#: ../src/dialog.c:1756 |
23349 |
#, c-format |
23350 |
msgid "" |
23351 |
"Window Maker received signal %i\n" |
23352 |
"(%s)." |
23353 |
msgstr "" |
23354 |
-"Window Maker erhielt Signale %i\n" |
23355 |
+"Window Maker erhielt Signal %i\n" |
23356 |
"(%s)." |
23357 |
|
23358 |
-#: ../src/dialog.c:1777 |
23359 |
+#: ../src/dialog.c:1759 |
23360 |
#, c-format |
23361 |
msgid "Window Maker received signal %i." |
23362 |
msgstr "Window Maker erhielt Signal %i" |
23363 |
|
23364 |
-#: ../src/dialog.c:1786 |
23365 |
+#: ../src/dialog.c:1768 |
23366 |
msgid "" |
23367 |
" This fatal error occured probably due to a bug. Please fill the included " |
23368 |
"BUGFORM and report it to bugs@×××××××××××.org." |
23369 |
-msgstr "" |
23370 |
-" Dieser fatale Fehler trat möglicherweise aufgrund eines Programmfehlers auf. Bitte füllen Sie die " |
23371 |
-"mitgelieferte BUGFORM aus und schicken sie an bugs@×××××××××××.org" |
23372 |
+msgstr " Dieser fatale Fehler trat möglicherweise wegen eines Bugs auf. Bitte füllen Sie die mitgelieferte BUGFORM aus und schicken Sie sie an bugs@×××××××××××.org." |
23373 |
|
23374 |
-#: ../src/dialog.c:1795 |
23375 |
+#: ../src/dialog.c:1777 |
23376 |
msgid "What do you want to do now?" |
23377 |
msgstr "Was möchten Sie jetzt tun?" |
23378 |
|
23379 |
-#: ../src/dialog.c:1801 |
23380 |
+#: ../src/dialog.c:1783 |
23381 |
msgid "Select action" |
23382 |
msgstr "Aktion auswählen" |
23383 |
|
23384 |
-#: ../src/dialog.c:1802 |
23385 |
+#: ../src/dialog.c:1784 |
23386 |
msgid "Abort and leave a core file" |
23387 |
msgstr "Abbrechen und Core-Datei hinterlassen" |
23388 |
|
23389 |
-#: ../src/dialog.c:1803 |
23390 |
+#: ../src/dialog.c:1785 |
23391 |
msgid "Restart Window Maker" |
23392 |
msgstr "Window Maker neustarten" |
23393 |
|
23394 |
-#: ../src/dialog.c:1804 |
23395 |
+#: ../src/dialog.c:1786 |
23396 |
msgid "Start alternate window manager" |
23397 |
msgstr "Anderen Windowmanager starten" |
23398 |
|
23399 |
-#: ../src/dialog.c:1982 |
23400 |
+#: ../src/dialog.c:1964 |
23401 |
msgid "" |
23402 |
"Window Maker is part of the GNUstep project.\n" |
23403 |
"The GNUstep project aims to create a free\n" |
23404 |
@@ -510,567 +557,507 @@ |
23405 |
"erstellt. Für weitere Informationen zu GNUstep besuchen\n" |
23406 |
"sie bitte www.gnustep.org" |
23407 |
|
23408 |
-#: ../src/dialog.c:2002 |
23409 |
+#: ../src/dialog.c:1987 |
23410 |
msgid "About GNUstep" |
23411 |
msgstr "Ãber GNUStep" |
23412 |
|
23413 |
-#: ../src/dock.c:213 |
23414 |
+#: ../src/dock.c:193 |
23415 |
#, c-format |
23416 |
msgid "Type the name for workspace %i:" |
23417 |
-msgstr "Geben sie den Namen der Arbeitsfläche %i ein:" |
23418 |
+msgstr "Geben Sie den Namen der Arbeitsfläche %i ein:" |
23419 |
|
23420 |
-#: ../src/dock.c:214 ../src/dock.c:1141 ../src/dock.c:1144 ../src/dock.c:3409 |
23421 |
+#: ../src/dock.c:194 ../src/dock.c:1132 ../src/dock.c:1135 ../src/dock.c:3419 |
23422 |
msgid "Rename Workspace" |
23423 |
msgstr "Arbeitsfläche umbenennen" |
23424 |
|
23425 |
-#: ../src/dock.c:520 ../src/dock.c:528 |
23426 |
+#: ../src/dock.c:509 ../src/dock.c:517 |
23427 |
msgid "Warning" |
23428 |
msgstr "Warnung" |
23429 |
|
23430 |
-#: ../src/dock.c:521 |
23431 |
+#: ../src/dock.c:510 |
23432 |
msgid "" |
23433 |
"Some icons cannot be made omnipresent. Please make sure that no other icon " |
23434 |
"is docked in the same positions on the other workspaces and the Clip is not " |
23435 |
"full in some workspace." |
23436 |
msgstr "" |
23437 |
-"Einige Symbole konnten nicht haftend gemacht werden. Bitte stellen Sie sicher, " |
23438 |
-"dass kein anderes Symbol auf anderen Arbeitflächen an der gleichen Position andockt " |
23439 |
-"und der Clip in keiner Arbeitsfläche voll ist." |
23440 |
+"Einige Symbole konnten nicht haftend gemacht werden. Bitte stellen Sie " |
23441 |
+"sicher, dass kein anderes Symbol auf anderen Arbeitflächen an der gleichen " |
23442 |
+"Position andockt und der Clip in keiner Arbeitsfläche voll ist." |
23443 |
|
23444 |
-#: ../src/dock.c:529 |
23445 |
+#: ../src/dock.c:518 |
23446 |
msgid "" |
23447 |
"Icon cannot be made omnipresent. Please make sure that no other icon is " |
23448 |
"docked in the same position on the other workspaces and the Clip is not full " |
23449 |
"in some workspace." |
23450 |
msgstr "" |
23451 |
-"Symbol konntennicht haftend gemacht werden. Bitte stellen Sie sicher, " |
23452 |
-"dass kein anderes Symbol auf anderen Arbeitflächen an der gleichen Position klebt " |
23453 |
+"Symbol konnte nicht haftend gemacht werden. Bitte stellen Sie sicher, dass " |
23454 |
+"kein anderes Symbol auf anderen Arbeitflächen an der gleichen Position klebt " |
23455 |
"und der Clip in keiner Arbeitsfläche voll ist." |
23456 |
|
23457 |
-#: ../src/dock.c:556 |
23458 |
+#: ../src/dock.c:545 |
23459 |
msgid "Workspace Clip" |
23460 |
msgstr "Arbeitsflächen-Clip" |
23461 |
|
23462 |
-#: ../src/dock.c:557 |
23463 |
+#: ../src/dock.c:546 |
23464 |
msgid "All selected icons will be removed!" |
23465 |
msgstr "Alle ausgewählten Symbole werden entfernt!" |
23466 |
|
23467 |
-#: ../src/dock.c:608 ../src/dock.c:1156 ../src/dock.c:1158 ../src/dock.c:3445 |
23468 |
+#: ../src/dock.c:598 ../src/dock.c:1147 ../src/dock.c:1149 ../src/dock.c:3455 |
23469 |
msgid "Keep Icon" |
23470 |
msgstr "Symbol behalten" |
23471 |
|
23472 |
-#: ../src/dock.c:609 ../src/dock.c:2137 ../src/dock.c:2278 |
23473 |
+#: ../src/dock.c:599 ../src/dock.c:2139 ../src/dock.c:2276 |
23474 |
msgid "Type the command used to launch the application" |
23475 |
msgstr "Geben Sie den Befehl zum Starten der Anwendung ein" |
23476 |
|
23477 |
-#: ../src/dock.c:965 |
23478 |
+#: ../src/dock.c:954 |
23479 |
#, c-format |
23480 |
msgid "could not launch application %s\n" |
23481 |
msgstr "Anwendung %s konnte nicht gestartet werden\n" |
23482 |
|
23483 |
-#: ../src/dock.c:1020 |
23484 |
+#: ../src/dock.c:1010 |
23485 |
msgid "could not create workspace submenu for Clip menu" |
23486 |
msgstr "Arbeitsflächen-Untermenü für Clip konnte nicht erstellt werden" |
23487 |
|
23488 |
-#: ../src/dock.c:1078 |
23489 |
+#: ../src/dock.c:1069 |
23490 |
msgid "could not create options submenu for Clip menu" |
23491 |
msgstr "Eigenschaften-Menü für Clip konnte nicht erstellt werden" |
23492 |
|
23493 |
-#: ../src/dock.c:1082 ../src/dock.c:1130 |
23494 |
+#: ../src/dock.c:1073 ../src/dock.c:1121 |
23495 |
msgid "Keep on Top" |
23496 |
msgstr "Immer oben" |
23497 |
|
23498 |
-#: ../src/dock.c:1088 |
23499 |
+#: ../src/dock.c:1079 |
23500 |
msgid "Collapsed" |
23501 |
msgstr "Zusammengefaltet" |
23502 |
|
23503 |
-#: ../src/dock.c:1094 |
23504 |
+#: ../src/dock.c:1085 |
23505 |
msgid "Autocollapse" |
23506 |
msgstr "Automatisch zusammenfalten" |
23507 |
|
23508 |
-#: ../src/dock.c:1100 |
23509 |
+#: ../src/dock.c:1091 |
23510 |
msgid "Autoraise" |
23511 |
msgstr "Automatisch oben" |
23512 |
|
23513 |
-#: ../src/dock.c:1106 |
23514 |
+#: ../src/dock.c:1097 |
23515 |
msgid "Autoattract Icons" |
23516 |
msgstr "Symbole automatisch anziehen" |
23517 |
|
23518 |
-#: ../src/dock.c:1136 |
23519 |
+#: ../src/dock.c:1127 |
23520 |
msgid "Clip Options" |
23521 |
msgstr "Clip-Optionen" |
23522 |
|
23523 |
-#: ../src/dock.c:1146 |
23524 |
+#: ../src/dock.c:1137 |
23525 |
msgid "Selected" |
23526 |
msgstr "Ausgewählt" |
23527 |
|
23528 |
-#: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3436 |
23529 |
+#: ../src/dock.c:1142 ../src/dock.c:1145 ../src/dock.c:3446 |
23530 |
msgid "Select All Icons" |
23531 |
msgstr "Alle Symbole auswählen" |
23532 |
|
23533 |
-#: ../src/dock.c:1160 ../src/dock.c:1162 ../src/dock.c:3453 |
23534 |
+#: ../src/dock.c:1151 ../src/dock.c:1153 ../src/dock.c:3463 |
23535 |
msgid "Move Icon To" |
23536 |
msgstr "Verschiebe Symbol nach..." |
23537 |
|
23538 |
-#: ../src/dock.c:1167 ../src/dock.c:1170 ../src/dock.c:3464 |
23539 |
+#: ../src/dock.c:1158 ../src/dock.c:1161 ../src/dock.c:3474 |
23540 |
msgid "Remove Icon" |
23541 |
msgstr "Entferne Symbol" |
23542 |
|
23543 |
-#: ../src/dock.c:1172 |
23544 |
+#: ../src/dock.c:1163 |
23545 |
msgid "Attract Icons" |
23546 |
msgstr "Symbole anziehen" |
23547 |
|
23548 |
-#: ../src/dock.c:1175 |
23549 |
+#: ../src/dock.c:1166 |
23550 |
msgid "Launch" |
23551 |
-msgstr "Starten" |
23552 |
+msgstr "Ausführen" |
23553 |
|
23554 |
-#: ../src/dock.c:1183 |
23555 |
+#: ../src/dock.c:1174 |
23556 |
msgid "Settings..." |
23557 |
msgstr "Einstellungen..." |
23558 |
|
23559 |
-#: ../src/dock.c:1548 ../src/dock.c:1655 |
23560 |
+#: ../src/dock.c:1538 ../src/dock.c:1645 |
23561 |
#, c-format |
23562 |
msgid "bad value in docked icon state info %s" |
23563 |
msgstr "falscher Wert für Statusinfo %s des angedockten Symbols" |
23564 |
|
23565 |
-#: ../src/dock.c:1663 |
23566 |
+#: ../src/dock.c:1653 |
23567 |
#, c-format |
23568 |
msgid "bad value in docked icon position %i,%i" |
23569 |
msgstr "falscher Wert für Position eines angedockten Symbols: %i,%i" |
23570 |
|
23571 |
-#: ../src/dock.c:1683 |
23572 |
+#: ../src/dock.c:1673 |
23573 |
#, c-format |
23574 |
msgid "bad value in dock state info:%s" |
23575 |
msgstr "falscher Wert in Dock-Statusinfo: %s" |
23576 |
|
23577 |
-#: ../src/dock.c:1919 |
23578 |
+#: ../src/dock.c:1923 |
23579 |
msgid "there are too many icons stored in dock. Ignoring what doesn't fit" |
23580 |
msgstr "zu viele Symbole im Dock, überzählige werden ignoriert" |
23581 |
|
23582 |
#. icon->forced_dock = 1; |
23583 |
-#: ../src/dock.c:2136 ../src/dock.c:2277 |
23584 |
+#: ../src/dock.c:2138 ../src/dock.c:2275 |
23585 |
msgid "Dock Icon" |
23586 |
msgstr "Dock-Symbol" |
23587 |
|
23588 |
-#: ../src/dock.c:3323 |
23589 |
+#: ../src/dock.c:3333 |
23590 |
#, c-format |
23591 |
msgid "Could not execute command \"%s\"" |
23592 |
msgstr "Befehl \"%s\" konnte nicht ausgeführt werden" |
23593 |
|
23594 |
-#: ../src/dock.c:3415 |
23595 |
+#: ../src/dock.c:3425 |
23596 |
msgid "Toggle Omnipresent" |
23597 |
msgstr "Haftend ein/aus" |
23598 |
|
23599 |
-#: ../src/dock.c:3420 ../src/kwm.c:637 ../src/winmenu.c:413 |
23600 |
-#: ../src/winspector.c:1375 |
23601 |
+#: ../src/dock.c:3430 ../src/winmenu.c:414 ../src/winspector.c:1383 |
23602 |
msgid "Omnipresent" |
23603 |
msgstr "Haftend" |
23604 |
|
23605 |
-#: ../src/dock.c:3434 |
23606 |
+#: ../src/dock.c:3444 |
23607 |
msgid "Unselect All Icons" |
23608 |
msgstr "Alle Symbole abwählen" |
23609 |
|
23610 |
-#: ../src/dock.c:3443 |
23611 |
+#: ../src/dock.c:3453 |
23612 |
msgid "Keep Icons" |
23613 |
msgstr "Symbole behalten" |
23614 |
|
23615 |
-#: ../src/dock.c:3451 |
23616 |
+#: ../src/dock.c:3461 |
23617 |
msgid "Move Icons To" |
23618 |
msgstr "Verschiebe Symbole nach" |
23619 |
|
23620 |
-#: ../src/dock.c:3462 |
23621 |
+#: ../src/dock.c:3472 |
23622 |
msgid "Remove Icons" |
23623 |
msgstr "Symbole entfernen" |
23624 |
|
23625 |
-#: ../src/dock.c:3493 ../src/kwm.c:643 |
23626 |
+#: ../src/dock.c:3503 |
23627 |
msgid "Bring Here" |
23628 |
msgstr "Hierher holen" |
23629 |
|
23630 |
-#: ../src/dockedapp.c:149 |
23631 |
+#: ../src/dockedapp.c:150 |
23632 |
#, c-format |
23633 |
msgid "could not find icon %s, used in a docked application" |
23634 |
msgstr "Symbol %s für gedockte Anwendung konnte nicht gefunden" |
23635 |
|
23636 |
-#: ../src/dockedapp.c:229 |
23637 |
+#: ../src/dockedapp.c:230 |
23638 |
#, c-format |
23639 |
msgid "Could not open specified icon file: %s" |
23640 |
msgstr "Symboldatei %s konnte nicht geöffnet werden" |
23641 |
|
23642 |
-#: ../src/dockedapp.c:231 |
23643 |
+#: ../src/dockedapp.c:232 |
23644 |
msgid "Ignore" |
23645 |
msgstr "Ignorieren" |
23646 |
|
23647 |
-#: ../src/dockedapp.c:333 |
23648 |
+#: ../src/dockedapp.c:334 |
23649 |
msgid "Start when Window Maker is started" |
23650 |
msgstr "Autostart" |
23651 |
|
23652 |
-#: ../src/dockedapp.c:340 |
23653 |
+#: ../src/dockedapp.c:341 |
23654 |
msgid "Lock (prevent accidental removal)" |
23655 |
msgstr "Festhalten (kein versehentliches Entfernen)" |
23656 |
|
23657 |
-#: ../src/dockedapp.c:344 |
23658 |
+#: ../src/dockedapp.c:345 |
23659 |
msgid "Application path and arguments" |
23660 |
msgstr "Anwendungspfad und -argumente" |
23661 |
|
23662 |
-#: ../src/dockedapp.c:357 |
23663 |
+#: ../src/dockedapp.c:358 |
23664 |
msgid "Command for middle-click launch" |
23665 |
msgstr "Befehl für Klick mit mittlerer Maustaste" |
23666 |
|
23667 |
-#: ../src/dockedapp.c:371 |
23668 |
+#: ../src/dockedapp.c:372 |
23669 |
#, c-format |
23670 |
msgid "%s will be replaced with current selection" |
23671 |
msgstr "%s wird durch die aktuelle Auswahl ersetzt" |
23672 |
|
23673 |
-#: ../src/dockedapp.c:376 |
23674 |
+#: ../src/dockedapp.c:377 |
23675 |
msgid "Command for files dropped with DND" |
23676 |
msgstr "Befehl für per DND-Operationen" |
23677 |
|
23678 |
-#: ../src/dockedapp.c:390 |
23679 |
+#: ../src/dockedapp.c:391 |
23680 |
#, c-format |
23681 |
msgid "%d will be replaced with the file name" |
23682 |
msgstr "%d wird durch den Dateinamen ersetzt" |
23683 |
|
23684 |
-#: ../src/dockedapp.c:394 |
23685 |
+#: ../src/dockedapp.c:395 |
23686 |
msgid "DND support was not compiled in" |
23687 |
msgstr "keine einkompilierte DND-Unterstützung" |
23688 |
|
23689 |
-#: ../src/dockedapp.c:399 |
23690 |
+#: ../src/dockedapp.c:400 |
23691 |
msgid "Icon Image" |
23692 |
msgstr "Symbol" |
23693 |
|
23694 |
-#: ../src/dockedapp.c:413 ../src/winspector.c:1513 |
23695 |
+#: ../src/dockedapp.c:414 ../src/winspector.c:1521 |
23696 |
msgid "Browse..." |
23697 |
msgstr "Suchen..." |
23698 |
|
23699 |
-#: ../src/dockedapp.c:466 |
23700 |
+#: ../src/dockedapp.c:475 |
23701 |
msgid "Docked Application Settings" |
23702 |
msgstr "Einstellungen für gedockte Anwendungen" |
23703 |
|
23704 |
-#: ../src/framewin.c:649 ../src/framewin.c:744 ../src/menu.c:456 |
23705 |
+#: ../src/framewin.c:647 ../src/framewin.c:742 ../src/menu.c:463 |
23706 |
#: ../src/texture.c:594 |
23707 |
#, c-format |
23708 |
msgid "could not render texture: %s" |
23709 |
msgstr "Textur %s konnte nicht angezeigt werden" |
23710 |
|
23711 |
-#: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699 |
23712 |
-#: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724 |
23713 |
-#: ../src/icon.c:350 ../src/menu.c:485 |
23714 |
+#: ../src/framewin.c:670 ../src/framewin.c:681 ../src/framewin.c:697 |
23715 |
+#: ../src/framewin.c:708 ../src/framewin.c:715 ../src/framewin.c:722 |
23716 |
+#: ../src/icon.c:360 ../src/menu.c:492 |
23717 |
#, c-format |
23718 |
msgid "error rendering image:%s" |
23719 |
msgstr "Fehler beim Anzeigen des Bildes: %s" |
23720 |
|
23721 |
-#: ../src/framewin.c:777 |
23722 |
+#: ../src/framewin.c:775 |
23723 |
#, c-format |
23724 |
msgid "error rendering image: %s" |
23725 |
msgstr "Fehler beim Anzeigen des Bildes: %s" |
23726 |
|
23727 |
-#: ../src/gnome.c:216 ../src/gnome.c:343 ../src/gnome.c:401 |
23728 |
-msgid "out of memory while updating GNOME hints" |
23729 |
-msgstr "zuwenig Speicher beim Erneuern der GNOME-Hinweise" |
23730 |
- |
23731 |
-#: ../src/icon.c:229 ../src/wdefaults.c:443 |
23732 |
+#: ../src/icon.c:239 ../src/wdefaults.c:443 |
23733 |
#, c-format |
23734 |
msgid "error loading image file \"%s\"" |
23735 |
msgstr "Fehler beim Laden der Bilddatei \"%s\"" |
23736 |
|
23737 |
-#: ../src/icon.c:491 ../src/icon.c:500 |
23738 |
+#: ../src/icon.c:503 ../src/icon.c:512 |
23739 |
#, c-format |
23740 |
msgid "could not create directory %s" |
23741 |
msgstr "Vezeichnis %s konnte nicht erstellt werden" |
23742 |
|
23743 |
-#: ../src/icon.c:767 |
23744 |
+#: ../src/icon.c:782 |
23745 |
#, c-format |
23746 |
msgid "could not find default icon \"%s\"" |
23747 |
msgstr "Standardsymbol \"%s\" konnte nicht gefunden werden" |
23748 |
|
23749 |
-#: ../src/icon.c:773 |
23750 |
+#: ../src/icon.c:788 |
23751 |
#, c-format |
23752 |
msgid "could not load default icon \"%s\":%s" |
23753 |
msgstr "Standardsymbol \"%s\" (%s) konnte nicht geöffnet werden" |
23754 |
|
23755 |
-#. |
23756 |
-#. * Warning: If you make some change that affects the order of the |
23757 |
-#. * entries, you must update the command #defines in the top of |
23758 |
-#. * this file. |
23759 |
-#. |
23760 |
-#: ../src/kwm.c:633 ../src/winmenu.c:436 ../src/winmenu.c:571 |
23761 |
-msgid "Maximize" |
23762 |
-msgstr "Maximieren" |
23763 |
- |
23764 |
-#: ../src/kwm.c:634 ../src/winmenu.c:566 |
23765 |
-msgid "Unmaximize" |
23766 |
-msgstr "Ursprüngliche GröÃe" |
23767 |
- |
23768 |
-#: ../src/kwm.c:635 ../src/winmenu.c:444 ../src/winmenu.c:557 |
23769 |
-msgid "Miniaturize" |
23770 |
-msgstr "Minimieren" |
23771 |
- |
23772 |
-#: ../src/kwm.c:636 ../src/winmenu.c:552 |
23773 |
-msgid "Deminiaturize" |
23774 |
-msgstr "Wiederherstellen" |
23775 |
- |
23776 |
-#: ../src/kwm.c:638 |
23777 |
-msgid "Not Omnipresent" |
23778 |
-msgstr "Nicht haftend" |
23779 |
- |
23780 |
-#: ../src/kwm.c:639 |
23781 |
-msgid "Move" |
23782 |
-msgstr "Bewegen" |
23783 |
- |
23784 |
-#: ../src/kwm.c:640 |
23785 |
-msgid "Resize" |
23786 |
-msgstr "GröÃe ändern" |
23787 |
- |
23788 |
-#. |
23789 |
-#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); |
23790 |
-#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); |
23791 |
-#. |
23792 |
-#: ../src/kwm.c:641 ../src/rootmenu.c:248 ../src/winmenu.c:501 |
23793 |
-msgid "Close" |
23794 |
-msgstr "SchlieÃen" |
23795 |
- |
23796 |
-#: ../src/kwm.c:642 ../src/winmenu.c:485 |
23797 |
-msgid "Move To" |
23798 |
-msgstr "Bewegen nach..." |
23799 |
- |
23800 |
-#: ../src/kwm.c:1096 |
23801 |
-msgid "%a(Run Command,Type the command to run:)" |
23802 |
-msgstr "%a (Befehl zum Ausführen eintippen)" |
23803 |
- |
23804 |
-#: ../src/main.c:222 |
23805 |
+#: ../src/main.c:220 |
23806 |
msgid "failed to restart Window Maker." |
23807 |
msgstr "Window Maker-Neustart schlug fehl" |
23808 |
|
23809 |
-#: ../src/main.c:225 |
23810 |
+#: ../src/main.c:223 |
23811 |
#, c-format |
23812 |
msgid "could not exec %s" |
23813 |
msgstr "%s konnte nicht ausgeführt werden" |
23814 |
|
23815 |
-#: ../src/main.c:271 |
23816 |
+#: ../src/main.c:269 |
23817 |
msgid "Could not execute command: " |
23818 |
msgstr "Befehl konnte nicht ausgeführt werden: " |
23819 |
|
23820 |
-#: ../src/main.c:428 |
23821 |
+#: ../src/main.c:426 |
23822 |
#, c-format |
23823 |
msgid "%s aborted.\n" |
23824 |
msgstr "%s wurde abgebrochen.\n" |
23825 |
|
23826 |
-#: ../src/main.c:439 |
23827 |
+#: ../src/main.c:437 |
23828 |
#, c-format |
23829 |
msgid "Usage: %s [options]\n" |
23830 |
msgstr "Benutzung: %s [Optionen]\n" |
23831 |
|
23832 |
-#: ../src/main.c:440 |
23833 |
+#: ../src/main.c:438 |
23834 |
msgid "The Window Maker window manager for the X window system" |
23835 |
-msgstr "Der Window Maker Windowmanager für das X-Window System" |
23836 |
+msgstr "Der Window Maker-Windowmanager für das X-Window System" |
23837 |
|
23838 |
-#: ../src/main.c:442 |
23839 |
+#: ../src/main.c:440 |
23840 |
msgid " -display host:dpy\tdisplay to use" |
23841 |
msgstr " -display host:dpy\tverwendetes Display" |
23842 |
|
23843 |
-#: ../src/main.c:444 |
23844 |
+#: ../src/main.c:442 |
23845 |
msgid " --no-cpp \t\tdisable preprocessing of configuration files" |
23846 |
-msgstr " --no-cpp \t\tkein Abarbeiten der Konfigurationsdateien" |
23847 |
+msgstr " --no-cpp \t\tkein Präprozessieren der Konfigurationsdateien" |
23848 |
|
23849 |
-#: ../src/main.c:446 |
23850 |
+#: ../src/main.c:444 |
23851 |
msgid " --no-dock\t\tdo not open the application Dock" |
23852 |
msgstr " --no-dock\t\tAnwendungsdock nicht öffnen" |
23853 |
|
23854 |
-#: ../src/main.c:447 |
23855 |
+#: ../src/main.c:445 |
23856 |
msgid " --no-clip\t\tdo not open the workspace Clip" |
23857 |
msgstr " --no-clip\t\tArbeitsflächen-Clip nicht öffnen" |
23858 |
|
23859 |
-#: ../src/main.c:448 |
23860 |
+#: ../src/main.c:446 |
23861 |
msgid " --no-autolaunch\tdo not autolaunch applications" |
23862 |
-msgstr " --no-autolaunch\tkein Anwendungs-Autostart" |
23863 |
+msgstr " --no-autolaunch\tkein Autostart von Anwendungen" |
23864 |
|
23865 |
-#: ../src/main.c:449 |
23866 |
+#: ../src/main.c:447 |
23867 |
msgid " --dont-restore\t\tdo not restore saved session" |
23868 |
msgstr " --dont-restore\t\tgespeicherte Sitzung nicht wiederherstellen" |
23869 |
|
23870 |
-#: ../src/main.c:451 |
23871 |
+#: ../src/main.c:449 |
23872 |
msgid " --locale locale\tlocale to use" |
23873 |
-msgstr " --locale locale\tbenutzte Lokale" |
23874 |
+msgstr " --locale locale\tzu benutzende Lokalisierung" |
23875 |
|
23876 |
-#: ../src/main.c:453 |
23877 |
+#: ../src/main.c:451 |
23878 |
msgid " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals" |
23879 |
-msgstr " --create-stdcmap\terstelle Hinweise für Standardfarben-Tabelle mit Pseudofarben" |
23880 |
+msgstr "" |
23881 |
+" --create-stdcmap\terstelle Hinweise für Standardfarben-Tabelle mit " |
23882 |
+"Pseudofarben" |
23883 |
|
23884 |
-#: ../src/main.c:454 |
23885 |
+#: ../src/main.c:452 |
23886 |
msgid " --visual-id visualid\tvisual id of visual to use" |
23887 |
msgstr " --visual-id visualid\tID des zu benutzenden Visuals" |
23888 |
|
23889 |
-#: ../src/main.c:455 |
23890 |
+#: ../src/main.c:453 |
23891 |
msgid " --static\t\tdo not update or save configurations" |
23892 |
msgstr " --static\t\tKonfiguration nicht ändern oder speichern" |
23893 |
|
23894 |
-#: ../src/main.c:456 |
23895 |
+#: ../src/main.c:454 |
23896 |
msgid " --no-polling\t\tdo not periodically check for configuration updates" |
23897 |
msgstr " --no-polling\t\tnicht periodisch auf Konfigurationsänderungen testen" |
23898 |
|
23899 |
-#: ../src/main.c:458 |
23900 |
+#: ../src/main.c:456 |
23901 |
msgid " --synchronous\t\tturn on synchronous display mode" |
23902 |
msgstr " --synchronous\t\tsnychronen Display-Modus einschalten" |
23903 |
|
23904 |
-#: ../src/main.c:460 |
23905 |
+#: ../src/main.c:458 |
23906 |
msgid " --version\t\tprint version and exit" |
23907 |
msgstr " --version\t\tVersion anzeigen und beenden" |
23908 |
|
23909 |
-#: ../src/main.c:461 |
23910 |
+#: ../src/main.c:459 |
23911 |
msgid " --help\t\t\tshow this message" |
23912 |
msgstr " --help\t\t\tdiese Nachricht anzeigen" |
23913 |
|
23914 |
-#: ../src/main.c:474 |
23915 |
+#: ../src/main.c:473 |
23916 |
#, c-format |
23917 |
msgid "" |
23918 |
"could not find user GNUstep directory (%s).\n" |
23919 |
"Make sure you have installed Window Maker correctly and run wmaker.inst" |
23920 |
msgstr "" |
23921 |
"GNUstep-Verzeichnis (%s) konnte nicht gefunden werden.\n" |
23922 |
-"Stellen Sie sicher, dass sie Window Maker korrekt installiert und wmaker.inst aufgerufen haben" |
23923 |
+"Stellen Sie sicher, dass sie Window Maker korrekt installiert und wmaker." |
23924 |
+"inst aufgerufen haben" |
23925 |
|
23926 |
-#: ../src/main.c:479 |
23927 |
+#: ../src/main.c:478 |
23928 |
#, c-format |
23929 |
msgid "could not find user GNUstep directory (%s)." |
23930 |
msgstr "GNUstep-Verzeichnis (%s) konnte nicht gefunden werden." |
23931 |
|
23932 |
-#: ../src/main.c:482 |
23933 |
+#: ../src/main.c:481 |
23934 |
msgid "" |
23935 |
"There was an error while creating GNUstep directory, please make sure you " |
23936 |
"have installed Window Maker correctly and run wmaker.inst" |
23937 |
msgstr "" |
23938 |
-"Während der Erstellung der GNUstep-Verzeichnisses ist ein Fehler aufgetreten, " |
23939 |
-"Stellen Sie sicher, dass sie Window Maker korrekt installiert und wmaker.inst aufgerufen haben" |
23940 |
+"Während der Erstellung der GNUstep-Verzeichnisses ist ein Fehler " |
23941 |
+"aufgetreten, Stellen Sie sicher, dass sie Window Maker korrekt installiert " |
23942 |
+"und wmaker.inst aufgerufen haben" |
23943 |
|
23944 |
-#: ../src/main.c:485 |
23945 |
+#: ../src/main.c:484 |
23946 |
#, c-format |
23947 |
msgid "%s directory created with default configuration." |
23948 |
msgstr "Verzeichnis %s wurde mit Standardkonfiguration erstellt" |
23949 |
|
23950 |
-#: ../src/main.c:505 ../src/main.c:510 |
23951 |
+#: ../src/main.c:506 ../src/main.c:511 |
23952 |
#, c-format |
23953 |
msgid "%s:could not execute initialization script" |
23954 |
msgstr "%s:Initialisierungsskript konnte nicht ausgeführt werden" |
23955 |
|
23956 |
-#: ../src/main.c:530 ../src/main.c:535 |
23957 |
+#: ../src/main.c:533 ../src/main.c:538 |
23958 |
#, c-format |
23959 |
msgid "%s:could not execute exit script" |
23960 |
msgstr "%s: Beendigungsskript konnte nicht ausgeführt werden" |
23961 |
|
23962 |
-#: ../src/main.c:651 ../src/main.c:659 ../src/main.c:667 ../src/main.c:687 |
23963 |
+#: ../src/main.c:622 ../src/main.c:722 ../src/main.c:730 ../src/main.c:738 |
23964 |
+#: ../src/main.c:758 |
23965 |
#, c-format |
23966 |
msgid "too few arguments for %s" |
23967 |
msgstr "zuwenig Argumente für %s" |
23968 |
|
23969 |
-#: ../src/main.c:671 |
23970 |
+#: ../src/main.c:742 |
23971 |
#, c-format |
23972 |
msgid "bad value for visualid: \"%s\"" |
23973 |
msgstr "falscher Wert für Visual-ID: \"%s\"" |
23974 |
|
23975 |
-#: ../src/main.c:695 |
23976 |
+#: ../src/main.c:766 |
23977 |
#, c-format |
23978 |
msgid "%s: invalid argument '%s'\n" |
23979 |
msgstr "%s: falsches Argument '%s'\n" |
23980 |
|
23981 |
-#: ../src/main.c:696 |
23982 |
+#: ../src/main.c:767 |
23983 |
#, c-format |
23984 |
msgid "Try '%s --help' for more information\n" |
23985 |
msgstr "Versuchen Sie '%s --help' für mehr Informationen\n" |
23986 |
|
23987 |
-#: ../src/main.c:727 |
23988 |
+#: ../src/main.c:802 |
23989 |
msgid "X server does not support locale" |
23990 |
-msgstr "X-Server unterstützt keine Locales" |
23991 |
+msgstr "X-Server unterstützt gewählte Lokalisierung nicht" |
23992 |
|
23993 |
-#: ../src/main.c:731 |
23994 |
+#: ../src/main.c:806 |
23995 |
msgid "cannot set locale modifiers" |
23996 |
-msgstr "Lokalen-Modifikator konnte nicht gesetzt werden" |
23997 |
+msgstr "Lokalisierungs-Modifikator konnte nicht gesetzt werden" |
23998 |
|
23999 |
-#: ../src/main.c:747 |
24000 |
+#: ../src/main.c:822 |
24001 |
#, c-format |
24002 |
msgid "could not open display \"%s\"" |
24003 |
msgstr "Display \"%s\" konnte nicht geöffnet werden" |
24004 |
|
24005 |
-#: ../src/menu.c:1255 |
24006 |
+#: ../src/menu.c:1276 |
24007 |
msgid "could not grab keyboard" |
24008 |
msgstr "Tastatur konnte nicht abfangen werden" |
24009 |
|
24010 |
-#: ../src/menu.c:2569 |
24011 |
+#: ../src/menu.c:2615 |
24012 |
#, c-format |
24013 |
msgid "bad value in menus state info:%s" |
24014 |
msgstr "falsche Werte in Menü-Statusinfo: %s" |
24015 |
|
24016 |
-#: ../src/misc.c:71 |
24017 |
+#: ../src/misc.c:65 |
24018 |
#, c-format |
24019 |
msgid "could not define value for %s for cpp" |
24020 |
-msgstr "Wert für %s für cpp konnte nicht definiert werden" |
24021 |
+msgstr "Wert des Symbols %s für cpp konnte nicht definiert werden" |
24022 |
|
24023 |
-#: ../src/misc.c:101 |
24024 |
+#: ../src/misc.c:95 |
24025 |
#, c-format |
24026 |
msgid "could not get password entry for UID %i" |
24027 |
-msgstr "Passwort für UID %i konnte nicht ermittelt werden" |
24028 |
+msgstr "Passworteintrag für UID %i konnte nicht ermittelt werden" |
24029 |
|
24030 |
-#: ../src/misc.c:126 |
24031 |
+#: ../src/misc.c:120 |
24032 |
#, c-format |
24033 |
msgid "your machine is misconfigured. HOSTNAME is set to %s" |
24034 |
msgstr "Ihr System ist falsch konfiguriert. HOSTNAME wird auf %s gesetzt." |
24035 |
|
24036 |
-#: ../src/misc.c:132 |
24037 |
+#: ../src/misc.c:126 |
24038 |
#, c-format |
24039 |
msgid "your machine is misconfigured. HOST is set to %s" |
24040 |
msgstr "Ihr System ist falsch konfiguriert. HOST wird auf %s gesetzt." |
24041 |
|
24042 |
-#: ../src/misc.c:630 |
24043 |
+#: ../src/misc.c:621 |
24044 |
msgid "Program Arguments" |
24045 |
msgstr "Programmargumente" |
24046 |
|
24047 |
-#: ../src/misc.c:631 |
24048 |
+#: ../src/misc.c:622 |
24049 |
msgid "Enter command arguments:" |
24050 |
msgstr "Programmargumente eintragen" |
24051 |
|
24052 |
-#: ../src/misc.c:724 |
24053 |
-msgid "unable to get dropped data from DND drop" |
24054 |
-msgstr "Daten der DND-Operation konnten nicht ermittelt werden" |
24055 |
- |
24056 |
-#: ../src/misc.c:732 |
24057 |
-msgid "error getting dropped data from DND drop" |
24058 |
-msgstr "beim Ermitteln der Daten der DND-Operation ist ein Fehler aufgetreten" |
24059 |
- |
24060 |
-#: ../src/misc.c:738 |
24061 |
-msgid "out of memory while getting data from DND drop" |
24062 |
-msgstr "zuwenig Speicher beim Ermitteln der Daten der DND-Operation" |
24063 |
- |
24064 |
-#: ../src/misc.c:783 ../src/misc.c:923 |
24065 |
+#: ../src/misc.c:736 ../src/misc.c:874 |
24066 |
#, c-format |
24067 |
msgid "out of memory during expansion of \"%s\"" |
24068 |
msgstr "zuwenig Speicher bei der Expansion von \"%s\"" |
24069 |
|
24070 |
-#: ../src/misc.c:837 |
24071 |
+#: ../src/misc.c:790 |
24072 |
msgid "out of memory during expansion of \"%w\"" |
24073 |
msgstr "zuwenig Speicher bei der Expansion von \"%w\"" |
24074 |
|
24075 |
-#: ../src/misc.c:855 |
24076 |
+#: ../src/misc.c:808 |
24077 |
msgid "out of memory during expansion of \"%W\"" |
24078 |
msgstr "zuwenig Speicher bei der Expansion von \"%W\"" |
24079 |
|
24080 |
-#: ../src/misc.c:871 |
24081 |
+#: ../src/misc.c:824 |
24082 |
+#, c-format |
24083 |
msgid "out of memory during expansion of \"%a\"" |
24084 |
msgstr "zuwenig Speicher bei der Expansion von \"%a\"" |
24085 |
|
24086 |
-#: ../src/misc.c:902 |
24087 |
+#: ../src/misc.c:853 |
24088 |
#, c-format |
24089 |
msgid "out of memory during expansion of \"%d\"" |
24090 |
msgstr "zuwenig Speicher bei der Expansion von \"%d\"" |
24091 |
|
24092 |
-#: ../src/misc.c:916 |
24093 |
+#: ../src/misc.c:867 |
24094 |
msgid "selection not available" |
24095 |
msgstr "keine Auswahl verfügbar" |
24096 |
|
24097 |
-#: ../src/misc.c:972 ../src/misc.c:978 |
24098 |
+#: ../src/misc.c:911 ../src/misc.c:917 |
24099 |
#, c-format |
24100 |
msgid "bad window name value in %s state info" |
24101 |
msgstr "falscher Fenstername in Statusinfo von %s" |
24102 |
|
24103 |
-#: ../src/misc.c:1235 |
24104 |
+#: ../src/misc.c:1156 |
24105 |
msgid "could not send message to background image helper" |
24106 |
msgstr "Nachricht an Hintergrundbild-Anwendung konnte nicht gesendet werden" |
24107 |
|
24108 |
@@ -1109,6 +1096,14 @@ |
24109 |
"Windowsystem-Sitzung beenden?\n" |
24110 |
"Ungespeicherte Daten in Anwendungen können verloren gehen." |
24111 |
|
24112 |
+#. |
24113 |
+#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); |
24114 |
+#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); |
24115 |
+#. |
24116 |
+#: ../src/rootmenu.c:248 ../src/winmenu.c:501 |
24117 |
+msgid "Close" |
24118 |
+msgstr "SchlieÃen" |
24119 |
+ |
24120 |
#: ../src/rootmenu.c:261 |
24121 |
msgid "Kill X session" |
24122 |
msgstr "Töte X-Sitzung" |
24123 |
@@ -1121,194 +1116,200 @@ |
24124 |
"Windowsystem-Sitzung töten?\n" |
24125 |
"(alle Anwendungen werden geschlossen)" |
24126 |
|
24127 |
-#: ../src/rootmenu.c:536 |
24128 |
+#: ../src/rootmenu.c:544 |
24129 |
#, c-format |
24130 |
msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" |
24131 |
msgstr "%s: ungültiges Tastaturkürzel \"%s\" für Eintrag %s" |
24132 |
|
24133 |
-#: ../src/rootmenu.c:544 |
24134 |
+#: ../src/rootmenu.c:552 |
24135 |
#, c-format |
24136 |
msgid "%s:invalid key in shortcut \"%s\" for entry %s" |
24137 |
msgstr "%s: ungültige Taste in Kürzel \"%s\" für Eintrag %s" |
24138 |
|
24139 |
-#: ../src/rootmenu.c:597 |
24140 |
+#: ../src/rootmenu.c:605 |
24141 |
#, c-format |
24142 |
msgid "%s: unmatched '\"' in menu file" |
24143 |
msgstr "%s: fehlendes \" in Menüdatei" |
24144 |
|
24145 |
-#: ../src/rootmenu.c:647 |
24146 |
+#: ../src/rootmenu.c:655 |
24147 |
#, c-format |
24148 |
msgid "%s: missing command" |
24149 |
msgstr "%s: fehlender Befehl" |
24150 |
|
24151 |
-#: ../src/rootmenu.c:679 |
24152 |
+#: ../src/rootmenu.c:687 |
24153 |
#, c-format |
24154 |
msgid "invalid OPEN_MENU specification: %s" |
24155 |
msgstr "ungültige OPEN_MENU-Beschreibung: %s" |
24156 |
|
24157 |
-#: ../src/rootmenu.c:730 |
24158 |
+#: ../src/rootmenu.c:738 |
24159 |
#, c-format |
24160 |
msgid "%s:could not stat menu" |
24161 |
msgstr "%s: Menü konnte nicht erzeugt werden" |
24162 |
|
24163 |
-#: ../src/rootmenu.c:738 |
24164 |
+#: ../src/rootmenu.c:746 |
24165 |
#, c-format |
24166 |
msgid "%s:could not stat menu:%s" |
24167 |
msgstr "%s: Menü konnte nicht erzeugt werden: %s" |
24168 |
|
24169 |
-#: ../src/rootmenu.c:756 |
24170 |
+#: ../src/rootmenu.c:764 |
24171 |
#, c-format |
24172 |
msgid "too many parameters in OPEN_MENU: %s" |
24173 |
msgstr "zuviele Parameter in OPEN_MENU: %s" |
24174 |
|
24175 |
-#: ../src/rootmenu.c:800 |
24176 |
+#: ../src/rootmenu.c:808 |
24177 |
msgid "" |
24178 |
"There are more than one WORKSPACE_MENU commands in the applications menu. " |
24179 |
"Only one is allowed." |
24180 |
-msgstr "Im Anwendungsmenü ist mehr als ein WORKSPACE_MENU-Eintrag, aber nur einer ist erlaubt." |
24181 |
+msgstr "" |
24182 |
+"Im Anwendungsmenü ist mehr als ein WORKSPACE_MENU-Eintrag, aber nur einer " |
24183 |
+"ist erlaubt." |
24184 |
|
24185 |
-#: ../src/rootmenu.c:834 |
24186 |
+#: ../src/rootmenu.c:842 |
24187 |
msgid "" |
24188 |
"There are more than one WINDOWS_MENU commands in the applications menu. Only " |
24189 |
"one is allowed." |
24190 |
-msgstr "Im Anwendungsmenü ist mehr als ein WINDOWS_MENU-Eintrag, aber nur einer ist erlaubt." |
24191 |
+msgstr "" |
24192 |
+"Im Anwendungsmenü ist mehr als ein WINDOWS_MENU-Eintrag, aber nur einer ist " |
24193 |
+"erlaubt." |
24194 |
|
24195 |
-#: ../src/rootmenu.c:839 |
24196 |
+#: ../src/rootmenu.c:847 |
24197 |
msgid "Window List" |
24198 |
msgstr "Fenster-Liste" |
24199 |
|
24200 |
-#: ../src/rootmenu.c:868 ../src/rootmenu.c:886 ../src/rootmenu.c:896 |
24201 |
+#: ../src/rootmenu.c:876 ../src/rootmenu.c:894 ../src/rootmenu.c:904 |
24202 |
#, c-format |
24203 |
msgid "%s:missing parameter for menu command \"%s\"" |
24204 |
msgstr "%s: fehlender Parameter für Menübefehl \"%s\"" |
24205 |
|
24206 |
-#: ../src/rootmenu.c:964 |
24207 |
+#: ../src/rootmenu.c:972 |
24208 |
#, c-format |
24209 |
msgid "%s:unknown command \"%s\" in menu config." |
24210 |
msgstr "%s: unbekannter Befehl \"%s\" in Menükonfiguration" |
24211 |
|
24212 |
-#: ../src/rootmenu.c:972 |
24213 |
+#: ../src/rootmenu.c:980 |
24214 |
#, c-format |
24215 |
msgid "%s:can't add shortcut for entry \"%s\"" |
24216 |
msgstr "%s: Tastaturkürzel für Eintrag \"%s\" kann nicht hinzugefügt werden" |
24217 |
|
24218 |
-#: ../src/rootmenu.c:1109 |
24219 |
+#: ../src/rootmenu.c:1117 |
24220 |
#, c-format |
24221 |
msgid "%s:maximal line size exceeded in menu config: %s" |
24222 |
msgstr "%s: überlange Zeilen in Menükonfiguration: %s" |
24223 |
|
24224 |
-#: ../src/rootmenu.c:1131 ../src/rootmenu.c:1224 ../src/rootmenu.c:1326 |
24225 |
+#: ../src/rootmenu.c:1139 ../src/rootmenu.c:1232 ../src/rootmenu.c:1336 |
24226 |
#, c-format |
24227 |
msgid "%s:missing command in menu config: %s" |
24228 |
msgstr "%s: fehlender Befehl in Menükonfiguration: %s" |
24229 |
|
24230 |
-#: ../src/rootmenu.c:1161 |
24231 |
+#: ../src/rootmenu.c:1169 |
24232 |
#, c-format |
24233 |
msgid "%s:syntax error in menu file:END declaration missing" |
24234 |
msgstr "%s: Syntaxfehler in Menüdatei: END-Schlüsselwort fehlt." |
24235 |
|
24236 |
-#: ../src/rootmenu.c:1190 ../src/rootmenu.c:1290 |
24237 |
+#: ../src/rootmenu.c:1198 ../src/rootmenu.c:1300 |
24238 |
msgid "could not make arguments for menu file preprocessor" |
24239 |
msgstr "Argumente für Menüdatei-Präprozessort konnten nicht gesetzt werden" |
24240 |
|
24241 |
-#: ../src/rootmenu.c:1197 ../src/rootmenu.c:1298 |
24242 |
+#: ../src/rootmenu.c:1205 ../src/rootmenu.c:1308 |
24243 |
#, c-format |
24244 |
msgid "%s:could not open/preprocess menu file" |
24245 |
msgstr "%s: Menüdatei konnte nicht geöffnet/bearbeitet werden" |
24246 |
|
24247 |
-#: ../src/rootmenu.c:1209 ../src/rootmenu.c:1311 |
24248 |
+#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321 |
24249 |
#, c-format |
24250 |
msgid "%s:could not open menu file" |
24251 |
msgstr "%s: Menüdatei konnte nicht geöffnet werden" |
24252 |
|
24253 |
-#: ../src/rootmenu.c:1236 |
24254 |
+#: ../src/rootmenu.c:1244 |
24255 |
#, c-format |
24256 |
msgid "%s:invalid menu file. MENU command is missing" |
24257 |
msgstr "%s: ungültige Menüdatei: MENU-Befehl fehlt" |
24258 |
|
24259 |
-#: ../src/rootmenu.c:1245 |
24260 |
+#: ../src/rootmenu.c:1253 |
24261 |
msgid "error reading preprocessed menu data" |
24262 |
msgstr "Fehler beim Lesen der aufbereiteten Menüdaten" |
24263 |
|
24264 |
-#: ../src/rootmenu.c:1338 |
24265 |
+#: ../src/rootmenu.c:1348 |
24266 |
#, c-format |
24267 |
msgid "%s:no title given for the root menu" |
24268 |
msgstr "%s: kein Titel für das Stammenü" |
24269 |
|
24270 |
-#: ../src/rootmenu.c:1429 ../src/rootmenu.c:1502 ../src/rootmenu.c:1543 |
24271 |
+#: ../src/rootmenu.c:1439 ../src/rootmenu.c:1512 ../src/rootmenu.c:1553 |
24272 |
#, c-format |
24273 |
msgid "out of memory while constructing directory menu %s" |
24274 |
msgstr "zuwenig Speicher beim Erstellen des Verzeichnismenüs %s" |
24275 |
|
24276 |
-#: ../src/rootmenu.c:1439 |
24277 |
+#: ../src/rootmenu.c:1449 |
24278 |
#, c-format |
24279 |
msgid "%s:could not stat file \"%s\" in menu directory" |
24280 |
msgstr "%s: Datei \"%s\" in Menü-Verzeichnis konnte nicht erstellt werden" |
24281 |
|
24282 |
-#: ../src/rootmenu.c:1597 |
24283 |
+#: ../src/rootmenu.c:1607 |
24284 |
msgid "Commands" |
24285 |
msgstr "Befehle" |
24286 |
|
24287 |
-#: ../src/rootmenu.c:1600 |
24288 |
+#: ../src/rootmenu.c:1610 |
24289 |
msgid "Restart" |
24290 |
msgstr "Neustart" |
24291 |
|
24292 |
-#: ../src/rootmenu.c:1601 |
24293 |
+#: ../src/rootmenu.c:1611 |
24294 |
msgid "Exit..." |
24295 |
msgstr "Beenden..." |
24296 |
|
24297 |
-#: ../src/rootmenu.c:1646 |
24298 |
+#: ../src/rootmenu.c:1656 |
24299 |
#, c-format |
24300 |
msgid "could not find menu file \"%s\" referenced in WMRootMenu" |
24301 |
-msgstr "Menüdate \"%s\" aus WMRootMenu konnte nicht gefunden werden" |
24302 |
+msgstr "Menüdatei \"%s\" aus WMRootMenu konnte nicht gefunden werden" |
24303 |
|
24304 |
-#: ../src/rootmenu.c:1653 |
24305 |
+#: ../src/rootmenu.c:1663 |
24306 |
#, c-format |
24307 |
msgid "could not access menu \"%s\" referenced in WMRootMenu" |
24308 |
-msgstr "auf Menüdate \"%s\" aus WMRootMenu konnte nicht zugegriffen werden" |
24309 |
+msgstr "auf Menüdatei \"%s\" aus WMRootMenu konnte nicht zugegriffen werden" |
24310 |
|
24311 |
-#: ../src/rootmenu.c:1664 |
24312 |
+#: ../src/rootmenu.c:1674 |
24313 |
#, c-format |
24314 |
msgid "" |
24315 |
"using default menu file \"%s\" as the menu referenced in WMRootMenu could " |
24316 |
"not be found " |
24317 |
msgstr "Standard-Menüdatei \"%s\" aus WMRootMenu konnte nicht gefunden werden " |
24318 |
|
24319 |
-#: ../src/rootmenu.c:1687 ../src/rootmenu.c:1763 |
24320 |
+#: ../src/rootmenu.c:1697 ../src/rootmenu.c:1773 |
24321 |
#, c-format |
24322 |
msgid "%s:format error in root menu configuration \"%s\"" |
24323 |
msgstr "%s: Formatierungsfehler in Stammenü-Konfiguration \"%s\"" |
24324 |
|
24325 |
-#: ../src/rootmenu.c:1851 |
24326 |
+#: ../src/rootmenu.c:1855 |
24327 |
msgid "" |
24328 |
"The applications menu could not be loaded. Look at the console output for a " |
24329 |
"detailed description of the errors." |
24330 |
-msgstr "Das Anwendungsmenü konnte nicht geladen werden. Für detaillierte Fehlerbeschreibungen bitte die Konsolenausgabe ansehen." |
24331 |
+msgstr "" |
24332 |
+"Das Anwendungsmenü konnte nicht geladen werden. Für detaillierte " |
24333 |
+"Fehlerbeschreibungen bitte die Konsolenausgabe ansehen." |
24334 |
|
24335 |
-#: ../src/screen.c:740 |
24336 |
+#: ../src/screen.c:709 |
24337 |
#, c-format |
24338 |
msgid "could not initialize graphics library context: %s" |
24339 |
msgstr "Kontext der Grafikbibliothek konnte nicht initialisiert werden: %s" |
24340 |
|
24341 |
-#: ../src/screen.c:771 |
24342 |
-msgid "could not do initialization of WINGs widget set" |
24343 |
-msgstr "WINGs Widgets konnten nicht initialisiert werden" |
24344 |
+#: ../src/screen.c:737 |
24345 |
+msgid "could not initialize WINGs widget set" |
24346 |
+msgstr "WINGs-Widgets konnten nicht initialisiert werden" |
24347 |
|
24348 |
-#: ../src/screen.c:1139 |
24349 |
+#: ../src/screen.c:1144 |
24350 |
#, c-format |
24351 |
msgid "could not save session state in %s" |
24352 |
msgstr "Sitzung konnte nicht in %s gespeichert werden" |
24353 |
|
24354 |
-#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:454 |
24355 |
+#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:459 |
24356 |
#, c-format |
24357 |
msgid "can't convert \"%s\" to boolean" |
24358 |
-msgstr "\"%s\" konnte nicht in Wahrheitswert konvertiert werden" |
24359 |
+msgstr "\"%s\" konnte nicht in Boolean konvertiert werden" |
24360 |
|
24361 |
-#: ../src/session.c:1021 |
24362 |
+#: ../src/session.c:1018 |
24363 |
msgid "out of memory while saving session state" |
24364 |
msgstr "zuwenig Speicher beim Sichern der Sitzung" |
24365 |
|
24366 |
-#: ../src/session.c:1104 |
24367 |
+#: ../src/session.c:1101 |
24368 |
msgid "end of memory while saving session state" |
24369 |
msgstr "zuwenig Speicher beim Sichern der Sitzung" |
24370 |
|
24371 |
@@ -1318,107 +1319,42 @@ |
24372 |
#. * If the sm was the last client of session, then we'll die |
24373 |
#. * anyway, otherwise we can continue doing our stuff. |
24374 |
#. |
24375 |
-#: ../src/session.c:1242 |
24376 |
+#: ../src/session.c:1239 |
24377 |
msgid "connection to the session manager was lost" |
24378 |
msgstr "Verbindung zum Sitzungsmanager verloren" |
24379 |
|
24380 |
-#: ../src/stacking.c:79 |
24381 |
+#: ../src/stacking.c:81 |
24382 |
msgid "could not get window list!!" |
24383 |
msgstr "Konnte Fensterliste nicht erstellen!" |
24384 |
|
24385 |
-#: ../src/startup.c:202 |
24386 |
+#: ../src/startup.c:195 |
24387 |
#, c-format |
24388 |
msgid "internal X error: %s\n" |
24389 |
msgstr "interner X-Fehler %s\n" |
24390 |
|
24391 |
-#: ../src/startup.c:260 |
24392 |
-#, c-format |
24393 |
-msgid "got signal %i (%s) - restarting\n" |
24394 |
-msgstr "Signal %i (%s) erhalten - starte neu...\n" |
24395 |
- |
24396 |
-#: ../src/startup.c:262 |
24397 |
-#, c-format |
24398 |
-msgid "got signal %i - restarting\n" |
24399 |
-msgstr "Signal %i erhalten - starte neu...\n" |
24400 |
- |
24401 |
-#: ../src/startup.c:272 |
24402 |
-#, c-format |
24403 |
-msgid "got signal %i (%s) - rereading defaults\n" |
24404 |
-msgstr "Signal %i (%s) erhalten - Standard werden neu eingelesen\n" |
24405 |
- |
24406 |
-#: ../src/startup.c:274 |
24407 |
-#, c-format |
24408 |
-msgid "got signal %i - rereading defaults\n" |
24409 |
-msgstr "Signal %i erhalten - Standard werden neu eingelesen\n" |
24410 |
- |
24411 |
-#: ../src/startup.c:284 |
24412 |
-#, c-format |
24413 |
-msgid "got signal %i (%s) - exiting...\n" |
24414 |
-msgstr "Signal %i (%s) erhalten - beende...\n" |
24415 |
- |
24416 |
-#: ../src/startup.c:286 |
24417 |
-#, c-format |
24418 |
-msgid "got signal %i - exiting...\n" |
24419 |
-msgstr "Signal %i erhalten - beende...\n" |
24420 |
- |
24421 |
-#: ../src/startup.c:329 |
24422 |
-#, c-format |
24423 |
-msgid "got signal %i (%s)\n" |
24424 |
-msgstr "Signal %i (%s) erhalten\n" |
24425 |
- |
24426 |
-#: ../src/startup.c:331 |
24427 |
-#, c-format |
24428 |
-msgid "got signal %i\n" |
24429 |
-msgstr "Signal %i erhalten\n" |
24430 |
- |
24431 |
-#: ../src/startup.c:342 |
24432 |
-msgid "crashed while trying to do some post-crash cleanup. Aborting immediatelly." |
24433 |
-msgstr "Beim Aufräumen nach einem Fehler trat ein weiterer Fehler auf. Programm wird sofort angebrochen." |
24434 |
- |
24435 |
-#. we try to restart Window Maker |
24436 |
-#: ../src/startup.c:407 |
24437 |
-msgid "trying to restart Window Maker..." |
24438 |
-msgstr "versuche, Window Maker neu zu starten..." |
24439 |
- |
24440 |
-#: ../src/startup.c:412 |
24441 |
-msgid "trying to start alternate window manager..." |
24442 |
-msgstr "versuche, anderen Windowmanager zu starten..." |
24443 |
- |
24444 |
-#: ../src/startup.c:417 |
24445 |
-msgid "failed to start alternate window manager. Aborting." |
24446 |
-msgstr "Start eines anderen Windowmanagers schlug fehl. Breche ab." |
24447 |
- |
24448 |
-#: ../src/startup.c:419 |
24449 |
-msgid "" |
24450 |
-"a fatal error has occured, probably due to a bug. Please fill the included " |
24451 |
-"BUGFORM and report it." |
24452 |
-msgstr "" |
24453 |
-"Ein fataler Fehler ist möglicherweise aufgrund eines Programmfehlers aufgetreten. Bitte füllen Sie die " |
24454 |
-"mitgelieferte BUGFORM aus und schicken sie an bugs@×××××××××××.org" |
24455 |
- |
24456 |
-#: ../src/startup.c:894 |
24457 |
+#: ../src/startup.c:772 |
24458 |
#, c-format |
24459 |
msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" |
24460 |
-msgstr "SymbolgröÃe ist eingestellt auf %i, aber zu klein. Neue GröÃe ist 16\n" |
24461 |
+msgstr "SymbolgröÃe ist eingestellt auf %i, dieser Wert ist zu klein. Neue GröÃe ist 16\n" |
24462 |
|
24463 |
-#: ../src/startup.c:922 |
24464 |
+#: ../src/startup.c:801 |
24465 |
msgid "XKB is not supported. KbdModeLock is automatically disabled." |
24466 |
msgstr "XKB wird nicht unterstützt. KbdModeLock wird ausgeschaltet" |
24467 |
|
24468 |
-#: ../src/startup.c:941 |
24469 |
+#: ../src/startup.c:820 |
24470 |
msgid "it seems that there is already a window manager running" |
24471 |
-msgstr "Läuft da nicht schon ein anderer Windowmanager;-)?" |
24472 |
+msgstr "Es sieht aus, als ob schon ein anderer Windowmanager liefe." |
24473 |
|
24474 |
-#: ../src/startup.c:947 |
24475 |
+#: ../src/startup.c:826 |
24476 |
#, c-format |
24477 |
msgid "could not manage screen %i" |
24478 |
msgstr "Konnte Bildschirm %i nicht ansprechen" |
24479 |
|
24480 |
-#: ../src/startup.c:1015 |
24481 |
+#: ../src/startup.c:885 |
24482 |
msgid "could not manage any screen" |
24483 |
msgstr "kein Bildschirm konnte angesprochen werden" |
24484 |
|
24485 |
-#: ../src/switchmenu.c:137 |
24486 |
+#: ../src/switchmenu.c:145 |
24487 |
msgid "Windows" |
24488 |
msgstr "Fenster" |
24489 |
|
24490 |
@@ -1448,20 +1384,21 @@ |
24491 |
|
24492 |
#: ../src/texture.c:598 |
24493 |
msgid "could not allocate image buffer" |
24494 |
-msgstr "Bildpuffer konnte nicht allokiert werden" |
24495 |
+msgstr "Bildpuffer konnte nicht erstellt werden" |
24496 |
|
24497 |
#: ../src/wdefaults.c:437 |
24498 |
#, c-format |
24499 |
msgid "could not find icon file \"%s\"" |
24500 |
msgstr "Symboldatei \"%s\" konnte nicht gefunden werden" |
24501 |
|
24502 |
-#: ../src/window.c:2936 ../src/window.c:3075 |
24503 |
+#: ../src/window.c:3052 ../src/window.c:3193 |
24504 |
msgid "" |
24505 |
"the NumLock, ScrollLock or similar key seems to be turned on.\n" |
24506 |
"Turn it off or some mouse actions and keyboard shortcuts will not work." |
24507 |
msgstr "" |
24508 |
"Es scheint, dass NumLock, ScrollLock oder ähnliche Tasten aktiviert sind.\n" |
24509 |
-"Schalten Sie diese aus, da sonst einige Mausaktionen oder Tastaturkürzel nicht funktionieren." |
24510 |
+"Schalten Sie diese aus, da sonst einige Mausaktionen oder Tastaturkürzel " |
24511 |
+"nicht funktionieren." |
24512 |
|
24513 |
#: ../src/winmenu.c:125 |
24514 |
msgid "" |
24515 |
@@ -1473,30 +1410,39 @@ |
24516 |
"dabei gehen alle ungespeicherten Daten verloren.\n" |
24517 |
"Bitte bestätigen." |
24518 |
|
24519 |
-#: ../src/winmenu.c:267 ../src/winmenu.c:276 |
24520 |
+#: ../src/winmenu.c:268 ../src/winmenu.c:277 |
24521 |
msgid "Set Shortcut" |
24522 |
msgstr "Setze Kürzel" |
24523 |
|
24524 |
-#: ../src/winmenu.c:354 ../src/winmenu.c:399 |
24525 |
+#: ../src/winmenu.c:355 ../src/winmenu.c:400 |
24526 |
msgid "could not create submenu for window menu" |
24527 |
msgstr "Untermenü für Fenstermenü konnte nicht erstellt werden" |
24528 |
|
24529 |
-#: ../src/winmenu.c:403 |
24530 |
+#: ../src/winmenu.c:404 |
24531 |
msgid "Keep on top" |
24532 |
msgstr "Immer oben" |
24533 |
|
24534 |
-#: ../src/winmenu.c:408 |
24535 |
+#: ../src/winmenu.c:409 |
24536 |
msgid "Keep at bottom" |
24537 |
msgstr "Immer unten" |
24538 |
|
24539 |
+#. |
24540 |
+#. * Warning: If you make some change that affects the order of the |
24541 |
+#. * entries, you must update the command #defines in the top of |
24542 |
+#. * this file. |
24543 |
+#. |
24544 |
+#: ../src/winmenu.c:437 ../src/winmenu.c:571 |
24545 |
+msgid "Maximize" |
24546 |
+msgstr "Maximieren" |
24547 |
+ |
24548 |
+#: ../src/winmenu.c:445 ../src/winmenu.c:557 |
24549 |
+msgid "Miniaturize" |
24550 |
+msgstr "Minimieren" |
24551 |
+ |
24552 |
#: ../src/winmenu.c:453 ../src/winmenu.c:588 |
24553 |
msgid "Shade" |
24554 |
msgstr "Aufrollen" |
24555 |
|
24556 |
-#: ../src/winmenu.c:473 |
24557 |
-msgid "Hide Others" |
24558 |
-msgstr "Andere Verstecken" |
24559 |
- |
24560 |
#: ../src/winmenu.c:469 |
24561 |
msgid "Resize/Move" |
24562 |
msgstr "GröÃe/ Position ändern" |
24563 |
@@ -1505,6 +1451,10 @@ |
24564 |
msgid "Select" |
24565 |
msgstr "Auswählen" |
24566 |
|
24567 |
+#: ../src/winmenu.c:485 |
24568 |
+msgid "Move To" |
24569 |
+msgstr "Bewegen nach..." |
24570 |
+ |
24571 |
#: ../src/winmenu.c:490 |
24572 |
msgid "Attributes..." |
24573 |
msgstr "Eigenschaften" |
24574 |
@@ -1513,30 +1463,38 @@ |
24575 |
msgid "Options" |
24576 |
msgstr "Optionen" |
24577 |
|
24578 |
+#: ../src/winmenu.c:552 |
24579 |
+msgid "Deminiaturize" |
24580 |
+msgstr "Wiederherstellen" |
24581 |
+ |
24582 |
+#: ../src/winmenu.c:566 |
24583 |
+msgid "Unmaximize" |
24584 |
+msgstr "Ursprüngliche GröÃe" |
24585 |
+ |
24586 |
#: ../src/winmenu.c:583 |
24587 |
msgid "Unshade" |
24588 |
msgstr "Abrollen" |
24589 |
|
24590 |
-#: ../src/winspector.c:387 |
24591 |
+#: ../src/winspector.c:392 |
24592 |
#, c-format |
24593 |
msgid "Could not find icon \"%s\" specified for this window" |
24594 |
msgstr "Symbol \"%s\" für dieses Fenster konnte nicht gefunden werden" |
24595 |
|
24596 |
-#: ../src/winspector.c:404 |
24597 |
+#: ../src/winspector.c:409 |
24598 |
#, c-format |
24599 |
msgid "Could not open specified icon \"%s\":%s" |
24600 |
msgstr "Symbol \"%s\" konnte nicht geöffnet werden: %s" |
24601 |
|
24602 |
-#: ../src/winspector.c:1121 |
24603 |
+#: ../src/winspector.c:1129 |
24604 |
#, c-format |
24605 |
msgid "Inspecting %s.%s" |
24606 |
msgstr "Untersuchen von %s.%s" |
24607 |
|
24608 |
-#: ../src/winspector.c:1147 |
24609 |
+#: ../src/winspector.c:1155 |
24610 |
msgid "Click in the window you wish to inspect." |
24611 |
msgstr "Klicken Sie auf das Fenster, das untersucht werden soll." |
24612 |
|
24613 |
-#: ../src/winspector.c:1186 |
24614 |
+#: ../src/winspector.c:1194 |
24615 |
msgid "" |
24616 |
"The configuration will apply to all\n" |
24617 |
"windows that have their WM_CLASS\n" |
24618 |
@@ -1546,57 +1504,57 @@ |
24619 |
"Beim Speichern wirkt sich diese\n" |
24620 |
"Konfiguration auf alle Fenster aus,\n" |
24621 |
"deren WM_CLASS-Eigenschaft den\n" |
24622 |
-"obigen Namen hat." |
24623 |
+"obigen Wert hat." |
24624 |
|
24625 |
-#: ../src/winspector.c:1215 |
24626 |
+#: ../src/winspector.c:1223 |
24627 |
msgid "Save" |
24628 |
msgstr "Speichern" |
24629 |
|
24630 |
-#: ../src/winspector.c:1223 |
24631 |
+#: ../src/winspector.c:1231 |
24632 |
msgid "Apply" |
24633 |
msgstr "Anwenden" |
24634 |
|
24635 |
-#: ../src/winspector.c:1229 |
24636 |
+#: ../src/winspector.c:1237 |
24637 |
msgid "Reload" |
24638 |
msgstr "Neu laden" |
24639 |
|
24640 |
-#: ../src/winspector.c:1238 ../src/winspector.c:1248 |
24641 |
+#: ../src/winspector.c:1246 ../src/winspector.c:1256 |
24642 |
msgid "Window Specification" |
24643 |
msgstr "Fensterbeschreibung" |
24644 |
|
24645 |
-#: ../src/winspector.c:1239 |
24646 |
+#: ../src/winspector.c:1247 |
24647 |
msgid "Window Attributes" |
24648 |
msgstr "Fenstereigenschaften" |
24649 |
|
24650 |
-#: ../src/winspector.c:1240 |
24651 |
+#: ../src/winspector.c:1248 |
24652 |
msgid "Advanced Options" |
24653 |
msgstr "Erweiterte Optionen" |
24654 |
|
24655 |
-#: ../src/winspector.c:1241 |
24656 |
+#: ../src/winspector.c:1249 |
24657 |
msgid "Icon and Initial Workspace" |
24658 |
msgstr "Symbol und Start-Arbeitsfläche" |
24659 |
|
24660 |
-#: ../src/winspector.c:1242 |
24661 |
+#: ../src/winspector.c:1250 |
24662 |
msgid "Application Specific" |
24663 |
msgstr "Anwendungsspezifisches" |
24664 |
|
24665 |
-#: ../src/winspector.c:1256 |
24666 |
+#: ../src/winspector.c:1264 |
24667 |
msgid "Defaults for all windows" |
24668 |
msgstr "Standards für alle Fenster" |
24669 |
|
24670 |
-#: ../src/winspector.c:1310 |
24671 |
+#: ../src/winspector.c:1318 |
24672 |
msgid "Select window" |
24673 |
msgstr "Fenster auswählen" |
24674 |
|
24675 |
-#: ../src/winspector.c:1324 |
24676 |
+#: ../src/winspector.c:1332 |
24677 |
msgid "Attributes" |
24678 |
msgstr "Eigenschaften" |
24679 |
|
24680 |
-#: ../src/winspector.c:1335 |
24681 |
+#: ../src/winspector.c:1343 |
24682 |
msgid "Disable titlebar" |
24683 |
msgstr "Keine Titelleiste" |
24684 |
|
24685 |
-#: ../src/winspector.c:1337 |
24686 |
+#: ../src/winspector.c:1345 |
24687 |
msgid "" |
24688 |
"Remove the titlebar of this window.\n" |
24689 |
"To access the window commands menu of a window\n" |
24690 |
@@ -1608,43 +1566,43 @@ |
24691 |
"Für das Fenstermenü drücken Sie bitte Strg+Esc\n" |
24692 |
"bzw. die von Ihnen eingestellte Tastenkombination." |
24693 |
|
24694 |
-#: ../src/winspector.c:1344 |
24695 |
+#: ../src/winspector.c:1352 |
24696 |
msgid "Disable resizebar" |
24697 |
-msgstr "Keine Leiste zum Ãndern der GröÃe" |
24698 |
+msgstr "Keine Leiste für GröÃenänderung" |
24699 |
|
24700 |
-#: ../src/winspector.c:1346 |
24701 |
+#: ../src/winspector.c:1354 |
24702 |
msgid "Remove the resizebar of this window." |
24703 |
msgstr "Entfernen der Leiste zum Ãndern der GröÃe bei diesem Fenster." |
24704 |
|
24705 |
-#: ../src/winspector.c:1349 |
24706 |
+#: ../src/winspector.c:1357 |
24707 |
msgid "Disable close button" |
24708 |
msgstr "Keine SchlieÃen-Schaltfläche" |
24709 |
|
24710 |
-#: ../src/winspector.c:1351 |
24711 |
+#: ../src/winspector.c:1359 |
24712 |
msgid "Remove the `close window' button of this window." |
24713 |
msgstr "Entfernen der 'Fenster schlieÃen'-Schaltfläche für dieses Fensters" |
24714 |
|
24715 |
-#: ../src/winspector.c:1354 |
24716 |
+#: ../src/winspector.c:1362 |
24717 |
msgid "Disable miniaturize button" |
24718 |
msgstr "Keine Minimieren-Schaltfläche" |
24719 |
|
24720 |
-#: ../src/winspector.c:1356 |
24721 |
+#: ../src/winspector.c:1364 |
24722 |
msgid "Remove the `miniaturize window' button of the window." |
24723 |
msgstr "Entfernen der 'Fenster minimieren'-Schaltfläche für dieses Fenster" |
24724 |
|
24725 |
-#: ../src/winspector.c:1359 |
24726 |
+#: ../src/winspector.c:1367 |
24727 |
msgid "Disable border" |
24728 |
msgstr "Kein Rand" |
24729 |
|
24730 |
-#: ../src/winspector.c:1361 |
24731 |
+#: ../src/winspector.c:1369 |
24732 |
msgid "Remove the 1 pixel black border around the window." |
24733 |
-msgstr "Entfernen des ein Pixel breiten schwarzen Randes um das Fenster." |
24734 |
+msgstr "Entfernen des einen Pixel breiten schwarzen Randes um das Fenster." |
24735 |
|
24736 |
-#: ../src/winspector.c:1364 |
24737 |
+#: ../src/winspector.c:1372 |
24738 |
msgid "Keep on top (floating)" |
24739 |
msgstr "Immer oben" |
24740 |
|
24741 |
-#: ../src/winspector.c:1366 |
24742 |
+#: ../src/winspector.c:1374 |
24743 |
msgid "" |
24744 |
"Keep the window over other windows, not allowing\n" |
24745 |
"them to cover it." |
24746 |
@@ -1652,43 +1610,43 @@ |
24747 |
"Dieses Fenster immer oben halten, sodass es nicht\n" |
24748 |
"von anderen Fenstern verdeckt wird" |
24749 |
|
24750 |
-#: ../src/winspector.c:1370 |
24751 |
+#: ../src/winspector.c:1378 |
24752 |
msgid "Keep at bottom (sunken)" |
24753 |
msgstr "Immer unten" |
24754 |
|
24755 |
-#: ../src/winspector.c:1372 |
24756 |
+#: ../src/winspector.c:1380 |
24757 |
msgid "Keep the window under all other windows." |
24758 |
msgstr "Dieses Fenster unter allen anderen Fenster platzieren" |
24759 |
|
24760 |
-#: ../src/winspector.c:1377 |
24761 |
+#: ../src/winspector.c:1385 |
24762 |
msgid "Make window present in all workspaces." |
24763 |
msgstr "Dieses Fenster auf allen Arbeitsflächen sichtbar machen" |
24764 |
|
24765 |
-#: ../src/winspector.c:1380 |
24766 |
+#: ../src/winspector.c:1388 |
24767 |
msgid "Start miniaturized" |
24768 |
msgstr "Minimiert starten" |
24769 |
|
24770 |
-#: ../src/winspector.c:1382 |
24771 |
+#: ../src/winspector.c:1390 |
24772 |
msgid "" |
24773 |
"Make the window be automatically miniaturized when it's\n" |
24774 |
"first shown." |
24775 |
msgstr "Dieses Fenster beim Start automatisch minimieren" |
24776 |
|
24777 |
-#: ../src/winspector.c:1386 |
24778 |
+#: ../src/winspector.c:1394 |
24779 |
msgid "Start maximized" |
24780 |
msgstr "Maximiert starten" |
24781 |
|
24782 |
-#: ../src/winspector.c:1388 |
24783 |
+#: ../src/winspector.c:1396 |
24784 |
msgid "" |
24785 |
"Make the window be automatically maximized when it's\n" |
24786 |
"first shown." |
24787 |
-msgstr "Dieses Fenster wird beim Start automatisch maximiert" |
24788 |
+msgstr "Dieses Fenster beim Start automatisch maximieren" |
24789 |
|
24790 |
-#: ../src/winspector.c:1392 |
24791 |
+#: ../src/winspector.c:1400 |
24792 |
msgid "Full screen maximization" |
24793 |
msgstr "Vollbild-Maximierung" |
24794 |
|
24795 |
-#: ../src/winspector.c:1394 |
24796 |
+#: ../src/winspector.c:1402 |
24797 |
msgid "" |
24798 |
"Make the window use the whole screen space when it's\n" |
24799 |
"maximized. The titlebar and resizebar will be moved\n" |
24800 |
@@ -1698,15 +1656,15 @@ |
24801 |
"ausdehnen, Titel- und GröÃenleiste befinden sich dann auÃerhalb\n" |
24802 |
"des Bildschirms." |
24803 |
|
24804 |
-#: ../src/winspector.c:1411 |
24805 |
+#: ../src/winspector.c:1419 |
24806 |
msgid "Advanced" |
24807 |
msgstr "Erweitert" |
24808 |
|
24809 |
-#: ../src/winspector.c:1428 |
24810 |
+#: ../src/winspector.c:1436 |
24811 |
msgid "Do not bind keyboard shortcuts" |
24812 |
msgstr "Keine Tastatur-Kürzel abfangen" |
24813 |
|
24814 |
-#: ../src/winspector.c:1430 |
24815 |
+#: ../src/winspector.c:1438 |
24816 |
msgid "" |
24817 |
"Do not bind keyboard shortcuts from Window Maker\n" |
24818 |
"when this window is focused. This will allow the\n" |
24819 |
@@ -1714,14 +1672,14 @@ |
24820 |
"of your shortcut configuration." |
24821 |
msgstr "" |
24822 |
"Keine globalen Window Maker-Tastaturkürzel abfangen,\n" |
24823 |
-"wenn dieses Fenster maximiert ist. Dadurch erhalt dieses\n" |
24824 |
+"wenn dieses Fenster maximiert ist. Dadurch erhält dieses\n" |
24825 |
"Fenster alle Tastendrücke." |
24826 |
|
24827 |
-#: ../src/winspector.c:1436 |
24828 |
+#: ../src/winspector.c:1444 |
24829 |
msgid "Do not bind mouse clicks" |
24830 |
msgstr "Kein Mausklicks abfangen" |
24831 |
|
24832 |
-#: ../src/winspector.c:1438 |
24833 |
+#: ../src/winspector.c:1446 |
24834 |
msgid "" |
24835 |
"Do not bind mouse actions, such as `Alt'+drag\n" |
24836 |
"in the window (when alt is the modifier you haveconfigured)." |
24837 |
@@ -1729,29 +1687,29 @@ |
24838 |
"Für dieses Fenster keine Mausaktionen abfangen,\n" |
24839 |
"zum Beispiel Alt+Ziehen." |
24840 |
|
24841 |
-#: ../src/winspector.c:1443 |
24842 |
+#: ../src/winspector.c:1451 |
24843 |
msgid "Do not show in the window list" |
24844 |
msgstr "Nicht in der Fensterliste zeigen" |
24845 |
|
24846 |
-#: ../src/winspector.c:1445 |
24847 |
+#: ../src/winspector.c:1453 |
24848 |
msgid "Do not list the window in the window list menu." |
24849 |
msgstr "Dieses Fenster nicht in der Fensterliste aufführen." |
24850 |
|
24851 |
-#: ../src/winspector.c:1448 |
24852 |
+#: ../src/winspector.c:1456 |
24853 |
msgid "Do not let it take focus" |
24854 |
msgstr "Keinen Fokus erlauben" |
24855 |
|
24856 |
-#: ../src/winspector.c:1450 |
24857 |
+#: ../src/winspector.c:1458 |
24858 |
msgid "" |
24859 |
"Do not let the window take keyboard focus when you\n" |
24860 |
"click on it." |
24861 |
msgstr "Diesem Fenster beim Klick nicht den Tastaturfokus geben." |
24862 |
|
24863 |
-#: ../src/winspector.c:1454 |
24864 |
+#: ../src/winspector.c:1462 |
24865 |
msgid "Keep inside screen" |
24866 |
msgstr "Immer innerhalb des Bildschirmes" |
24867 |
|
24868 |
-#: ../src/winspector.c:1456 |
24869 |
+#: ../src/winspector.c:1464 |
24870 |
msgid "" |
24871 |
"Do not allow the window to move itself completely\n" |
24872 |
"outside the screen. For bug compatibility.\n" |
24873 |
@@ -1759,21 +1717,21 @@ |
24874 |
"Diesem Fenster nicht erlauben, ganz aus dem Bildschirm\n" |
24875 |
"bewegt zu werden.\n" |
24876 |
|
24877 |
-#: ../src/winspector.c:1460 |
24878 |
+#: ../src/winspector.c:1468 |
24879 |
msgid "Ignore 'Hide Others'" |
24880 |
-msgstr "Ignoriere 'Andere Verstecken'" |
24881 |
+msgstr "Ignoriere 'Andere verstecken'" |
24882 |
|
24883 |
-#: ../src/winspector.c:1462 |
24884 |
+#: ../src/winspector.c:1470 |
24885 |
msgid "" |
24886 |
"Do not hide the window when issuing the\n" |
24887 |
"`HideOthers' command." |
24888 |
-msgstr "Beim AndereVerstecken-Befehl dieses Fenster auslassen." |
24889 |
+msgstr "Beim 'Andere verstecken'-Befehl dieses Fenster auslassen." |
24890 |
|
24891 |
-#: ../src/winspector.c:1466 |
24892 |
+#: ../src/winspector.c:1474 |
24893 |
msgid "Ignore 'Save Session'" |
24894 |
msgstr "'Sitzung speichern' ignorieren" |
24895 |
|
24896 |
-#: ../src/winspector.c:1468 |
24897 |
+#: ../src/winspector.c:1476 |
24898 |
msgid "" |
24899 |
"Do not save the associated application in the\n" |
24900 |
"session's state, so that it won't be restarted\n" |
24901 |
@@ -1784,11 +1742,11 @@ |
24902 |
"im Sitzungszustand speichern, sodass sie beim\n" |
24903 |
"Start von Window Maker nicht gestartet wird." |
24904 |
|
24905 |
-#: ../src/winspector.c:1474 |
24906 |
+#: ../src/winspector.c:1482 |
24907 |
msgid "Emulate application icon" |
24908 |
msgstr "Anwendungssymbol ignorieren" |
24909 |
|
24910 |
-#: ../src/winspector.c:1476 |
24911 |
+#: ../src/winspector.c:1484 |
24912 |
msgid "" |
24913 |
"Make this window act as an application that provides\n" |
24914 |
"enough information to Window Maker for a dockable\n" |
24915 |
@@ -1798,55 +1756,55 @@ |
24916 |
"es genügend Informationen für eine dockbare\n" |
24917 |
"Anwendung an Window Maker liefern würde." |
24918 |
|
24919 |
-#: ../src/winspector.c:1482 |
24920 |
+#: ../src/winspector.c:1490 |
24921 |
msgid "Disable language button" |
24922 |
msgstr "Keine Sprachen-Schaltfläche" |
24923 |
|
24924 |
-#: ../src/winspector.c:1484 |
24925 |
+#: ../src/winspector.c:1492 |
24926 |
msgid "Remove the `toggle language' button of the window." |
24927 |
msgstr "Entfern der 'Wechsle Sprache'-Schaltfläche bei diesem Fenster" |
24928 |
|
24929 |
-#: ../src/winspector.c:1501 |
24930 |
+#: ../src/winspector.c:1509 |
24931 |
msgid "Miniwindow Image" |
24932 |
msgstr "Minifenster-Bild" |
24933 |
|
24934 |
-#: ../src/winspector.c:1528 |
24935 |
+#: ../src/winspector.c:1536 |
24936 |
msgid "Icon filename:" |
24937 |
msgstr "Symboldateiname" |
24938 |
|
24939 |
-#: ../src/winspector.c:1541 |
24940 |
+#: ../src/winspector.c:1549 |
24941 |
msgid "Ignore client supplied icon" |
24942 |
msgstr "Ignoriere zur Verfügung gestelltes Symbol" |
24943 |
|
24944 |
-#: ../src/winspector.c:1548 |
24945 |
+#: ../src/winspector.c:1556 |
24946 |
msgid "Initial Workspace" |
24947 |
msgstr "Start-Arbeitsfläche" |
24948 |
|
24949 |
-#: ../src/winspector.c:1550 |
24950 |
+#: ../src/winspector.c:1558 |
24951 |
msgid "The workspace to place the window when it'sfirst shown." |
24952 |
msgstr "Die Arbeitsfläche, auf dem das Fenster beim Start erscheinen soll" |
24953 |
|
24954 |
-#: ../src/winspector.c:1556 |
24955 |
+#: ../src/winspector.c:1564 |
24956 |
msgid "Nowhere in particular" |
24957 |
-msgstr "Ist mir eigentlich egal" |
24958 |
+msgstr "Keine Angabe" |
24959 |
|
24960 |
-#: ../src/winspector.c:1574 |
24961 |
+#: ../src/winspector.c:1582 |
24962 |
msgid "Application Attributes" |
24963 |
msgstr "Anwendungseigenschaften" |
24964 |
|
24965 |
-#: ../src/winspector.c:1585 |
24966 |
+#: ../src/winspector.c:1593 |
24967 |
msgid "Start hidden" |
24968 |
msgstr "Versteckt starten" |
24969 |
|
24970 |
-#: ../src/winspector.c:1587 |
24971 |
+#: ../src/winspector.c:1595 |
24972 |
msgid "Automatically hide application when it's started." |
24973 |
msgstr "Anwendung beim Start automatisch verstecken" |
24974 |
|
24975 |
-#: ../src/winspector.c:1590 |
24976 |
+#: ../src/winspector.c:1598 |
24977 |
msgid "No application icon" |
24978 |
msgstr "Kein Anwendungssymbol" |
24979 |
|
24980 |
-#: ../src/winspector.c:1592 |
24981 |
+#: ../src/winspector.c:1600 |
24982 |
msgid "" |
24983 |
"Disable the application icon for the application.\n" |
24984 |
"Note that you won't be able to dock it anymore,\n" |
24985 |
@@ -1858,36 +1816,36 @@ |
24986 |
"docken lässt und bereits gedockte Symbole nicht mehr korrekt\n" |
24987 |
"arbeiten." |
24988 |
|
24989 |
-#: ../src/winspector.c:1598 |
24990 |
+#: ../src/winspector.c:1606 |
24991 |
msgid "Shared application icon" |
24992 |
msgstr "Geteiltes Anwendungssymbol" |
24993 |
|
24994 |
-#: ../src/winspector.c:1600 |
24995 |
+#: ../src/winspector.c:1608 |
24996 |
msgid "" |
24997 |
"Use a single shared application icon for all of\n" |
24998 |
"the instances of this application.\n" |
24999 |
msgstr "" |
25000 |
"Für alle Instanzen dieser Anwendung ein\n" |
25001 |
-"einziges Symbol verwenden.\n" |
25002 |
+"einziges Anwendungssymbol verwenden.\n" |
25003 |
|
25004 |
-#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:876 |
25005 |
+#: ../src/workspace.c:103 ../src/workspace.c:104 ../src/workspace.c:1302 |
25006 |
#, c-format |
25007 |
msgid "Workspace %i" |
25008 |
msgstr "Arbeitsfläche: %i" |
25009 |
|
25010 |
-#: ../src/workspace.c:926 |
25011 |
+#: ../src/workspace.c:1352 |
25012 |
msgid "Workspaces" |
25013 |
msgstr "Arbeitsflächen" |
25014 |
|
25015 |
-#: ../src/workspace.c:928 |
25016 |
+#: ../src/workspace.c:1354 |
25017 |
msgid "could not create Workspace menu" |
25018 |
msgstr "Arbeitsflächenmenü konnte nicht erstellt werden" |
25019 |
|
25020 |
-#: ../src/workspace.c:935 |
25021 |
+#: ../src/workspace.c:1361 |
25022 |
msgid "New" |
25023 |
msgstr "Neu" |
25024 |
|
25025 |
-#: ../src/workspace.c:936 |
25026 |
+#: ../src/workspace.c:1362 |
25027 |
msgid "Destroy Last" |
25028 |
-msgstr "Letztes zerstören" |
25029 |
+msgstr "Letzten zerstören" |
25030 |
|
25031 |
diff -uhrN WindowMaker-0.92.0/po/et.po WindowMaker-CVS-20060123/po/et.po |
25032 |
--- WindowMaker-0.92.0/po/et.po 2004-10-26 05:52:38.000000000 +0200 |
25033 |
+++ WindowMaker-CVS-20060123/po/et.po 2006-01-22 20:07:15.000000000 +0100 |
25034 |
@@ -1,10 +1,14 @@ |
25035 |
-# Estonian translation of Window Maker |
25036 |
-# Copyright (C) 2000, 2001 Free Software Foundation, Inc. |
25037 |
-# Ivar Smolin <okul@×××××.ee>, 2000, 2001 |
25038 |
+# Window Maker'i eesti keele tõlge. |
25039 |
+# Estonian translation of Window Maker. |
25040 |
+# |
25041 |
+# Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc. |
25042 |
+# Ivar Smolin <okul@×××××.ee>, 2000, 2001, 2005 |
25043 |
+# |
25044 |
msgid "" |
25045 |
msgstr "" |
25046 |
-"Project-Id-Version: Window Maker 0.70.0\n" |
25047 |
-"POT-Creation-Date: 2001-12-17 23:29+0200\n" |
25048 |
+"Project-Id-Version: Window Maker 0.92.0\n" |
25049 |
+"Report-Msgid-Bugs-To: \n" |
25050 |
+"POT-Creation-Date: 2005-08-11 23:45+0300\n" |
25051 |
"PO-Revision-Date: 2001-12-17 23:30+0200\n" |
25052 |
"Last-Translator: Ivar Smolin <okul@×××××.ee>\n" |
25053 |
"Language-Team: Estonian <et@××.org>\n" |
25054 |
@@ -12,25 +16,25 @@ |
25055 |
"Content-Type: text/plain; charset=UTF-8\n" |
25056 |
"Content-Transfer-Encoding: 8bit\n" |
25057 |
|
25058 |
-#: ../src/appicon.c:426 ../src/dialog.c:282 ../src/dock.c:3325 |
25059 |
-#: ../src/dockedapp.c:230 ../src/main.c:273 ../src/rootmenu.c:1850 |
25060 |
-#: ../src/winspector.c:389 ../src/winspector.c:406 |
25061 |
+#: ../src/appicon.c:415 ../src/dialog.c:295 ../src/dock.c:3335 |
25062 |
+#: ../src/dockedapp.c:231 ../src/main.c:271 ../src/rootmenu.c:1854 |
25063 |
+#: ../src/winspector.c:394 ../src/winspector.c:411 |
25064 |
msgid "Error" |
25065 |
msgstr "Viga" |
25066 |
|
25067 |
-#: ../src/appicon.c:427 |
25068 |
+#: ../src/appicon.c:416 |
25069 |
msgid "Could not open specified icon file" |
25070 |
-msgstr "Ei õnnestu avada kirjeldatud ikoonifaili" |
25071 |
+msgstr "Kirjeldatud ikoonifaili pole võimalik avada" |
25072 |
|
25073 |
-#: ../src/appicon.c:428 ../src/dialog.c:179 ../src/dialog.c:282 |
25074 |
-#: ../src/dialog.c:729 ../src/dialog.c:1792 ../src/dock.c:526 |
25075 |
-#: ../src/dock.c:534 ../src/dock.c:558 ../src/dock.c:3326 |
25076 |
-#: ../src/dockedapp.c:231 ../src/dockedapp.c:426 ../src/main.c:273 |
25077 |
-#: ../src/rootmenu.c:1854 ../src/winspector.c:390 ../src/winspector.c:407 |
25078 |
+#: ../src/appicon.c:417 ../src/dialog.c:192 ../src/dialog.c:295 |
25079 |
+#: ../src/dialog.c:725 ../src/dialog.c:1797 ../src/dock.c:515 |
25080 |
+#: ../src/dock.c:523 ../src/dock.c:547 ../src/dock.c:3336 |
25081 |
+#: ../src/dockedapp.c:232 ../src/dockedapp.c:427 ../src/main.c:271 |
25082 |
+#: ../src/rootmenu.c:1858 ../src/winspector.c:395 ../src/winspector.c:412 |
25083 |
msgid "OK" |
25084 |
-msgstr "OK" |
25085 |
+msgstr "Olgu" |
25086 |
|
25087 |
-#: ../src/appicon.c:456 ../src/dock.c:264 |
25088 |
+#: ../src/appicon.c:445 ../src/dock.c:244 |
25089 |
msgid "" |
25090 |
" will be forcibly closed.\n" |
25091 |
"Any unsaved changes will be lost.\n" |
25092 |
@@ -38,344 +42,377 @@ |
25093 |
msgstr "" |
25094 |
" suletakse jõuga.\n" |
25095 |
"Kõik salvestamata andmed lähevad kaotsi.\n" |
25096 |
-"Kas soovite seda teha?" |
25097 |
+"Kas soovid seda teha?" |
25098 |
|
25099 |
-#: ../src/appicon.c:464 ../src/dock.c:283 ../src/winmenu.c:124 |
25100 |
+#: ../src/appicon.c:453 ../src/dock.c:263 ../src/winmenu.c:124 |
25101 |
msgid "Kill Application" |
25102 |
msgstr "Programmi kõrvaldamine" |
25103 |
|
25104 |
-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126 |
25105 |
+#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126 |
25106 |
msgid "Yes" |
25107 |
msgstr "Jah" |
25108 |
|
25109 |
-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126 |
25110 |
+#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126 |
25111 |
msgid "No" |
25112 |
msgstr "Ei" |
25113 |
|
25114 |
-#: ../src/appicon.c:495 ../src/dock.c:1177 ../src/dock.c:3491 |
25115 |
+#: ../src/appicon.c:484 ../src/dock.c:1168 ../src/dock.c:3501 |
25116 |
msgid "Unhide Here" |
25117 |
msgstr "Too siia töölauale" |
25118 |
|
25119 |
-#: ../src/appicon.c:496 ../src/appicon.c:521 ../src/dock.c:1179 |
25120 |
-#: ../src/dock.c:1181 ../src/dock.c:3503 ../src/winmenu.c:461 |
25121 |
+#: ../src/appicon.c:485 ../src/appicon.c:510 ../src/dock.c:1170 |
25122 |
+#: ../src/dock.c:1172 ../src/dock.c:3513 ../src/winmenu.c:461 |
25123 |
msgid "Hide" |
25124 |
msgstr "Peida" |
25125 |
|
25126 |
-#: ../src/appicon.c:497 |
25127 |
+#: ../src/appicon.c:486 |
25128 |
msgid "Set Icon..." |
25129 |
-msgstr "Vali ikoon..." |
25130 |
+msgstr "Ikooni määramine..." |
25131 |
|
25132 |
-#: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248 |
25133 |
+#: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248 |
25134 |
#: ../src/rootmenu.c:264 ../src/winmenu.c:508 |
25135 |
msgid "Kill" |
25136 |
msgstr "Kõrvalda" |
25137 |
|
25138 |
-#: ../src/appicon.c:519 ../src/dock.c:3501 |
25139 |
+#: ../src/appicon.c:508 ../src/dock.c:3511 |
25140 |
msgid "Unhide" |
25141 |
msgstr "Too nähtavale" |
25142 |
|
25143 |
-#: ../src/application.c:397 |
25144 |
+#: ../src/application.c:405 |
25145 |
#, c-format |
25146 |
msgid "recreating missing icon '%s'" |
25147 |
-msgstr "loon uuesti puuduva ikooni '%s'" |
25148 |
+msgstr "puuduva ikooni '%s' uuestiloomine" |
25149 |
|
25150 |
-#: ../src/defaults.c:923 ../src/startup.c:885 ../src/startup.c:903 |
25151 |
-#: ../src/startup.c:909 |
25152 |
+#: ../src/defaults.c:930 ../src/defaults.c:1148 |
25153 |
+#, c-format |
25154 |
+msgid "Domain %s (%s) of global defaults database is corrupted!" |
25155 |
+msgstr "Ãldiste vaikeväärtuste andmebaasi domeen %s (%s) on rikutud!" |
25156 |
+ |
25157 |
+#: ../src/defaults.c:935 |
25158 |
+#, c-format |
25159 |
+msgid "could not load domain %s from global defaults database" |
25160 |
+msgstr "" |
25161 |
+"domeeni %s pole võimalik globaalsete vaikeväärtuste andmebaasist laadida" |
25162 |
+ |
25163 |
+#: ../src/defaults.c:1034 ../src/defaults.c:1049 |
25164 |
+#, c-format |
25165 |
+msgid "invalid global menu file %s" |
25166 |
+msgstr "vigane globaalmenüü fail %s" |
25167 |
+ |
25168 |
+#: ../src/defaults.c:1077 ../src/startup.c:761 ../src/startup.c:779 |
25169 |
+#: ../src/startup.c:786 |
25170 |
#, c-format |
25171 |
msgid "could not read domain \"%s\" from defaults database" |
25172 |
-msgstr "ei õnnestu lugeda domeeni \"%s\" vaikeväärtuste andmebaasist" |
25173 |
+msgstr "domeeni \"%s\" pole võimalik vaikeväärtuste andmebaasist lugeda" |
25174 |
|
25175 |
-#: ../src/defaults.c:969 ../src/defaults.c:1086 ../src/defaults.c:1124 |
25176 |
-#: ../src/defaults.c:1170 |
25177 |
+#: ../src/defaults.c:1123 ../src/defaults.c:1237 ../src/defaults.c:1278 |
25178 |
+#: ../src/defaults.c:1334 |
25179 |
#, c-format |
25180 |
msgid "Domain %s (%s) of defaults database is corrupted!" |
25181 |
-msgstr "Domeen %s (%s) vaikeväärtuste andmebaasis on katki!" |
25182 |
+msgstr "Vaikeväärtuste andmebaasi domeen %s (%s) on rikutud!" |
25183 |
|
25184 |
-#: ../src/defaults.c:974 ../src/defaults.c:1106 ../src/defaults.c:1153 |
25185 |
-#: ../src/defaults.c:1179 ../src/menureader.c:397 |
25186 |
+#: ../src/defaults.c:1137 ../src/defaults.c:1257 ../src/defaults.c:1314 |
25187 |
+#: ../src/defaults.c:1344 |
25188 |
#, c-format |
25189 |
msgid "could not load domain %s from user defaults database" |
25190 |
-msgstr "ei õnnestu lugeda domeeni %s kasutaja vaikeväärtuste andmebaasist" |
25191 |
+msgstr "domeeni %s pole võimalik kasutaja vaikeväärtuste andmebaasist lugeda" |
25192 |
|
25193 |
-#: ../src/defaults.c:985 ../src/defaults.c:1071 |
25194 |
-#, c-format |
25195 |
-msgid "Domain %s (%s) of global defaults database is corrupted!" |
25196 |
-msgstr "Ãldise vaikeväärtuste andmebaasi domeen %s (%s) on katki!" |
25197 |
- |
25198 |
-#: ../src/defaults.c:1004 |
25199 |
+#: ../src/defaults.c:1167 |
25200 |
#, c-format |
25201 |
msgid "could not load domain %s from global defaults database (%s)" |
25202 |
msgstr "" |
25203 |
-"ei õnnestu laadida domeeni %s üldisest vaikeväärtuste andmebaasist (%s)" |
25204 |
- |
25205 |
-#: ../src/defaults.c:1076 |
25206 |
-#, c-format |
25207 |
-msgid "could not load domain %s from global defaults database" |
25208 |
-msgstr "ei õnnestu laadida domeeni %s globaalsete vaikeväärtuste andmebaasist" |
25209 |
+"domeeni %s pole võimalik üldisest vaikeväärtuste andmebaasist (%s) laadida" |
25210 |
|
25211 |
-#: ../src/defaults.c:1143 ../src/screen.c:458 |
25212 |
+#: ../src/defaults.c:1304 ../src/screen.c:419 |
25213 |
#, c-format |
25214 |
msgid "could not load logo image for panels: %s" |
25215 |
-msgstr "ei õnnestu laadida paneelide logopilti: %s" |
25216 |
+msgstr "paneelidele pole logopilti võimalik laadida: %s" |
25217 |
|
25218 |
#. --------------------------- Local ----------------------- |
25219 |
-#: ../src/defaults.c:1388 ../src/defaults.c:1530 ../src/defaults.c:1642 |
25220 |
-#: ../src/defaults.c:2121 ../src/defaults.c:2138 ../src/defaults.c:2183 |
25221 |
-#: ../src/defaults.c:2230 ../src/defaults.c:2703 ../src/wdefaults.c:570 |
25222 |
-#: ../src/wdefaults.c:606 |
25223 |
+#: ../src/defaults.c:1553 ../src/defaults.c:1692 ../src/defaults.c:1812 |
25224 |
+#: ../src/defaults.c:2290 ../src/defaults.c:2307 ../src/defaults.c:2352 |
25225 |
+#: ../src/defaults.c:2399 ../src/defaults.c:2872 ../src/wdefaults.c:571 |
25226 |
+#: ../src/wdefaults.c:604 |
25227 |
#, c-format |
25228 |
msgid "Wrong option format for key \"%s\". Should be %s." |
25229 |
-msgstr "Vigane formaat võtmele \"%s\". Peaks olema %s." |
25230 |
+msgstr "Vigane vorming võtmele \"%s\". Peaks olema %s." |
25231 |
|
25232 |
-#: ../src/defaults.c:1390 ../src/defaults.c:1471 ../src/defaults.c:1503 |
25233 |
-#: ../src/defaults.c:1535 ../src/defaults.c:1548 ../src/defaults.c:1563 |
25234 |
-#: ../src/defaults.c:1577 ../src/defaults.c:1647 ../src/defaults.c:1659 |
25235 |
-#: ../src/defaults.c:2126 ../src/defaults.c:2143 ../src/defaults.c:2156 |
25236 |
-#: ../src/defaults.c:2188 ../src/defaults.c:2204 ../src/defaults.c:2235 |
25237 |
-#: ../src/defaults.c:2322 ../src/defaults.c:2708 ../src/defaults.c:2719 |
25238 |
+#: ../src/defaults.c:1555 ../src/defaults.c:1636 ../src/defaults.c:1666 |
25239 |
+#: ../src/defaults.c:1697 ../src/defaults.c:1710 ../src/defaults.c:1725 |
25240 |
+#: ../src/defaults.c:1739 ../src/defaults.c:1817 ../src/defaults.c:1829 |
25241 |
+#: ../src/defaults.c:2295 ../src/defaults.c:2312 ../src/defaults.c:2325 |
25242 |
+#: ../src/defaults.c:2357 ../src/defaults.c:2373 ../src/defaults.c:2404 |
25243 |
+#: ../src/defaults.c:2491 ../src/defaults.c:2877 ../src/defaults.c:2888 |
25244 |
#, c-format |
25245 |
msgid "using default \"%s\" instead" |
25246 |
-msgstr "selle asemel kasutan vaikimisi \"%s\"" |
25247 |
+msgstr "selle asemel kasutatakse vaikimisi \"%s\"" |
25248 |
|
25249 |
-#: ../src/defaults.c:1421 |
25250 |
+#: ../src/defaults.c:1586 |
25251 |
#, c-format |
25252 |
msgid "wrong option value for key \"%s\". Should be one of %s" |
25253 |
-msgstr "vigane valikuväärtus võtmele \"%s\". Peab olema üks %s väärtustest" |
25254 |
+msgstr "vigane valikuväärtus võtmele \"%s\". Peab olema üks väärtustest %s" |
25255 |
|
25256 |
-#: ../src/defaults.c:1466 |
25257 |
+#: ../src/defaults.c:1631 |
25258 |
#, c-format |
25259 |
msgid "can't convert \"%s\" to boolean for key \"%s\"" |
25260 |
-msgstr "ei õnnestu teisendada \"%s\" võtme \"%s\" loogikaväärtuseks" |
25261 |
+msgstr "" |
25262 |
+"väärtust \"%s\" pole võimalik võtme \"%s\" loogikaväärtuseks teisendada" |
25263 |
|
25264 |
-#: ../src/defaults.c:1500 |
25265 |
+#: ../src/defaults.c:1663 |
25266 |
#, c-format |
25267 |
msgid "can't convert \"%s\" to integer for key \"%s\"" |
25268 |
-msgstr "ei õnnestu teisendada \"%s\" täisarvuks võtmele \"%s\"" |
25269 |
+msgstr "" |
25270 |
+"väärtust \"%s\" pole võimalik võtme \"%s\" täisarvuliseks väärtuseks " |
25271 |
+"teisendada" |
25272 |
|
25273 |
-#: ../src/defaults.c:1543 |
25274 |
+#: ../src/defaults.c:1705 |
25275 |
#, c-format |
25276 |
msgid "Incorrect number of elements in array for key \"%s\"." |
25277 |
-msgstr "Ebatäpne massiivi elementide arv võtmele \"%s\"." |
25278 |
+msgstr "Vigane massiivi elementide arv võtmele \"%s\"." |
25279 |
|
25280 |
-#: ../src/defaults.c:1558 |
25281 |
+#: ../src/defaults.c:1720 |
25282 |
#, c-format |
25283 |
msgid "Wrong value for key \"%s\". Should be Coordinate." |
25284 |
-msgstr "Vale võtme \"%s\" väärtus. Peaksid olemad koordinaadid." |
25285 |
+msgstr "Vale väärtus võtmele \"%s\". Peaks olema koordinaat." |
25286 |
|
25287 |
-#: ../src/defaults.c:1573 |
25288 |
+#: ../src/defaults.c:1735 |
25289 |
#, c-format |
25290 |
msgid "can't convert array to integers for \"%s\"." |
25291 |
-msgstr "ei õnnestu teisendada massiivi täisarvudeks \"%s\" jaoks." |
25292 |
+msgstr "väärtust pole võimalik \"%s\" täisarvude massiiviks teisendada." |
25293 |
|
25294 |
-#: ../src/defaults.c:1771 ../src/defaults.c:1803 ../src/defaults.c:1819 |
25295 |
-#: ../src/defaults.c:1848 ../src/defaults.c:1871 ../src/defaults.c:1924 |
25296 |
-#: ../src/defaults.c:1964 ../src/defaults.c:2002 ../src/defaults.c:2018 |
25297 |
+#: ../src/defaults.c:1940 ../src/defaults.c:1972 ../src/defaults.c:1988 |
25298 |
+#: ../src/defaults.c:2017 ../src/defaults.c:2040 ../src/defaults.c:2093 |
25299 |
+#: ../src/defaults.c:2133 ../src/defaults.c:2171 ../src/defaults.c:2187 |
25300 |
#, c-format |
25301 |
msgid "\"%s\" is not a valid color name" |
25302 |
-msgstr "\"%s\" ei ole korrektne värvi nimetus" |
25303 |
+msgstr "\"%s\" pole korrektne värvi nimetus" |
25304 |
|
25305 |
-#: ../src/defaults.c:1784 ../src/defaults.c:1836 |
25306 |
+#: ../src/defaults.c:1953 ../src/defaults.c:2005 |
25307 |
msgid "bad number of arguments in gradient specification" |
25308 |
msgstr "vigane argumentide arv hajusülemineku kirjelduses" |
25309 |
|
25310 |
-#: ../src/defaults.c:1897 |
25311 |
+#: ../src/defaults.c:2066 |
25312 |
msgid "too few arguments in multicolor gradient specification" |
25313 |
msgstr "liiga vähe argumente mitmevärvilise hajusülemineku kirjelduses" |
25314 |
|
25315 |
-#: ../src/defaults.c:1991 |
25316 |
+#: ../src/defaults.c:2160 |
25317 |
msgid "bad number of arguments in textured gradient specification" |
25318 |
msgstr "vigane argumentide arv tekstuuriga hajusülemineku kirjelduses" |
25319 |
|
25320 |
-#: ../src/defaults.c:2034 |
25321 |
+#: ../src/defaults.c:2203 |
25322 |
#, c-format |
25323 |
msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]" |
25324 |
msgstr "" |
25325 |
"vigane tumeduse väärtus tgradient tekstuurile \"%s\". Peaks olema [0..255]" |
25326 |
|
25327 |
-#: ../src/defaults.c:2094 |
25328 |
+#: ../src/defaults.c:2263 |
25329 |
#, c-format |
25330 |
msgid "could not initialize library %s" |
25331 |
-msgstr "ei õnnestu lähtestada teeki %s" |
25332 |
+msgstr "teeki %s pole võimalik lähtestada" |
25333 |
|
25334 |
-#: ../src/defaults.c:2097 |
25335 |
+#: ../src/defaults.c:2266 |
25336 |
#, c-format |
25337 |
msgid "could not find function %s::%s" |
25338 |
-msgstr "ei õnnestu leida funktsiooni %s::%s" |
25339 |
+msgstr "funktsiooni %s::%s pole võimalik leida" |
25340 |
|
25341 |
-#: ../src/defaults.c:2104 |
25342 |
+#: ../src/defaults.c:2273 |
25343 |
#, c-format |
25344 |
msgid "invalid texture type %s" |
25345 |
msgstr "vigane tekstuuri tüüp %s" |
25346 |
|
25347 |
-#: ../src/defaults.c:2151 |
25348 |
+#: ../src/defaults.c:2320 |
25349 |
#, c-format |
25350 |
msgid "Error in texture specification for key \"%s\"" |
25351 |
msgstr "Viga võtme \"%s\" tekstuuri kirjelduses" |
25352 |
|
25353 |
-#: ../src/defaults.c:2200 |
25354 |
+#: ../src/defaults.c:2369 |
25355 |
msgid "Wrong type for workspace background. Should be a texture type." |
25356 |
msgstr "Vigane töölaua tausta tüüp. Peaks olema tekstuur-tüüpi." |
25357 |
|
25358 |
-#: ../src/defaults.c:2248 |
25359 |
+#: ../src/defaults.c:2417 |
25360 |
#, c-format |
25361 |
msgid "Wrong type for background of workspace %i. Should be a texture." |
25362 |
msgstr "Vigane töölaua %i tausta tüüp. Peaks olema tekstuur-tüüpi." |
25363 |
|
25364 |
-#: ../src/defaults.c:2290 |
25365 |
+#: ../src/defaults.c:2459 |
25366 |
msgid "could not load any usable font!!!" |
25367 |
-msgstr "ei õnnestu laadid ühtki kasutuskõlblikku shrifti!!!" |
25368 |
+msgstr "ei õnnestu laadida ühtki kasutuskõlblikku kirjatüüpi!!!" |
25369 |
|
25370 |
-#: ../src/defaults.c:2317 |
25371 |
+#: ../src/defaults.c:2486 |
25372 |
#, c-format |
25373 |
msgid "could not get color for key \"%s\"" |
25374 |
-msgstr "ei õnnestu leida värvi võtmele \"%s\"" |
25375 |
+msgstr "võtmele \"%s\" pole võimali värvi hankida" |
25376 |
|
25377 |
-#: ../src/defaults.c:2375 ../src/rootmenu.c:523 |
25378 |
+#: ../src/defaults.c:2544 ../src/rootmenu.c:531 |
25379 |
#, c-format |
25380 |
-msgid "%s:invalid key modifier \"%s\"" |
25381 |
-msgstr "%s: vigane võtme muutja \"%s\"" |
25382 |
+msgid "%s: invalid key modifier \"%s\"" |
25383 |
+msgstr "%s: vigane võtmemuutja \"%s\"" |
25384 |
|
25385 |
-#: ../src/defaults.c:2387 |
25386 |
+#: ../src/defaults.c:2556 |
25387 |
#, c-format |
25388 |
msgid "%s:invalid kbd shortcut specification \"%s\"" |
25389 |
msgstr "%s: vigane kiirklahvi kirjeldus \"%s\"" |
25390 |
|
25391 |
-#: ../src/defaults.c:2394 |
25392 |
+#: ../src/defaults.c:2563 |
25393 |
#, c-format |
25394 |
msgid "%s:invalid key in shortcut \"%s\"" |
25395 |
-msgstr "%s: vigane võti kiirklahvil \"%s\"" |
25396 |
+msgstr "%s: vigane võti kiirklahvile \"%s\"" |
25397 |
|
25398 |
-#: ../src/defaults.c:2419 |
25399 |
+#: ../src/defaults.c:2588 |
25400 |
#, c-format |
25401 |
msgid "%s: modifier key %s is not valid" |
25402 |
-msgstr "%s: muutmisklahv %s on vigane" |
25403 |
+msgstr "%s: muuteklahv %s on vigane" |
25404 |
|
25405 |
-#: ../src/defaults.c:2451 |
25406 |
+#: ../src/defaults.c:2620 |
25407 |
#, c-format |
25408 |
msgid "could not load image in option %s: %s" |
25409 |
-msgstr "ei õnnestu pildi laadimine valikus %s: %s" |
25410 |
+msgstr "pildi laadimine valikus %s pole võimalik: %s" |
25411 |
|
25412 |
-#: ../src/defaults.c:2568 |
25413 |
+#: ../src/defaults.c:2737 |
25414 |
#, c-format |
25415 |
msgid "failed to open bitmap file \"%s\"" |
25416 |
-msgstr "ei õnnestu avada pildifaili \"%s\"" |
25417 |
+msgstr "pildifaili \"%s\" pole võimalik avada" |
25418 |
|
25419 |
-#: ../src/defaults.c:2571 |
25420 |
+#: ../src/defaults.c:2740 |
25421 |
#, c-format |
25422 |
msgid "\"%s\" is not a valid bitmap file" |
25423 |
msgstr "\"%s\" ei ole korrektne pildifail" |
25424 |
|
25425 |
-#: ../src/defaults.c:2574 |
25426 |
+#: ../src/defaults.c:2743 |
25427 |
#, c-format |
25428 |
msgid "out of memory reading bitmap file \"%s\"" |
25429 |
-msgstr "mälu lõppes pildifaili \"%s\" lugemisel" |
25430 |
+msgstr "pildifaili \"%s\" lugemisel lõppes mälu" |
25431 |
|
25432 |
-#: ../src/defaults.c:2613 ../src/defaults.c:2646 |
25433 |
+#: ../src/defaults.c:2782 ../src/defaults.c:2815 |
25434 |
msgid "bad number of arguments in cursor specification" |
25435 |
msgstr "vigane argumentide arv kursori kirjelduses" |
25436 |
|
25437 |
-#: ../src/defaults.c:2629 |
25438 |
+#: ../src/defaults.c:2798 |
25439 |
#, c-format |
25440 |
msgid "unknown builtin cursor name \"%s\"" |
25441 |
msgstr "tundmatu sisseehitatud kursori nimi: \"%s\"" |
25442 |
|
25443 |
-#: ../src/defaults.c:2656 ../src/defaults.c:2668 |
25444 |
+#: ../src/defaults.c:2825 ../src/defaults.c:2837 |
25445 |
#, c-format |
25446 |
msgid "could not find cursor bitmap file \"%s\"" |
25447 |
-msgstr "ei õnnestu leida kursori pildifaili \"%s\"" |
25448 |
+msgstr "kursori pildifaili \"%s\" pole võimalik leida" |
25449 |
|
25450 |
-#: ../src/defaults.c:2715 |
25451 |
+#: ../src/defaults.c:2884 |
25452 |
#, c-format |
25453 |
msgid "Error in cursor specification for key \"%s\"" |
25454 |
msgstr "Viga võtme \"%s\" kursori kirjelduses" |
25455 |
|
25456 |
-#: ../src/defaults.c:2800 |
25457 |
+#: ../src/defaults.c:2969 |
25458 |
msgid "could not render texture for icon background" |
25459 |
-msgstr "tekstuuri renderdamine ikooni taustapildiks ei õnnestu" |
25460 |
+msgstr "tekstuuri pole võimalik ikooni taustapildiks renderdada" |
25461 |
+ |
25462 |
+#: ../src/defaults.c:3597 ../src/defaults.c:3672 |
25463 |
+#, c-format |
25464 |
+msgid "Invalid arguments for option \"%s\"" |
25465 |
+msgstr "Vigased argumendid võtmele \"%s\"" |
25466 |
+ |
25467 |
+#: ../src/defaults.c:3604 ../src/defaults.c:3679 |
25468 |
+#, c-format |
25469 |
+msgid "Could not find image \"%s\" for option \"%s\"" |
25470 |
+msgstr "Pilti \"%s\" pole võtmele \"%s\" võimalik leida" |
25471 |
|
25472 |
-#: ../src/dialog.c:135 |
25473 |
+#: ../src/defaults.c:3610 ../src/defaults.c:3687 |
25474 |
+#, c-format |
25475 |
+msgid "Could not load image \"%s\" for option \"%s\"" |
25476 |
+msgstr "Pilti \"%s\" pole võtmele \"%s\" võimalik laadida" |
25477 |
+ |
25478 |
+#: ../src/defaults.c:3622 |
25479 |
+msgid "Invalid split sizes for SwitchPanel back image." |
25480 |
+msgstr "" |
25481 |
+ |
25482 |
+#: ../src/defaults.c:3695 |
25483 |
+#, c-format |
25484 |
+msgid "Invalid number of arguments for option \"%s\"" |
25485 |
+msgstr "Vigane argumentide arv võtmele \"%s\"" |
25486 |
+ |
25487 |
+#: ../src/dialog.c:147 |
25488 |
msgid "Save workspace state" |
25489 |
-msgstr "Salvesta töölaua olek" |
25490 |
+msgstr "Töölaua oleku salvestamine" |
25491 |
|
25492 |
-#: ../src/dialog.c:179 ../src/dialog.c:736 ../src/dock.c:558 |
25493 |
-#: ../src/dockedapp.c:431 ../src/rootmenu.c:198 ../src/rootmenu.c:248 |
25494 |
+#: ../src/dialog.c:192 ../src/dialog.c:732 ../src/dock.c:547 |
25495 |
+#: ../src/dockedapp.c:432 ../src/rootmenu.c:198 ../src/rootmenu.c:248 |
25496 |
#: ../src/rootmenu.c:264 |
25497 |
msgid "Cancel" |
25498 |
-msgstr "Tühista" |
25499 |
+msgstr "Loobu" |
25500 |
|
25501 |
-#: ../src/dialog.c:277 |
25502 |
+#: ../src/dialog.c:290 |
25503 |
msgid "Could not open directory " |
25504 |
-msgstr "Ei õnnestu avada kataloogi " |
25505 |
+msgstr "Pole võimalik avada kataloogi " |
25506 |
|
25507 |
-#: ../src/dialog.c:332 |
25508 |
+#: ../src/dialog.c:345 |
25509 |
msgid "Could not load image file " |
25510 |
-msgstr "Ei õnnestu avada pildifaili " |
25511 |
+msgstr "Pole võimalik avada pildifaili " |
25512 |
|
25513 |
-#: ../src/dialog.c:663 |
25514 |
+#: ../src/dialog.c:659 |
25515 |
msgid "Directories" |
25516 |
msgstr "Kataloogid" |
25517 |
|
25518 |
-#: ../src/dialog.c:672 |
25519 |
+#: ../src/dialog.c:668 |
25520 |
msgid "Icons" |
25521 |
msgstr "Ikoonid" |
25522 |
|
25523 |
-#: ../src/dialog.c:705 |
25524 |
+#: ../src/dialog.c:701 |
25525 |
msgid "Preview" |
25526 |
msgstr "Eelvaade" |
25527 |
|
25528 |
-#: ../src/dialog.c:718 |
25529 |
+#: ../src/dialog.c:714 |
25530 |
msgid "File Name:" |
25531 |
msgstr "Faili nimi:" |
25532 |
|
25533 |
-#: ../src/dialog.c:742 |
25534 |
+#: ../src/dialog.c:738 |
25535 |
msgid "Choose File" |
25536 |
msgstr "Vali fail" |
25537 |
|
25538 |
-#: ../src/dialog.c:760 ../src/dialog.c:762 |
25539 |
+#: ../src/dialog.c:757 ../src/dialog.c:759 |
25540 |
msgid "Icon Chooser" |
25541 |
-msgstr "Ikooni valija" |
25542 |
+msgstr "Ikoonivalik" |
25543 |
|
25544 |
-#: ../src/dialog.c:1219 ../src/dialog.c:1329 |
25545 |
+#: ../src/dialog.c:1197 ../src/dialog.c:1305 |
25546 |
#, c-format |
25547 |
msgid "Version %s" |
25548 |
msgstr "Versioon %s" |
25549 |
|
25550 |
-#: ../src/dialog.c:1326 |
25551 |
+#: ../src/dialog.c:1303 |
25552 |
msgid "Window Manager for X" |
25553 |
msgstr "X'i aknahaldur" |
25554 |
|
25555 |
-#: ../src/dialog.c:1349 |
25556 |
+#: ../src/dialog.c:1326 |
25557 |
#, c-format |
25558 |
msgid "Using visual 0x%x: %s %ibpp " |
25559 |
-msgstr "Kasutan visuaali 0x%x: %s %ibpp " |
25560 |
+msgstr "Kasutatakse visuaali 0x%x: %s %ibpp " |
25561 |
|
25562 |
-#: ../src/dialog.c:1357 |
25563 |
+#: ../src/dialog.c:1334 |
25564 |
msgid "(32 thousand colors)\n" |
25565 |
msgstr "(32 tuhat värvi)\n" |
25566 |
|
25567 |
-#: ../src/dialog.c:1360 |
25568 |
+#: ../src/dialog.c:1337 |
25569 |
msgid "(64 thousand colors)\n" |
25570 |
msgstr "(64 tuhat värvi)\n" |
25571 |
|
25572 |
-#: ../src/dialog.c:1364 |
25573 |
+#: ../src/dialog.c:1341 |
25574 |
msgid "(16 million colors)\n" |
25575 |
msgstr "(16 miljonit värvi)\n" |
25576 |
|
25577 |
-#: ../src/dialog.c:1367 |
25578 |
+#: ../src/dialog.c:1344 |
25579 |
#, c-format |
25580 |
msgid "(%d colors)\n" |
25581 |
msgstr "(%d värvi)\n" |
25582 |
|
25583 |
-#: ../src/dialog.c:1377 |
25584 |
+#: ../src/dialog.c:1354 |
25585 |
#, c-format |
25586 |
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n" |
25587 |
-msgstr "Eraldatud mälu kokku: %i kB. Mälu kasutuses: %i kB.\n" |
25588 |
+msgstr "Kogu eraldatud mälu: %i kB. Kogu kasutusel olev mälu: %i kB.\n" |
25589 |
|
25590 |
-#: ../src/dialog.c:1384 |
25591 |
+#: ../src/dialog.c:1361 |
25592 |
msgid "Supported image formats: " |
25593 |
msgstr "Toetatud pildivormingud: " |
25594 |
|
25595 |
-#: ../src/dialog.c:1391 |
25596 |
+#: ../src/dialog.c:1368 |
25597 |
msgid "" |
25598 |
"\n" |
25599 |
"Additional support for: " |
25600 |
@@ -383,11 +420,11 @@ |
25601 |
"\n" |
25602 |
"Lisaks on toetatud: " |
25603 |
|
25604 |
-#: ../src/dialog.c:1414 |
25605 |
+#: ../src/dialog.c:1385 |
25606 |
msgid " and " |
25607 |
msgstr " ja " |
25608 |
|
25609 |
-#: ../src/dialog.c:1424 |
25610 |
+#: ../src/dialog.c:1395 |
25611 |
msgid "" |
25612 |
"\n" |
25613 |
"Sound disabled" |
25614 |
@@ -395,7 +432,7 @@ |
25615 |
"\n" |
25616 |
"Heli on keelatud" |
25617 |
|
25618 |
-#: ../src/dialog.c:1426 |
25619 |
+#: ../src/dialog.c:1397 |
25620 |
msgid "" |
25621 |
"\n" |
25622 |
"Sound enabled" |
25623 |
@@ -403,28 +440,46 @@ |
25624 |
"\n" |
25625 |
"Heli on lubatud" |
25626 |
|
25627 |
-#: ../src/dialog.c:1450 |
25628 |
+#: ../src/dialog.c:1402 |
25629 |
+msgid ", VirtualDesktop enabled" |
25630 |
+msgstr ", VirtualDesktop on lubatud" |
25631 |
+ |
25632 |
+#: ../src/dialog.c:1404 |
25633 |
+msgid ", VirtualDesktop disabled" |
25634 |
+msgstr ", VirtualDesktop on keelatud" |
25635 |
+ |
25636 |
+#: ../src/dialog.c:1408 |
25637 |
+msgid "\n" |
25638 |
+msgstr "\n" |
25639 |
+ |
25640 |
+#: ../src/dialog.c:1410 |
25641 |
+msgid "Solaris " |
25642 |
+msgstr "Solaris " |
25643 |
+ |
25644 |
+#: ../src/dialog.c:1412 |
25645 |
+msgid "Xinerama: " |
25646 |
+msgstr "Xinerama: " |
25647 |
+ |
25648 |
+#: ../src/dialog.c:1446 |
25649 |
msgid "Info" |
25650 |
-msgstr "Info" |
25651 |
+msgstr "Andmed" |
25652 |
|
25653 |
-#: ../src/dialog.c:1473 |
25654 |
-msgid "Merry X'mas!" |
25655 |
+#: ../src/dialog.c:1470 |
25656 |
+msgid "Merry Christmas!" |
25657 |
msgstr "Häid jõule!" |
25658 |
|
25659 |
-#: ../src/dialog.c:1543 |
25660 |
+#: ../src/dialog.c:1540 |
25661 |
msgid "" |
25662 |
" Window Maker is free software; you can redistribute it and/or\n" |
25663 |
"modify it under the terms of the GNU General Public License as\n" |
25664 |
"published by the Free Software Foundation; either version 2 of the\n" |
25665 |
"License, or (at your option) any later version.\n" |
25666 |
"\n" |
25667 |
-"\n" |
25668 |
" Window Maker is distributed in the hope that it will be useful,\n" |
25669 |
"but WITHOUT ANY WARRANTY; without even the implied warranty\n" |
25670 |
"of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
25671 |
"See the GNU General Public License for more details.\n" |
25672 |
"\n" |
25673 |
-"\n" |
25674 |
" You should have received a copy of the GNU General Public\n" |
25675 |
"License along with this program; if not, write to the Free Software\n" |
25676 |
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" |
25677 |
@@ -436,13 +491,11 @@ |
25678 |
"avaldatud; kas Litsentsi versioon number 2 või (vastavalt\n" |
25679 |
"Teie valikule) ükskõik milline hilisem versioon.\n" |
25680 |
"\n" |
25681 |
-"\n" |
25682 |
"Seda programmi levitatakse lootuses, et see on kasulik, kuid\n" |
25683 |
"ILMA IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDI\n" |
25684 |
"GARANTIITA või SOBIVUSELE TEATUD KINDLAKS EESMÃRGIKS.\n" |
25685 |
"Ãksikasjade suhtes vaata GNU Ãldist Avalikku Litsentsi.\n" |
25686 |
"\n" |
25687 |
-"\n" |
25688 |
"Te peaks olema saanud GNU Ãldise Avaliku Litsentsi koopia\n" |
25689 |
"koos selle programmiga, kui ei, siis kontakteeruge Free\n" |
25690 |
"Software Foundation'iga, 59 Temple Place - Suite 330,\n" |
25691 |
@@ -450,17 +503,17 @@ |
25692 |
|
25693 |
#: ../src/dialog.c:1564 |
25694 |
msgid "Legal" |
25695 |
-msgstr "Litsentsiinfo" |
25696 |
+msgstr "Litsentsiandmed" |
25697 |
|
25698 |
-#: ../src/dialog.c:1715 ../src/startup.c:395 |
25699 |
+#: ../src/dialog.c:1720 |
25700 |
msgid "cannot open connection for crashing dialog panel. Aborting." |
25701 |
-msgstr "ei õnnestu luua ühendust avariipaneeliga. Annan alla." |
25702 |
+msgstr "krahhidialoogi paneeliga pole võimalik ühendust luua. Annan alla." |
25703 |
|
25704 |
-#: ../src/dialog.c:1741 |
25705 |
+#: ../src/dialog.c:1746 |
25706 |
msgid "Fatal error" |
25707 |
msgstr "Fataalviga" |
25708 |
|
25709 |
-#: ../src/dialog.c:1752 |
25710 |
+#: ../src/dialog.c:1757 |
25711 |
#, c-format |
25712 |
msgid "" |
25713 |
"Window Maker received signal %i\n" |
25714 |
@@ -469,41 +522,41 @@ |
25715 |
"Window Maker võttis vastu signaali %i\n" |
25716 |
"(%s)." |
25717 |
|
25718 |
-#: ../src/dialog.c:1755 |
25719 |
+#: ../src/dialog.c:1760 |
25720 |
#, c-format |
25721 |
msgid "Window Maker received signal %i." |
25722 |
msgstr "Window Maker võttis vastu signaali %i." |
25723 |
|
25724 |
-#: ../src/dialog.c:1764 |
25725 |
+#: ../src/dialog.c:1769 |
25726 |
msgid "" |
25727 |
" This fatal error occured probably due to a bug. Please fill the included " |
25728 |
"BUGFORM and report it to bugs@×××××××××××.org." |
25729 |
msgstr "" |
25730 |
" See fataalviga on arvatavasti põhjustatud programmi enese veast. Palun " |
25731 |
-"täitke kaasasolev vigadest teatamise vorm (BUGFORM) ja saatke see aadressil " |
25732 |
+"täida kaasasolev vigadest teatamise vorm (BUGFORM) ja saada see aadressil " |
25733 |
"bugs@×××××××××××.org." |
25734 |
|
25735 |
-#: ../src/dialog.c:1773 |
25736 |
+#: ../src/dialog.c:1778 |
25737 |
msgid "What do you want to do now?" |
25738 |
msgstr "Mida sa nüüd soovid teha?" |
25739 |
|
25740 |
-#: ../src/dialog.c:1779 |
25741 |
+#: ../src/dialog.c:1784 |
25742 |
msgid "Select action" |
25743 |
-msgstr "Vali tegevus" |
25744 |
+msgstr "Tegevuse valimine" |
25745 |
|
25746 |
-#: ../src/dialog.c:1780 |
25747 |
+#: ../src/dialog.c:1785 |
25748 |
msgid "Abort and leave a core file" |
25749 |
-msgstr "Lõpetan töö ja salvestan mälutõmmise" |
25750 |
+msgstr "Töö lõpetamine ja mälutõmmise salvestan" |
25751 |
|
25752 |
-#: ../src/dialog.c:1781 |
25753 |
+#: ../src/dialog.c:1786 |
25754 |
msgid "Restart Window Maker" |
25755 |
-msgstr "Taaskäivitan Window Makeri" |
25756 |
+msgstr "Window Maker'i taaskäivitamine" |
25757 |
|
25758 |
-#: ../src/dialog.c:1782 |
25759 |
+#: ../src/dialog.c:1787 |
25760 |
msgid "Start alternate window manager" |
25761 |
-msgstr "Käivitan alternatiivse aknahalduri" |
25762 |
+msgstr "Alternatiivse aknahalduri käivitamine" |
25763 |
|
25764 |
-#: ../src/dialog.c:1960 |
25765 |
+#: ../src/dialog.c:1965 |
25766 |
msgid "" |
25767 |
"Window Maker is part of the GNUstep project.\n" |
25768 |
"The GNUstep project aims to create a free\n" |
25769 |
@@ -517,441 +570,387 @@ |
25770 |
msgstr "" |
25771 |
"Window Maker on osa GNUstep projektist. GNUstep\n" |
25772 |
"projekti eesmärgiks on OpenStep(tm) kirjelduse\n" |
25773 |
-"(objektorienteeritud framework graafiliste\n" |
25774 |
-"multiplatvorm rakenduste jaoks) vaba\n" |
25775 |
+"(objektorienteeritud raamistik graafiliste\n" |
25776 |
+"mitme platvormi toega rakenduste jaoks) vaba\n" |
25777 |
"implementatsiooni loomine. Lisaeesmärgiks on \n" |
25778 |
-"ka sellel baseeruva ka arenduskeskkonna ja\n" |
25779 |
-"kasutaja töölauakeskkonna loomine. Lisateabe\n" |
25780 |
-"saamiseks palun külasada saidi www.gnustep.org" |
25781 |
+"ka sellel põhineva arenduskeskkonna ja kasutaja\n" |
25782 |
+"töölauakeskkonna loomine. Lisateabe saamiseks\n" |
25783 |
+"palun külasta saiti www.gnustep.org" |
25784 |
|
25785 |
-#: ../src/dialog.c:1980 |
25786 |
+#: ../src/dialog.c:1988 |
25787 |
msgid "About GNUstep" |
25788 |
msgstr "GNUstep'ist lähemalt" |
25789 |
|
25790 |
-#: ../src/dock.c:213 |
25791 |
+#: ../src/dock.c:193 |
25792 |
#, c-format |
25793 |
msgid "Type the name for workspace %i:" |
25794 |
msgstr "Sisesta töölaua %i nimi:" |
25795 |
|
25796 |
-#: ../src/dock.c:214 ../src/dock.c:1141 ../src/dock.c:1144 ../src/dock.c:3409 |
25797 |
+#: ../src/dock.c:194 ../src/dock.c:1132 ../src/dock.c:1135 ../src/dock.c:3419 |
25798 |
msgid "Rename Workspace" |
25799 |
msgstr "Töölaua ümbernimetamine" |
25800 |
|
25801 |
-#: ../src/dock.c:520 ../src/dock.c:528 |
25802 |
+#: ../src/dock.c:509 ../src/dock.c:517 |
25803 |
msgid "Warning" |
25804 |
msgstr "Hoiatus" |
25805 |
|
25806 |
-#: ../src/dock.c:521 |
25807 |
+#: ../src/dock.c:510 |
25808 |
msgid "" |
25809 |
"Some icons cannot be made omnipresent. Please make sure that no other icon " |
25810 |
"is docked in the same positions on the other workspaces and the Clip is not " |
25811 |
"full in some workspace." |
25812 |
msgstr "" |
25813 |
-"Mõningaid ikoone ei ole võimalik kõikidel töölaudadel nähtavaks teha. " |
25814 |
-"Veenduge, et teistel töölaudadel ei ole ükski ikoon dokitud samale " |
25815 |
+"Mõningaid ikoone pole võimalik kõikidel töölaudadel nähtavaks teha. " |
25816 |
+"Veendu, et teistel töölaudadel ei ole ükski ikoon dokitud samale " |
25817 |
"positsioonile ja Klamber ei ole mõnel töölaual täis." |
25818 |
|
25819 |
-#: ../src/dock.c:529 |
25820 |
+#: ../src/dock.c:518 |
25821 |
msgid "" |
25822 |
"Icon cannot be made omnipresent. Please make sure that no other icon is " |
25823 |
"docked in the same position on the other workspaces and the Clip is not full " |
25824 |
"in some workspace." |
25825 |
msgstr "" |
25826 |
-"Ikooni ei ole võimalik kõikidel töölaudadel nähtavaks teha. Veenduge, et " |
25827 |
+"Ikooni ei ole võimalik kõikidel töölaudadel nähtavaks teha. Veendu, et " |
25828 |
"teistel töölaudadel ei ole ükski ikoon dokitud samale positsioonile ja " |
25829 |
"Klamber ei ole mõnel töölaual täis." |
25830 |
|
25831 |
-#: ../src/dock.c:556 |
25832 |
+#: ../src/dock.c:545 |
25833 |
msgid "Workspace Clip" |
25834 |
msgstr "Töölaua Klamber" |
25835 |
|
25836 |
-#: ../src/dock.c:557 |
25837 |
+#: ../src/dock.c:546 |
25838 |
msgid "All selected icons will be removed!" |
25839 |
msgstr "Kõik valitud ikoonid eemaldatakse!" |
25840 |
|
25841 |
-#: ../src/dock.c:608 ../src/dock.c:1156 ../src/dock.c:1158 ../src/dock.c:3445 |
25842 |
+#: ../src/dock.c:598 ../src/dock.c:1147 ../src/dock.c:1149 ../src/dock.c:3455 |
25843 |
msgid "Keep Icon" |
25844 |
msgstr "Hoia ikooni" |
25845 |
|
25846 |
-#: ../src/dock.c:609 ../src/dock.c:2137 ../src/dock.c:2278 |
25847 |
+#: ../src/dock.c:599 ../src/dock.c:2139 ../src/dock.c:2276 |
25848 |
msgid "Type the command used to launch the application" |
25849 |
msgstr "Tipi korraldus, mida kasutada rakenduse käivitamiseks" |
25850 |
|
25851 |
-#: ../src/dock.c:965 |
25852 |
+#: ../src/dock.c:954 |
25853 |
#, c-format |
25854 |
msgid "could not launch application %s\n" |
25855 |
msgstr "ei õnnestu käivitada rakendust %s\n" |
25856 |
|
25857 |
-#: ../src/dock.c:1020 |
25858 |
+#: ../src/dock.c:1010 |
25859 |
msgid "could not create workspace submenu for Clip menu" |
25860 |
msgstr "ei õnnestu luua klambrimenüüle töölaua alammenüüd" |
25861 |
|
25862 |
-#: ../src/dock.c:1078 |
25863 |
+#: ../src/dock.c:1069 |
25864 |
msgid "could not create options submenu for Clip menu" |
25865 |
msgstr "ei õnnestu luua klambrimenüüle valikute alammenüüd" |
25866 |
|
25867 |
-#: ../src/dock.c:1082 ../src/dock.c:1130 |
25868 |
+#: ../src/dock.c:1073 ../src/dock.c:1121 |
25869 |
msgid "Keep on Top" |
25870 |
-msgstr "Hoitakse esiplaanil" |
25871 |
+msgstr "Hoia esiplaanil" |
25872 |
|
25873 |
-#: ../src/dock.c:1088 |
25874 |
+#: ../src/dock.c:1079 |
25875 |
msgid "Collapsed" |
25876 |
msgstr "Ahendatud" |
25877 |
|
25878 |
-#: ../src/dock.c:1094 |
25879 |
+#: ../src/dock.c:1085 |
25880 |
msgid "Autocollapse" |
25881 |
msgstr "Automaatselt ahenev" |
25882 |
|
25883 |
-#: ../src/dock.c:1100 |
25884 |
+#: ../src/dock.c:1091 |
25885 |
msgid "Autoraise" |
25886 |
msgstr "Automaatselt esile tõusev" |
25887 |
|
25888 |
-#: ../src/dock.c:1106 |
25889 |
+#: ../src/dock.c:1097 |
25890 |
msgid "Autoattract Icons" |
25891 |
msgstr "Ikoonide automaatne külgehaakimine" |
25892 |
|
25893 |
-#: ../src/dock.c:1136 |
25894 |
+#: ../src/dock.c:1127 |
25895 |
msgid "Clip Options" |
25896 |
msgstr "Klambri valikud" |
25897 |
|
25898 |
-#: ../src/dock.c:1146 |
25899 |
+#: ../src/dock.c:1137 |
25900 |
msgid "Selected" |
25901 |
msgstr "Valitud" |
25902 |
|
25903 |
-#: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3436 |
25904 |
+#: ../src/dock.c:1142 ../src/dock.c:1145 ../src/dock.c:3446 |
25905 |
msgid "Select All Icons" |
25906 |
msgstr "Vali kõik ikoonid" |
25907 |
|
25908 |
-#: ../src/dock.c:1160 ../src/dock.c:1162 ../src/dock.c:3453 |
25909 |
+#: ../src/dock.c:1151 ../src/dock.c:1153 ../src/dock.c:3463 |
25910 |
msgid "Move Icon To" |
25911 |
msgstr "Teisalda ikoon->" |
25912 |
|
25913 |
-#: ../src/dock.c:1167 ../src/dock.c:1170 ../src/dock.c:3464 |
25914 |
+#: ../src/dock.c:1158 ../src/dock.c:1161 ../src/dock.c:3474 |
25915 |
msgid "Remove Icon" |
25916 |
msgstr "Eemalda ikoon" |
25917 |
|
25918 |
-#: ../src/dock.c:1172 |
25919 |
+#: ../src/dock.c:1163 |
25920 |
msgid "Attract Icons" |
25921 |
msgstr "Haagi ikoonid külge" |
25922 |
|
25923 |
-#: ../src/dock.c:1175 |
25924 |
+#: ../src/dock.c:1166 |
25925 |
msgid "Launch" |
25926 |
msgstr "Käivita programm" |
25927 |
|
25928 |
-#: ../src/dock.c:1183 |
25929 |
+#: ../src/dock.c:1174 |
25930 |
msgid "Settings..." |
25931 |
-msgstr "Määrangud..." |
25932 |
+msgstr "Sätted..." |
25933 |
|
25934 |
-#: ../src/dock.c:1548 ../src/dock.c:1655 |
25935 |
+#: ../src/dock.c:1538 ../src/dock.c:1645 |
25936 |
#, c-format |
25937 |
msgid "bad value in docked icon state info %s" |
25938 |
msgstr "vigane väärtus dokitud ikooni olekuinfos %s " |
25939 |
|
25940 |
-#: ../src/dock.c:1663 |
25941 |
+#: ../src/dock.c:1653 |
25942 |
#, c-format |
25943 |
msgid "bad value in docked icon position %i,%i" |
25944 |
msgstr "vigane väärtus dokitud ikooni asukohal %i,%i" |
25945 |
|
25946 |
-#: ../src/dock.c:1683 |
25947 |
+#: ../src/dock.c:1673 |
25948 |
#, c-format |
25949 |
msgid "bad value in dock state info:%s" |
25950 |
msgstr "vigane väärtus doki olekuinfos:%s" |
25951 |
|
25952 |
-#: ../src/dock.c:1919 |
25953 |
+#: ../src/dock.c:1923 |
25954 |
msgid "there are too many icons stored in dock. Ignoring what doesn't fit" |
25955 |
msgstr "" |
25956 |
"dokki on salvestatud liiga palju ikoone. Eiran neid, mida ei suuda hallata" |
25957 |
|
25958 |
#. icon->forced_dock = 1; |
25959 |
-#: ../src/dock.c:2136 ../src/dock.c:2277 |
25960 |
+#: ../src/dock.c:2138 ../src/dock.c:2275 |
25961 |
msgid "Dock Icon" |
25962 |
msgstr "Dokin ikooni" |
25963 |
|
25964 |
-#: ../src/dock.c:3323 |
25965 |
+#: ../src/dock.c:3333 |
25966 |
#, c-format |
25967 |
msgid "Could not execute command \"%s\"" |
25968 |
msgstr "Ei õnnestu täita korraldust \"%s\"" |
25969 |
|
25970 |
-#: ../src/dock.c:3415 |
25971 |
+#: ../src/dock.c:3425 |
25972 |
msgid "Toggle Omnipresent" |
25973 |
msgstr "Näita/ära näita kõigil töölaudadel" |
25974 |
|
25975 |
-#: ../src/dock.c:3420 ../src/kwm.c:637 ../src/winmenu.c:413 |
25976 |
-#: ../src/winspector.c:1389 |
25977 |
+#: ../src/dock.c:3430 ../src/winmenu.c:414 ../src/winspector.c:1383 |
25978 |
msgid "Omnipresent" |
25979 |
-msgstr "Näha kõigil töölaudadel" |
25980 |
+msgstr "Nähtav kõigil töölaudadel" |
25981 |
|
25982 |
-#: ../src/dock.c:3434 |
25983 |
+#: ../src/dock.c:3444 |
25984 |
msgid "Unselect All Icons" |
25985 |
msgstr "Tühista ikoonivalik" |
25986 |
|
25987 |
-#: ../src/dock.c:3443 |
25988 |
+#: ../src/dock.c:3453 |
25989 |
msgid "Keep Icons" |
25990 |
msgstr "Hoia ikoone" |
25991 |
|
25992 |
-#: ../src/dock.c:3451 |
25993 |
+#: ../src/dock.c:3461 |
25994 |
msgid "Move Icons To" |
25995 |
msgstr "Teisalda ikoonid->" |
25996 |
|
25997 |
-#: ../src/dock.c:3462 |
25998 |
+#: ../src/dock.c:3472 |
25999 |
msgid "Remove Icons" |
26000 |
msgstr "Eemalda ikoonid" |
26001 |
|
26002 |
-#: ../src/dock.c:3493 ../src/kwm.c:643 |
26003 |
+#: ../src/dock.c:3503 |
26004 |
msgid "Bring Here" |
26005 |
msgstr "Too siia" |
26006 |
|
26007 |
-#: ../src/dockedapp.c:149 |
26008 |
+#: ../src/dockedapp.c:150 |
26009 |
#, c-format |
26010 |
msgid "could not find icon %s, used in a docked application" |
26011 |
msgstr "ei leia dokitud rakenduses kasutatavat ikooni %s" |
26012 |
|
26013 |
-#: ../src/dockedapp.c:229 |
26014 |
+#: ../src/dockedapp.c:230 |
26015 |
#, c-format |
26016 |
msgid "Could not open specified icon file: %s" |
26017 |
msgstr "Ei õnnestu avada määratud ikoonifaili: %s" |
26018 |
|
26019 |
-#: ../src/dockedapp.c:231 |
26020 |
+#: ../src/dockedapp.c:232 |
26021 |
msgid "Ignore" |
26022 |
msgstr "Eira" |
26023 |
|
26024 |
-#: ../src/dockedapp.c:333 |
26025 |
+#: ../src/dockedapp.c:334 |
26026 |
msgid "Start when Window Maker is started" |
26027 |
-msgstr "Käivita koos Window Maker'iga" |
26028 |
+msgstr "Käivitada koos Window Maker'iga" |
26029 |
|
26030 |
-#: ../src/dockedapp.c:340 |
26031 |
+#: ../src/dockedapp.c:341 |
26032 |
msgid "Lock (prevent accidental removal)" |
26033 |
msgstr "Lukustatud (ei saa kogemata kustutada)" |
26034 |
|
26035 |
-#: ../src/dockedapp.c:344 |
26036 |
+#: ../src/dockedapp.c:345 |
26037 |
msgid "Application path and arguments" |
26038 |
-msgstr "Rakenduse tee ja argumendid" |
26039 |
+msgstr "Rakenduse rada ja argumendid" |
26040 |
|
26041 |
-#: ../src/dockedapp.c:357 |
26042 |
+#: ../src/dockedapp.c:358 |
26043 |
msgid "Command for middle-click launch" |
26044 |
msgstr "Keskmise nupu korraldus" |
26045 |
|
26046 |
-#: ../src/dockedapp.c:371 |
26047 |
+#: ../src/dockedapp.c:372 |
26048 |
#, c-format |
26049 |
msgid "%s will be replaced with current selection" |
26050 |
-msgstr "%s asendatakse antud valikuga" |
26051 |
+msgstr "%s asendatakse käesoleva valikuga" |
26052 |
|
26053 |
-#: ../src/dockedapp.c:376 |
26054 |
+#: ../src/dockedapp.c:377 |
26055 |
msgid "Command for files dropped with DND" |
26056 |
msgstr "Korraldus DND abil saadetud failidele" |
26057 |
|
26058 |
-#: ../src/dockedapp.c:390 |
26059 |
+#: ../src/dockedapp.c:391 |
26060 |
#, c-format |
26061 |
msgid "%d will be replaced with the file name" |
26062 |
msgstr "%d asendatakse failinimega" |
26063 |
|
26064 |
-#: ../src/dockedapp.c:394 |
26065 |
+#: ../src/dockedapp.c:395 |
26066 |
msgid "DND support was not compiled in" |
26067 |
-msgstr "DND toetus ei ole sisse kompileeritud" |
26068 |
+msgstr "DND tugi pole sisse kompileeritud" |
26069 |
|
26070 |
-#: ../src/dockedapp.c:399 |
26071 |
+#: ../src/dockedapp.c:400 |
26072 |
msgid "Icon Image" |
26073 |
msgstr "Ikooni pilt" |
26074 |
|
26075 |
-#: ../src/dockedapp.c:413 ../src/winspector.c:1527 |
26076 |
+#: ../src/dockedapp.c:414 ../src/winspector.c:1521 |
26077 |
msgid "Browse..." |
26078 |
-msgstr "Kuva..." |
26079 |
+msgstr "Sirvi..." |
26080 |
|
26081 |
-#: ../src/dockedapp.c:466 |
26082 |
+#: ../src/dockedapp.c:475 |
26083 |
msgid "Docked Application Settings" |
26084 |
-msgstr "Dokitud rakenduse määrangud" |
26085 |
+msgstr "Dokitud rakenduse sätted" |
26086 |
|
26087 |
-#: ../src/framewin.c:649 ../src/framewin.c:744 ../src/menu.c:456 |
26088 |
+#: ../src/framewin.c:647 ../src/framewin.c:742 ../src/menu.c:463 |
26089 |
#: ../src/texture.c:594 |
26090 |
#, c-format |
26091 |
msgid "could not render texture: %s" |
26092 |
-msgstr "ei õnnestu renderdada tekstuuri %s" |
26093 |
+msgstr "tekstuuri pole võimalik renderdada: %s" |
26094 |
|
26095 |
-#: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699 |
26096 |
-#: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724 |
26097 |
-#: ../src/icon.c:350 ../src/menu.c:485 |
26098 |
+#: ../src/framewin.c:670 ../src/framewin.c:681 ../src/framewin.c:697 |
26099 |
+#: ../src/framewin.c:708 ../src/framewin.c:715 ../src/framewin.c:722 |
26100 |
+#: ../src/icon.c:360 ../src/menu.c:492 |
26101 |
#, c-format |
26102 |
msgid "error rendering image:%s" |
26103 |
msgstr "viga pildi renderdamisel:%s" |
26104 |
|
26105 |
-#: ../src/framewin.c:777 |
26106 |
+#: ../src/framewin.c:775 |
26107 |
#, c-format |
26108 |
msgid "error rendering image: %s" |
26109 |
msgstr "viga pildi renderdamisel: %s" |
26110 |
|
26111 |
-#: ../src/gnome.c:216 ../src/gnome.c:343 ../src/gnome.c:401 |
26112 |
-msgid "out of memory while updating GNOME hints" |
26113 |
-msgstr "mälu lõppes GNOME vihjete uuendamise käigus" |
26114 |
- |
26115 |
-#: ../src/icon.c:229 ../src/wdefaults.c:443 |
26116 |
+#: ../src/icon.c:239 ../src/wdefaults.c:443 |
26117 |
#, c-format |
26118 |
msgid "error loading image file \"%s\"" |
26119 |
msgstr "viga pildifaili \"%s\" laadimisel" |
26120 |
|
26121 |
-#: ../src/icon.c:491 ../src/icon.c:500 |
26122 |
+#: ../src/icon.c:503 ../src/icon.c:512 |
26123 |
#, c-format |
26124 |
msgid "could not create directory %s" |
26125 |
-msgstr "ei õnnestu luua kataloogi %s" |
26126 |
+msgstr "kataloogi %s pole võimalik luua" |
26127 |
|
26128 |
-#: ../src/icon.c:767 |
26129 |
+#: ../src/icon.c:782 |
26130 |
#, c-format |
26131 |
msgid "could not find default icon \"%s\"" |
26132 |
-msgstr "ei õnnestu leida vaikimisi kasutatavat ikooni \"%s\"" |
26133 |
+msgstr "vaikimisi kasutatavat ikooni \"%s\" pole võimalik leida" |
26134 |
|
26135 |
-#: ../src/icon.c:773 |
26136 |
+#: ../src/icon.c:788 |
26137 |
#, c-format |
26138 |
msgid "could not load default icon \"%s\":%s" |
26139 |
-msgstr "Ei õnnestu laadida vaikimisi kasutatavat ikooni \"%s\":%s" |
26140 |
- |
26141 |
-#. |
26142 |
-#. * Warning: If you make some change that affects the order of the |
26143 |
-#. * entries, you must update the command #defines in the top of |
26144 |
-#. * this file. |
26145 |
-#. |
26146 |
-#: ../src/kwm.c:633 ../src/winmenu.c:436 ../src/winmenu.c:571 |
26147 |
-msgid "Maximize" |
26148 |
-msgstr "Maksimeeri" |
26149 |
- |
26150 |
-#: ../src/kwm.c:634 ../src/winmenu.c:566 |
26151 |
-msgid "Unmaximize" |
26152 |
-msgstr "Taasta suurus" |
26153 |
- |
26154 |
-#: ../src/kwm.c:635 ../src/winmenu.c:444 ../src/winmenu.c:557 |
26155 |
-msgid "Miniaturize" |
26156 |
-msgstr "Minimeeri" |
26157 |
- |
26158 |
-#: ../src/kwm.c:636 ../src/winmenu.c:552 |
26159 |
-msgid "Deminiaturize" |
26160 |
-msgstr "Ava aken" |
26161 |
- |
26162 |
-#: ../src/kwm.c:638 |
26163 |
-msgid "Not Omnipresent" |
26164 |
-msgstr "Näita ainult ühel töölaual" |
26165 |
- |
26166 |
-#: ../src/kwm.c:639 |
26167 |
-msgid "Move" |
26168 |
-msgstr "Liiguta" |
26169 |
- |
26170 |
-#: ../src/kwm.c:640 |
26171 |
-msgid "Resize" |
26172 |
-msgstr "Muuda suurust" |
26173 |
- |
26174 |
-#. |
26175 |
-#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); |
26176 |
-#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); |
26177 |
-#. |
26178 |
-#: ../src/kwm.c:641 ../src/rootmenu.c:248 ../src/winmenu.c:501 |
26179 |
-msgid "Close" |
26180 |
-msgstr "Sulge" |
26181 |
- |
26182 |
-#: ../src/kwm.c:642 ../src/winmenu.c:485 |
26183 |
-msgid "Move To" |
26184 |
-msgstr "Teisalda" |
26185 |
+msgstr "vaikimisi kasutatavat ikooni \"%s\" pole võimalik laadida:%s" |
26186 |
|
26187 |
-#: ../src/kwm.c:1096 |
26188 |
-msgid "%a(Run Command,Type the command to run:)" |
26189 |
-msgstr "%a(Käivita korraldus,Sisesta korraldus, mida käivitada:)" |
26190 |
- |
26191 |
-#: ../src/main.c:222 |
26192 |
+#: ../src/main.c:220 |
26193 |
msgid "failed to restart Window Maker." |
26194 |
-msgstr "Window Makeri taaskäivitamine ebaõnnestus." |
26195 |
+msgstr "Tõrge Window Maker'i taaskäivitamisel." |
26196 |
|
26197 |
-#: ../src/main.c:225 |
26198 |
+#: ../src/main.c:223 |
26199 |
#, c-format |
26200 |
msgid "could not exec %s" |
26201 |
-msgstr "ei õnnestu käivitada %s" |
26202 |
+msgstr "%s pole võimalik käivitada" |
26203 |
|
26204 |
-#: ../src/main.c:271 |
26205 |
+#: ../src/main.c:269 |
26206 |
msgid "Could not execute command: " |
26207 |
-msgstr "Ei õnnestu käivitada korraldust: " |
26208 |
+msgstr "Korraldust pole võimalik käivitada : " |
26209 |
|
26210 |
-#: ../src/main.c:428 |
26211 |
+#: ../src/main.c:426 |
26212 |
#, c-format |
26213 |
msgid "%s aborted.\n" |
26214 |
msgstr "%s katkestatud.\n" |
26215 |
|
26216 |
-#: ../src/main.c:439 |
26217 |
+#: ../src/main.c:437 |
26218 |
#, c-format |
26219 |
msgid "Usage: %s [options]\n" |
26220 |
-msgstr "Kasuta: %s [valikud]\n" |
26221 |
+msgstr "Kasutamine: %s [võtmed]\n" |
26222 |
|
26223 |
-#: ../src/main.c:440 |
26224 |
+#: ../src/main.c:438 |
26225 |
msgid "The Window Maker window manager for the X window system" |
26226 |
-msgstr "Window Maker on aknahaldur X window system'ile" |
26227 |
+msgstr "Window Maker on X window system'i aknahaldur" |
26228 |
|
26229 |
-#: ../src/main.c:442 |
26230 |
+#: ../src/main.c:440 |
26231 |
msgid " -display host:dpy\tdisplay to use" |
26232 |
-msgstr " -display host:dpy\tmäärab, millist kuva kasutada" |
26233 |
+msgstr " -display host:dpy\tkasutatava kuva määramine" |
26234 |
|
26235 |
-#: ../src/main.c:444 |
26236 |
+#: ../src/main.c:442 |
26237 |
msgid " --no-cpp \t\tdisable preprocessing of configuration files" |
26238 |
-msgstr " --no-cpp \t\tkeelab häälestusfailide eeltöötluse" |
26239 |
+msgstr " --no-cpp \t\tseadistusfailide eeltöötluse keelamine" |
26240 |
|
26241 |
-#: ../src/main.c:446 |
26242 |
+#: ../src/main.c:444 |
26243 |
msgid " --no-dock\t\tdo not open the application Dock" |
26244 |
-msgstr " --no-dock\t\tkeelab rakenduste doki avamise" |
26245 |
+msgstr " --no-dock\t\trakenduste doki avamise keelamine" |
26246 |
|
26247 |
-#: ../src/main.c:447 |
26248 |
+#: ../src/main.c:445 |
26249 |
msgid " --no-clip\t\tdo not open the workspace Clip" |
26250 |
-msgstr " --no-clip\t\tkeelab töölaua klambri avamise" |
26251 |
+msgstr " --no-clip\t\ttöölaua klambri avamise keelamine" |
26252 |
|
26253 |
-#: ../src/main.c:448 |
26254 |
+#: ../src/main.c:446 |
26255 |
msgid " --no-autolaunch\tdo not autolaunch applications" |
26256 |
-msgstr " --no-autolaunch\tkeelab rakenduste automaatse käivitamise" |
26257 |
+msgstr " --no-autolaunch\trakenduste automaatse käivitamise keelamine" |
26258 |
|
26259 |
-#: ../src/main.c:449 |
26260 |
+#: ../src/main.c:447 |
26261 |
msgid " --dont-restore\t\tdo not restore saved session" |
26262 |
-msgstr " --dont-restore\tei taasta salvestatud seanssi" |
26263 |
+msgstr " --dont-restore\tsalvestatud seansi taastamise keelamine" |
26264 |
|
26265 |
-#: ../src/main.c:451 |
26266 |
+#: ../src/main.c:449 |
26267 |
msgid " --locale locale\tlocale to use" |
26268 |
-msgstr " --locale locale\t\tmillist locale't kasutada" |
26269 |
+msgstr " --locale locale\t\tkasutatava lokaadi määramine" |
26270 |
|
26271 |
-#: ../src/main.c:453 |
26272 |
+#: ../src/main.c:451 |
26273 |
msgid "" |
26274 |
" --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals" |
26275 |
msgstr "" |
26276 |
-" --create-stdcmap\tloo standardne värvikaardi vihje PseudoColor visuaalile" |
26277 |
+" --create-stdcmap\tstandardse värvikaardi vihje loomine PseudoColor visuaalile" |
26278 |
|
26279 |
-#: ../src/main.c:454 |
26280 |
+#: ../src/main.c:452 |
26281 |
msgid " --visual-id visualid\tvisual id of visual to use" |
26282 |
msgstr " --visual-id visualid\tkasutatava visuaali id" |
26283 |
|
26284 |
-#: ../src/main.c:455 |
26285 |
+#: ../src/main.c:453 |
26286 |
msgid " --static\t\tdo not update or save configurations" |
26287 |
-msgstr " --static\t\thäälestusi ei salvestata ega uuendata" |
26288 |
+msgstr " --static\t\tseadistusi ei salvestata ega uuendata" |
26289 |
|
26290 |
-#: ../src/main.c:456 |
26291 |
+#: ../src/main.c:454 |
26292 |
msgid " --no-polling\t\tdo not periodically check for configuration updates" |
26293 |
-msgstr " --no-polling\t\tkeelab ümberhäälestustuste regulaarse kontrolli" |
26294 |
+msgstr " --no-polling\t\tümberseadistustuste korrapärase kontrolli keelamine" |
26295 |
|
26296 |
-#: ../src/main.c:458 |
26297 |
+#: ../src/main.c:456 |
26298 |
msgid " --synchronous\t\tturn on synchronous display mode" |
26299 |
-msgstr " --synchronous\t\tlülitab sisse sünkroonse ekraanirezhiimi" |
26300 |
+msgstr " --synchronous\t\tsünkroonse ekraanirezhiimi sisselülitamine" |
26301 |
|
26302 |
-#: ../src/main.c:460 |
26303 |
+#: ../src/main.c:458 |
26304 |
msgid " --version\t\tprint version and exit" |
26305 |
-msgstr " --version\t\tväljastab versiooninumbri ja lõpetab programmi töö" |
26306 |
+msgstr " --version\t\tversiooninumbri väljastamine ja programmi töö lõpetamine" |
26307 |
|
26308 |
-#: ../src/main.c:461 |
26309 |
+#: ../src/main.c:459 |
26310 |
msgid " --help\t\t\tshow this message" |
26311 |
-msgstr " --help\t\t\tnäitab seda teadet" |
26312 |
+msgstr " --help\t\t\tselle teate näitamine" |
26313 |
|
26314 |
-#: ../src/main.c:474 |
26315 |
+#: ../src/main.c:473 |
26316 |
#, c-format |
26317 |
msgid "" |
26318 |
"could not find user GNUstep directory (%s).\n" |
26319 |
"Make sure you have installed Window Maker correctly and run wmaker.inst" |
26320 |
msgstr "" |
26321 |
-"ei õnnestu leida kasutaja GNUstep kataloogi (%s).\n" |
26322 |
+"kasutaja GNUstep kataloogi (%s) pole võimalik leida.\n" |
26323 |
"Veendu, et Window Maker on korrektselt paigaldatud ja käivita wmaker.inst" |
26324 |
|
26325 |
-#: ../src/main.c:479 |
26326 |
+#: ../src/main.c:478 |
26327 |
#, c-format |
26328 |
msgid "could not find user GNUstep directory (%s)." |
26329 |
-msgstr "ei õnnestu leida kasutaja GNUstep kataloogi (%s)" |
26330 |
+msgstr "kasutaja GNUstep kataloogi (%s) pole võimalik leida." |
26331 |
|
26332 |
-#: ../src/main.c:482 |
26333 |
+#: ../src/main.c:481 |
26334 |
msgid "" |
26335 |
"There was an error while creating GNUstep directory, please make sure you " |
26336 |
"have installed Window Maker correctly and run wmaker.inst" |
26337 |
@@ -959,190 +958,142 @@ |
26338 |
"Viga GNUstep kataloogi loomise käigus. Palun veendu, et Window Maker on " |
26339 |
"korrektselt paigaldatud ja käivita wmaker.inst" |
26340 |
|
26341 |
-#: ../src/main.c:485 |
26342 |
+#: ../src/main.c:484 |
26343 |
#, c-format |
26344 |
msgid "%s directory created with default configuration." |
26345 |
-msgstr "%s kataloog loodi vaikimisi häälestusega" |
26346 |
+msgstr "%s kataloog loodi vaikimisi seadistusega" |
26347 |
|
26348 |
-#: ../src/main.c:505 ../src/main.c:510 |
26349 |
+#: ../src/main.c:506 ../src/main.c:511 |
26350 |
#, c-format |
26351 |
msgid "%s:could not execute initialization script" |
26352 |
-msgstr "%s:ei õnnestu käivitada lähtestamisskripti" |
26353 |
+msgstr "%s:lähtestamisskripti pole võimalik käivitada" |
26354 |
|
26355 |
-#: ../src/main.c:530 ../src/main.c:535 |
26356 |
+#: ../src/main.c:533 ../src/main.c:538 |
26357 |
#, c-format |
26358 |
msgid "%s:could not execute exit script" |
26359 |
-msgstr "%s:ei õnnestu käivitada lõpetamisskripti" |
26360 |
+msgstr "%s:lõpetamisskripti pole võimalik käivitada" |
26361 |
|
26362 |
-#: ../src/main.c:651 ../src/main.c:659 ../src/main.c:667 ../src/main.c:687 |
26363 |
+#: ../src/main.c:622 ../src/main.c:722 ../src/main.c:730 ../src/main.c:738 |
26364 |
+#: ../src/main.c:758 |
26365 |
#, c-format |
26366 |
msgid "too few arguments for %s" |
26367 |
msgstr "liiga vähe argumente %s jaoks" |
26368 |
|
26369 |
-#: ../src/main.c:671 |
26370 |
+#: ../src/main.c:742 |
26371 |
#, c-format |
26372 |
msgid "bad value for visualid: \"%s\"" |
26373 |
msgstr "vigane visualid väärtus: \"%s\"" |
26374 |
|
26375 |
-#: ../src/main.c:695 |
26376 |
+#: ../src/main.c:766 |
26377 |
#, c-format |
26378 |
msgid "%s: invalid argument '%s'\n" |
26379 |
msgstr "%s: vigane argument '%s'\n" |
26380 |
|
26381 |
-#: ../src/main.c:696 |
26382 |
+#: ../src/main.c:767 |
26383 |
#, c-format |
26384 |
msgid "Try '%s --help' for more information\n" |
26385 |
-msgstr "Et saada rohkem informatsiooni, proovi '%s --help'\n" |
26386 |
+msgstr "Täiendava teabe saamiseks proovi kasutada '%s --help'\n" |
26387 |
|
26388 |
-#: ../src/main.c:727 |
26389 |
+#: ../src/main.c:802 |
26390 |
msgid "X server does not support locale" |
26391 |
msgstr "X server ei toeta lokaliseerimist" |
26392 |
|
26393 |
-#: ../src/main.c:731 |
26394 |
+#: ../src/main.c:806 |
26395 |
msgid "cannot set locale modifiers" |
26396 |
-msgstr "" |
26397 |
+msgstr "lokaadimuujaid pole võimalik määrata" |
26398 |
|
26399 |
-#: ../src/main.c:747 |
26400 |
+#: ../src/main.c:822 |
26401 |
#, c-format |
26402 |
msgid "could not open display \"%s\"" |
26403 |
-msgstr "ei õnnestu avada kuva \"%s\"" |
26404 |
+msgstr "kuva \"%s\" pole võimalik avada" |
26405 |
|
26406 |
-#: ../src/menu.c:1255 |
26407 |
+#: ../src/menu.c:1276 |
26408 |
msgid "could not grab keyboard" |
26409 |
-msgstr "ei suuda klaviatuuriga ühendust saada" |
26410 |
- |
26411 |
-#: ../src/menu.c:2569 |
26412 |
-#, c-format |
26413 |
-msgid "bad value in menus state info:%s" |
26414 |
-msgstr "vigane väärtus menüüde olekuinfos:%s" |
26415 |
+msgstr "klaviatuuriga pole võimalik ühendust saada" |
26416 |
|
26417 |
-#: ../src/menureader.c:264 ../src/rootmenu.c:730 |
26418 |
+#: ../src/menu.c:2615 |
26419 |
#, c-format |
26420 |
-msgid "%s:could not stat menu" |
26421 |
-msgstr "%s:ei õnnestu tuvastada menüü atribuute" |
26422 |
- |
26423 |
-#: ../src/menureader.c:341 ../src/menureader.c:380 |
26424 |
-#, c-format |
26425 |
-msgid "could not stat() menu file '%s'" |
26426 |
-msgstr "ei õnnestu lugeda (stat()) menüüfaili '%s' atribuute" |
26427 |
+msgid "bad value in menus state info: %s" |
26428 |
+msgstr "vigane väärtus menüüde olekuandmetes:%s" |
26429 |
|
26430 |
-#: ../src/menureader.c:416 |
26431 |
-#, c-format |
26432 |
-msgid "could not find menu file '%s' referenced in WMRootMenu" |
26433 |
-msgstr "ei õnnestu leida menüüfaili '%s', millele viitab WMRootMenu" |
26434 |
- |
26435 |
-#: ../src/menureader.c:423 |
26436 |
-#, c-format |
26437 |
-msgid "could not find any usable menu files. Please check '%s'" |
26438 |
-msgstr "" |
26439 |
-"ei õnnestu leida ühtegi kasutuskõlblikku menüüfaili. Palun kontrolli '%s'" |
26440 |
- |
26441 |
-#: ../src/menureader.c:438 ../src/rootmenu.c:1664 |
26442 |
-#, c-format |
26443 |
-msgid "" |
26444 |
-"using default menu file \"%s\" as the menu referenced in WMRootMenu could " |
26445 |
-"not be found " |
26446 |
-msgstr "" |
26447 |
-"ei õnnestu leida vaikimisi kasutatavat menüüfaili \"%s\", millele viitab " |
26448 |
-"WMRootMenu" |
26449 |
- |
26450 |
-#: ../src/menureader.c:457 |
26451 |
-#, c-format |
26452 |
-msgid "" |
26453 |
-"invalid content in menu file '%s'.\n" |
26454 |
-"It should either be a property list menu or the path to the file, enclosed " |
26455 |
-"in \"." |
26456 |
-msgstr "" |
26457 |
- |
26458 |
-#: ../src/misc.c:71 |
26459 |
+#: ../src/misc.c:65 |
26460 |
#, c-format |
26461 |
msgid "could not define value for %s for cpp" |
26462 |
-msgstr "ei õnnestu defineerida %s väärtust cpp jaoks" |
26463 |
+msgstr "%s väärtust pole võimalik cpp jaoks kirjedada" |
26464 |
|
26465 |
-#: ../src/misc.c:101 |
26466 |
+#: ../src/misc.c:95 |
26467 |
#, c-format |
26468 |
msgid "could not get password entry for UID %i" |
26469 |
-msgstr "ei õnnestu leida UID %i paroolikirjet" |
26470 |
+msgstr "UID %i paroolikirjet pole võimalik leida" |
26471 |
|
26472 |
-#: ../src/misc.c:126 |
26473 |
+#: ../src/misc.c:121 |
26474 |
#, c-format |
26475 |
msgid "your machine is misconfigured. HOSTNAME is set to %s" |
26476 |
-msgstr "Teie masin on häälestamata. HOSTNAME väärtus on %s" |
26477 |
+msgstr "Teie masin on seadistamata. HOSTNAME väärtus on %s" |
26478 |
|
26479 |
-#: ../src/misc.c:132 |
26480 |
+#: ../src/misc.c:127 |
26481 |
#, c-format |
26482 |
msgid "your machine is misconfigured. HOST is set to %s" |
26483 |
-msgstr "Teie masin on häälestamata. HOST väärtus on %s" |
26484 |
+msgstr "Teie masin on seadistamata. HOST väärtus on %s" |
26485 |
|
26486 |
-#: ../src/misc.c:630 |
26487 |
+#: ../src/misc.c:622 |
26488 |
msgid "Program Arguments" |
26489 |
msgstr "Programmi argumendid" |
26490 |
|
26491 |
-#: ../src/misc.c:631 |
26492 |
+#: ../src/misc.c:623 |
26493 |
msgid "Enter command arguments:" |
26494 |
msgstr "Sisesta käsu argumendid:" |
26495 |
|
26496 |
-#: ../src/misc.c:724 |
26497 |
-msgid "unable to get dropped data from DND drop" |
26498 |
-msgstr "ei õnnestu vastu võtta DND saadetud andmeid" |
26499 |
- |
26500 |
-#: ../src/misc.c:732 |
26501 |
-msgid "error getting dropped data from DND drop" |
26502 |
-msgstr "viga DND saadetud andmete vastuvõtmisel" |
26503 |
- |
26504 |
-#: ../src/misc.c:738 |
26505 |
-msgid "out of memory while getting data from DND drop" |
26506 |
-msgstr "mälu lõppes DND saadetud andmete vastuvõtmisel " |
26507 |
- |
26508 |
-#: ../src/misc.c:783 ../src/misc.c:923 |
26509 |
+#: ../src/misc.c:737 ../src/misc.c:875 |
26510 |
#, c-format |
26511 |
msgid "out of memory during expansion of \"%s\"" |
26512 |
msgstr "mälu lõppes \"%s\" laiendamise käigus" |
26513 |
|
26514 |
-#: ../src/misc.c:837 |
26515 |
+#: ../src/misc.c:791 |
26516 |
msgid "out of memory during expansion of \"%w\"" |
26517 |
msgstr "mälu lõppes \"%w\" laiendamise käigus" |
26518 |
|
26519 |
-#: ../src/misc.c:855 |
26520 |
+#: ../src/misc.c:809 |
26521 |
msgid "out of memory during expansion of \"%W\"" |
26522 |
msgstr "mälu lõppes \"%W\" laiendamise käigus" |
26523 |
|
26524 |
-#: ../src/misc.c:871 |
26525 |
+#: ../src/misc.c:825 |
26526 |
+#, c-format |
26527 |
msgid "out of memory during expansion of \"%a\"" |
26528 |
msgstr "mälu lõppes \"%a\" laiendamise käigus" |
26529 |
|
26530 |
-#: ../src/misc.c:902 |
26531 |
+#: ../src/misc.c:854 |
26532 |
#, c-format |
26533 |
msgid "out of memory during expansion of \"%d\"" |
26534 |
msgstr "mälu lõppes \"%d\" laiendamise käigus" |
26535 |
|
26536 |
-#: ../src/misc.c:916 |
26537 |
+#: ../src/misc.c:868 |
26538 |
msgid "selection not available" |
26539 |
msgstr "valik ei ole kättesaadav" |
26540 |
|
26541 |
-#: ../src/misc.c:972 ../src/misc.c:978 |
26542 |
+#: ../src/misc.c:912 ../src/misc.c:918 |
26543 |
#, c-format |
26544 |
msgid "bad window name value in %s state info" |
26545 |
-msgstr "vigane akna nimi %s olekuinfos" |
26546 |
+msgstr "vigane akna nimi %s olekuandmetes" |
26547 |
|
26548 |
-#: ../src/misc.c:1235 |
26549 |
+#: ../src/misc.c:1157 |
26550 |
msgid "could not send message to background image helper" |
26551 |
-msgstr "ei õnnestu saata teadet taustapildiprogrammile" |
26552 |
+msgstr "taustapildi abiprogrammile pole võimalik teadet saata" |
26553 |
|
26554 |
#: ../src/pixmap.c:235 |
26555 |
#, c-format |
26556 |
msgid "could not load mask bitmap file \"%s\". Won't use mask" |
26557 |
-msgstr "ei õnnestu laadida bitmap maskifaili \"%s\". Maski ei saa kasutada" |
26558 |
+msgstr "bitmap maskifaili \"%s\" pole võimalik laadida. Maski ei saa kasutada" |
26559 |
|
26560 |
#: ../src/resources.c:44 |
26561 |
#, c-format |
26562 |
msgid "could not parse color \"%s\"" |
26563 |
-msgstr "ei õnnestu sõeluda värvi \"%s\"" |
26564 |
+msgstr "värvi \"%s\" pole võimalik analüüsida" |
26565 |
|
26566 |
#: ../src/resources.c:48 |
26567 |
#, c-format |
26568 |
msgid "could not allocate color \"%s\"" |
26569 |
-msgstr "ei õnnestu eraldada värvi \"%s\"" |
26570 |
+msgstr "värvi \"%s\" pole võimalik eraldada" |
26571 |
|
26572 |
#: ../src/rootmenu.c:196 ../src/rootmenu.c:198 |
26573 |
msgid "Exit" |
26574 |
@@ -1150,7 +1101,7 @@ |
26575 |
|
26576 |
#: ../src/rootmenu.c:197 |
26577 |
msgid "Exit window manager?" |
26578 |
-msgstr "Kas lõpetan aknahalduri töö?" |
26579 |
+msgstr "Kas lõpetada aknahalduri töö?" |
26580 |
|
26581 |
#: ../src/rootmenu.c:245 |
26582 |
msgid "Close X session" |
26583 |
@@ -1165,6 +1116,14 @@ |
26584 |
"On võimalik, et suletakse ka mõned rakendused, mis sisaldavad salvestamata " |
26585 |
"andmeid." |
26586 |
|
26587 |
+#. |
26588 |
+#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); |
26589 |
+#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); |
26590 |
+#. |
26591 |
+#: ../src/rootmenu.c:248 ../src/winmenu.c:501 |
26592 |
+msgid "Close" |
26593 |
+msgstr "Sulge" |
26594 |
+ |
26595 |
#: ../src/rootmenu.c:261 |
26596 |
msgid "Kill X session" |
26597 |
msgstr "X seansi kõrvaldamine" |
26598 |
@@ -1177,190 +1136,202 @@ |
26599 |
"Kas kõrvaldame X seansi?\n" |
26600 |
"(kõik rakendused suletakse)" |
26601 |
|
26602 |
-#: ../src/rootmenu.c:536 |
26603 |
+#: ../src/rootmenu.c:544 |
26604 |
#, c-format |
26605 |
msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" |
26606 |
msgstr "%s:vigane kiirklahvi kirjeldus \"%s\" kirjele %s" |
26607 |
|
26608 |
-#: ../src/rootmenu.c:544 |
26609 |
+#: ../src/rootmenu.c:552 |
26610 |
#, c-format |
26611 |
msgid "%s:invalid key in shortcut \"%s\" for entry %s" |
26612 |
msgstr "%s: vigane klahv kiirkorralduses \"%s\" kirjele %s" |
26613 |
|
26614 |
-#: ../src/rootmenu.c:597 |
26615 |
+#: ../src/rootmenu.c:605 |
26616 |
#, c-format |
26617 |
msgid "%s: unmatched '\"' in menu file" |
26618 |
msgstr "%s: ebamäärane '\"' menüüfailis" |
26619 |
|
26620 |
-#: ../src/rootmenu.c:647 |
26621 |
+#: ../src/rootmenu.c:655 |
26622 |
#, c-format |
26623 |
msgid "%s: missing command" |
26624 |
msgstr "%s: puuduv korraldus" |
26625 |
|
26626 |
-#: ../src/rootmenu.c:679 |
26627 |
+#: ../src/rootmenu.c:687 |
26628 |
#, c-format |
26629 |
msgid "invalid OPEN_MENU specification: %s" |
26630 |
msgstr "vigane OPEN_MENU kirjeldus: %s" |
26631 |
|
26632 |
#: ../src/rootmenu.c:738 |
26633 |
#, c-format |
26634 |
+msgid "%s:could not stat menu" |
26635 |
+msgstr "%s:menüü rekvisiite pole võimalik tuvastada" |
26636 |
+ |
26637 |
+#: ../src/rootmenu.c:746 |
26638 |
+#, c-format |
26639 |
msgid "%s:could not stat menu:%s" |
26640 |
-msgstr "%s:ei õnnestu tuvastada menüü atribuute:%s" |
26641 |
+msgstr "%s:menüü rekvisiite pole võimalik tuvastada:%s" |
26642 |
|
26643 |
-#: ../src/rootmenu.c:756 |
26644 |
+#: ../src/rootmenu.c:764 |
26645 |
#, c-format |
26646 |
msgid "too many parameters in OPEN_MENU: %s" |
26647 |
-msgstr "liiga palju parameetreid OPEN_MENU's: %s" |
26648 |
+msgstr "liiga palju OPEN_MENU parameetreid: %s" |
26649 |
|
26650 |
-#: ../src/rootmenu.c:800 |
26651 |
+#: ../src/rootmenu.c:808 |
26652 |
msgid "" |
26653 |
"There are more than one WORKSPACE_MENU commands in the applications menu. " |
26654 |
"Only one is allowed." |
26655 |
msgstr "" |
26656 |
-"Rakenduste menüüs on rohkem kui üks WORKSPACE_MENU korraldus. Lubatud on " |
26657 |
-"ainult üks." |
26658 |
+"Rakenduste menüüs on mitu WORKSPACE_MENU korraldust. Lubatud on ainult üks." |
26659 |
|
26660 |
-#: ../src/rootmenu.c:834 |
26661 |
+#: ../src/rootmenu.c:842 |
26662 |
msgid "" |
26663 |
"There are more than one WINDOWS_MENU commands in the applications menu. Only " |
26664 |
"one is allowed." |
26665 |
msgstr "" |
26666 |
-"Rakenduste menüüs on rohkem kui üks WINDOWS_MENU korraldus. Lubatud on " |
26667 |
-"ainult üks." |
26668 |
+"Rakenduste menüüs on mitu WINDOWS_MENU korraldust. Lubatud on ainult üks." |
26669 |
|
26670 |
-#: ../src/rootmenu.c:839 |
26671 |
+#: ../src/rootmenu.c:847 |
26672 |
msgid "Window List" |
26673 |
msgstr "Akende nimekiri" |
26674 |
|
26675 |
-#: ../src/rootmenu.c:868 ../src/rootmenu.c:886 ../src/rootmenu.c:896 |
26676 |
+#: ../src/rootmenu.c:876 ../src/rootmenu.c:894 ../src/rootmenu.c:904 |
26677 |
#, c-format |
26678 |
msgid "%s:missing parameter for menu command \"%s\"" |
26679 |
-msgstr "%s:puuduvad parameetrid menüükorraldusele \"%s\"" |
26680 |
+msgstr "%s:menüükorraldusel \"%s\" puuduvad parameetrid" |
26681 |
|
26682 |
-#: ../src/rootmenu.c:964 |
26683 |
+#: ../src/rootmenu.c:972 |
26684 |
#, c-format |
26685 |
msgid "%s:unknown command \"%s\" in menu config." |
26686 |
-msgstr "%s:tundmatu käsk menüü seadistuses: \"%s\"." |
26687 |
+msgstr "%s:menüü seadistuses on tundmatu käsk \"%s\"." |
26688 |
|
26689 |
-#: ../src/rootmenu.c:972 |
26690 |
+#: ../src/rootmenu.c:980 |
26691 |
#, c-format |
26692 |
msgid "%s:can't add shortcut for entry \"%s\"" |
26693 |
-msgstr "%s:ei õnnestu lisada kiirkorraldust kirjele \"%s\"" |
26694 |
+msgstr "%s:kiirkorraldust pole võimalik kirjele \"%s\" lisada" |
26695 |
|
26696 |
-#: ../src/rootmenu.c:1109 |
26697 |
+#: ../src/rootmenu.c:1117 |
26698 |
#, c-format |
26699 |
msgid "%s:maximal line size exceeded in menu config: %s" |
26700 |
-msgstr "%s:maksimaalne rea pikkus ületatud menüü seadistuses: %s" |
26701 |
+msgstr "%s:menüü seadistustes on suurim rea pikkus ületatud: %s" |
26702 |
|
26703 |
-#: ../src/rootmenu.c:1131 ../src/rootmenu.c:1224 ../src/rootmenu.c:1326 |
26704 |
+#: ../src/rootmenu.c:1139 ../src/rootmenu.c:1232 ../src/rootmenu.c:1336 |
26705 |
#, c-format |
26706 |
msgid "%s:missing command in menu config: %s" |
26707 |
-msgstr "%s:puudub korraldus menüü seadistuses: %s" |
26708 |
+msgstr "%s:menüü seadistuses puudub korraldus: %s" |
26709 |
|
26710 |
-#: ../src/rootmenu.c:1161 |
26711 |
+#: ../src/rootmenu.c:1169 |
26712 |
#, c-format |
26713 |
msgid "%s:syntax error in menu file:END declaration missing" |
26714 |
-msgstr "%s:süntaksi viga menüüfaili: puudub lõputunnus END" |
26715 |
+msgstr "%s:menüüfaili süntaksi viga: puudub lõputunnus END" |
26716 |
|
26717 |
-#: ../src/rootmenu.c:1190 ../src/rootmenu.c:1290 |
26718 |
+#: ../src/rootmenu.c:1198 ../src/rootmenu.c:1300 |
26719 |
msgid "could not make arguments for menu file preprocessor" |
26720 |
-msgstr "ei suuda luua argumente menüüfaili eeltöötlejale" |
26721 |
+msgstr "menüüfaili eeltöötlejale pole võimalik argumente luua" |
26722 |
|
26723 |
-#: ../src/rootmenu.c:1197 ../src/rootmenu.c:1298 |
26724 |
+#: ../src/rootmenu.c:1205 ../src/rootmenu.c:1308 |
26725 |
#, c-format |
26726 |
msgid "%s:could not open/preprocess menu file" |
26727 |
-msgstr "%s:ei suuda avada/eeltöödelda menüüfaili" |
26728 |
+msgstr "%s:menüüfaili pole võimalik avada või eeltöödelda" |
26729 |
|
26730 |
-#: ../src/rootmenu.c:1209 ../src/rootmenu.c:1311 |
26731 |
+#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321 |
26732 |
#, c-format |
26733 |
msgid "%s:could not open menu file" |
26734 |
-msgstr "%s:menüüfaili avamine ebaõnnestus" |
26735 |
+msgstr "%s:menüüfaili pole võimalik avada" |
26736 |
|
26737 |
-#: ../src/rootmenu.c:1236 |
26738 |
+#: ../src/rootmenu.c:1244 |
26739 |
#, c-format |
26740 |
msgid "%s:invalid menu file. MENU command is missing" |
26741 |
msgstr "%s:vigane menüüfail. Puudub MENU käsk" |
26742 |
|
26743 |
-#: ../src/rootmenu.c:1245 |
26744 |
+#: ../src/rootmenu.c:1253 |
26745 |
msgid "error reading preprocessed menu data" |
26746 |
-msgstr "viga eelnevalt töödeldud menüüandmete lugemisel" |
26747 |
+msgstr "viga eeltöödeldud menüüandmete lugemisel" |
26748 |
|
26749 |
-#: ../src/rootmenu.c:1338 |
26750 |
+#: ../src/rootmenu.c:1348 |
26751 |
#, c-format |
26752 |
msgid "%s:no title given for the root menu" |
26753 |
msgstr "%s:juurmenüü pealkiri on puudu" |
26754 |
|
26755 |
-#: ../src/rootmenu.c:1429 ../src/rootmenu.c:1502 ../src/rootmenu.c:1543 |
26756 |
+#: ../src/rootmenu.c:1439 ../src/rootmenu.c:1512 ../src/rootmenu.c:1553 |
26757 |
#, c-format |
26758 |
msgid "out of memory while constructing directory menu %s" |
26759 |
-msgstr "mälu lõppes menüü %s loomise käigus" |
26760 |
+msgstr "menüü %s loomise käigus lõppes mälu" |
26761 |
|
26762 |
-#: ../src/rootmenu.c:1439 |
26763 |
+#: ../src/rootmenu.c:1449 |
26764 |
#, c-format |
26765 |
msgid "%s:could not stat file \"%s\" in menu directory" |
26766 |
-msgstr "%s:ei õnnestu lugeda faili \"%s\" atribuute menüükataloogis" |
26767 |
+msgstr "%s:faili \"%s\" rekvisiite pole menüükataloogist võimalik lugeda" |
26768 |
|
26769 |
-#: ../src/rootmenu.c:1597 |
26770 |
+#: ../src/rootmenu.c:1607 |
26771 |
msgid "Commands" |
26772 |
msgstr "Korraldused" |
26773 |
|
26774 |
-#: ../src/rootmenu.c:1600 |
26775 |
+#: ../src/rootmenu.c:1610 |
26776 |
msgid "Restart" |
26777 |
msgstr "Taaskäivitamine" |
26778 |
|
26779 |
-#: ../src/rootmenu.c:1601 |
26780 |
+#: ../src/rootmenu.c:1611 |
26781 |
msgid "Exit..." |
26782 |
msgstr "Lõpetamine..." |
26783 |
|
26784 |
-#: ../src/rootmenu.c:1646 |
26785 |
+#: ../src/rootmenu.c:1656 |
26786 |
#, c-format |
26787 |
msgid "could not find menu file \"%s\" referenced in WMRootMenu" |
26788 |
-msgstr "ei õnnestu leida menüüfaili \"%s\", millele viitab WMRootMenu" |
26789 |
+msgstr "WMRootMenu poolt viidatud menüüfaili \"%s\" pole võimalik leida" |
26790 |
|
26791 |
-#: ../src/rootmenu.c:1653 |
26792 |
+#: ../src/rootmenu.c:1663 |
26793 |
#, c-format |
26794 |
msgid "could not access menu \"%s\" referenced in WMRootMenu" |
26795 |
-msgstr "ei õnnestu ligi pääseda menüüle \"%s\", millele viitab WMRootMenu" |
26796 |
+msgstr "WMRootMenu poolt viidatud menüüle \"%s\" pole võimalik ligi pääseda" |
26797 |
|
26798 |
-#: ../src/rootmenu.c:1687 ../src/rootmenu.c:1763 |
26799 |
+#: ../src/rootmenu.c:1674 |
26800 |
+#, c-format |
26801 |
+msgid "" |
26802 |
+"using default menu file \"%s\" as the menu referenced in WMRootMenu could " |
26803 |
+"not be found " |
26804 |
+msgstr "" |
26805 |
+"WMRootMenu poolt viidatud vaikimisi kasutatavat menüüfaili \"%s\" pole " |
26806 |
+"võimalik leida" |
26807 |
+ |
26808 |
+#: ../src/rootmenu.c:1697 ../src/rootmenu.c:1773 |
26809 |
#, c-format |
26810 |
msgid "%s:format error in root menu configuration \"%s\"" |
26811 |
-msgstr "%s:vormingu viga juurmenüü häälestuses \"%s\"" |
26812 |
+msgstr "%s:vormingu viga juurmenüü seadistuses \"%s\"" |
26813 |
|
26814 |
-#: ../src/rootmenu.c:1851 |
26815 |
+#: ../src/rootmenu.c:1855 |
26816 |
msgid "" |
26817 |
"The applications menu could not be loaded. Look at the console output for a " |
26818 |
"detailed description of the errors." |
26819 |
msgstr "" |
26820 |
-"Ei õnnestu lugeda rakenduste menüüd. Põhjalikuma vigade kirjelduse " |
26821 |
+"Rakenduste menüüd pole võimalik lugeda. Põhjalikuma vigade kirjelduse " |
26822 |
"lugemiseks vaata konsooliväljundit." |
26823 |
|
26824 |
-#: ../src/screen.c:740 |
26825 |
+#: ../src/screen.c:709 |
26826 |
#, c-format |
26827 |
msgid "could not initialize graphics library context: %s" |
26828 |
-msgstr "ei õnnesta lähtestada graafikateegi konteksti: %s" |
26829 |
+msgstr "graafikateegi konteksti pole võimalik lähtestada: %s" |
26830 |
|
26831 |
-#: ../src/screen.c:771 |
26832 |
-msgid "could not do initialization of WINGs widget set" |
26833 |
-msgstr "" |
26834 |
+#: ../src/screen.c:737 |
26835 |
+msgid "could not initialize WINGs widget set" |
26836 |
+msgstr "WINGs vidinakomplekti pole võimalik lähtestada" |
26837 |
|
26838 |
-#: ../src/screen.c:1139 |
26839 |
+#: ../src/screen.c:1148 |
26840 |
#, c-format |
26841 |
msgid "could not save session state in %s" |
26842 |
-msgstr "ei õnnestu salvestada seansi olekut %s" |
26843 |
+msgstr "seansi olekut %s pole võimalik salvestada" |
26844 |
|
26845 |
-#: ../src/session.c:183 ../src/wdefaults.c:588 ../src/winspector.c:454 |
26846 |
+#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:459 |
26847 |
#, c-format |
26848 |
msgid "can't convert \"%s\" to boolean" |
26849 |
-msgstr "ei õnnestu \"%s\" teisendamine boolean väärtuseks" |
26850 |
+msgstr "väärtust \"%s\" pole võimalik tõeväärtuseks teisendada" |
26851 |
|
26852 |
-#: ../src/session.c:1021 |
26853 |
+#: ../src/session.c:1018 |
26854 |
msgid "out of memory while saving session state" |
26855 |
-msgstr "mälu lõppes seansi oleku salvestamise käigus" |
26856 |
+msgstr "seansi oleku salvestamise käigus lõppes mälu" |
26857 |
|
26858 |
-#: ../src/session.c:1104 |
26859 |
+#: ../src/session.c:1101 |
26860 |
msgid "end of memory while saving session state" |
26861 |
-msgstr "mälu lõpp seansi oleku salvestamise käigus" |
26862 |
+msgstr "seansi oleku salvestamise käigus lõppes mälu" |
26863 |
|
26864 |
#. This is not fatal but can mean the session manager exited. |
26865 |
#. * If the session manager exited normally we would get a |
26866 |
@@ -1368,156 +1339,87 @@ |
26867 |
#. * If the sm was the last client of session, then we'll die |
26868 |
#. * anyway, otherwise we can continue doing our stuff. |
26869 |
#. |
26870 |
-#: ../src/session.c:1242 |
26871 |
+#: ../src/session.c:1239 |
26872 |
msgid "connection to the session manager was lost" |
26873 |
msgstr "ühendus seansihalduriga on katkenud" |
26874 |
|
26875 |
-#: ../src/stacking.c:79 |
26876 |
+#: ../src/stacking.c:81 |
26877 |
msgid "could not get window list!!" |
26878 |
-msgstr "ei õnnestu saada akende nimekirja!!" |
26879 |
+msgstr "akende nimekirja pole võimalik saada!!" |
26880 |
|
26881 |
-#: ../src/startup.c:202 |
26882 |
+#: ../src/startup.c:194 |
26883 |
#, c-format |
26884 |
msgid "internal X error: %s\n" |
26885 |
msgstr "X'i sisemine viga: %s\n" |
26886 |
|
26887 |
-#: ../src/startup.c:260 |
26888 |
-#, c-format |
26889 |
-msgid "got signal %i (%s) - restarting\n" |
26890 |
-msgstr "sain signaali %i (%s) - stardin uuesti\n" |
26891 |
- |
26892 |
-#: ../src/startup.c:262 |
26893 |
-#, c-format |
26894 |
-msgid "got signal %i - restarting\n" |
26895 |
-msgstr "sain signaali %i - stardin uuesti\n" |
26896 |
- |
26897 |
-#: ../src/startup.c:272 |
26898 |
-#, c-format |
26899 |
-msgid "got signal %i (%s) - rereading defaults\n" |
26900 |
-msgstr "sain signaali %i (%s) - loen vaikeväärtused uuesti\n" |
26901 |
- |
26902 |
-#: ../src/startup.c:274 |
26903 |
-#, c-format |
26904 |
-msgid "got signal %i - rereading defaults\n" |
26905 |
-msgstr "sain signaali %i - loen vaikeväärtused uuesti\n" |
26906 |
- |
26907 |
-#: ../src/startup.c:284 |
26908 |
-#, c-format |
26909 |
-msgid "got signal %i (%s) - exiting...\n" |
26910 |
-msgstr "sain signaali %i (%s) - lõpetan...\n" |
26911 |
- |
26912 |
-#: ../src/startup.c:286 |
26913 |
-#, c-format |
26914 |
-msgid "got signal %i - exiting...\n" |
26915 |
-msgstr "sain signaali %i - lõpetan...\n" |
26916 |
- |
26917 |
-#: ../src/startup.c:329 |
26918 |
-#, c-format |
26919 |
-msgid "got signal %i (%s)\n" |
26920 |
-msgstr "sain signaali %i (%s)\n" |
26921 |
- |
26922 |
-#: ../src/startup.c:331 |
26923 |
-#, c-format |
26924 |
-msgid "got signal %i\n" |
26925 |
-msgstr "sain signaali %i\n" |
26926 |
- |
26927 |
-#: ../src/startup.c:342 |
26928 |
-msgid "" |
26929 |
-"crashed while trying to do some post-crash cleanup. Aborting immediatelly." |
26930 |
-msgstr "" |
26931 |
-"järjekordne avarii ajal, mil tehti avariijärgseid puhastusi. Katkestan " |
26932 |
-"viivitamatult." |
26933 |
- |
26934 |
-#. we try to restart Window Maker |
26935 |
-#: ../src/startup.c:407 |
26936 |
-msgid "trying to restart Window Maker..." |
26937 |
-msgstr "proovin taaskäivitada Window Maker'it..." |
26938 |
- |
26939 |
-#: ../src/startup.c:412 |
26940 |
-msgid "trying to start alternate window manager..." |
26941 |
-msgstr "proovin käivitada alternatiivset aknahaldurit" |
26942 |
- |
26943 |
-#: ../src/startup.c:417 |
26944 |
-msgid "failed to start alternate window manager. Aborting." |
26945 |
-msgstr "ei õnnestu käivitada alternatiivset aknahaldurit. Annan alla." |
26946 |
- |
26947 |
-#: ../src/startup.c:419 |
26948 |
-msgid "" |
26949 |
-"a fatal error has occured, probably due to a bug. Please fill the included " |
26950 |
-"BUGFORM and report it." |
26951 |
-msgstr "" |
26952 |
-"aset on leidnud fataalne viga, arvatavasti programmi viga. Palun täida " |
26953 |
-"programmiga kaasa tulnud vearaport (BUGFORM) ja saada see programmi " |
26954 |
-"autoritele." |
26955 |
- |
26956 |
-#: ../src/startup.c:895 |
26957 |
+#: ../src/startup.c:771 |
26958 |
#, c-format |
26959 |
msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" |
26960 |
msgstr "" |
26961 |
-"ikooni suuruseks on määratud %i, kuid see on liiga väike. Kasutan suurust " |
26962 |
-"16\n" |
26963 |
+"ikooni suuruseks on määratud %i, kuid see on liiga väike. Kasutatakse " |
26964 |
+"suurust 16\n" |
26965 |
|
26966 |
-#: ../src/startup.c:923 |
26967 |
+#: ../src/startup.c:800 |
26968 |
msgid "XKB is not supported. KbdModeLock is automatically disabled." |
26969 |
msgstr "Puudub XKB tugi. KbdModeLock on automaatselt keelatud." |
26970 |
|
26971 |
-#: ../src/startup.c:942 |
26972 |
+#: ../src/startup.c:819 |
26973 |
msgid "it seems that there is already a window manager running" |
26974 |
msgstr "paistab, et mingi aknahaldur juba töötab" |
26975 |
|
26976 |
-#: ../src/startup.c:948 |
26977 |
+#: ../src/startup.c:825 |
26978 |
#, c-format |
26979 |
msgid "could not manage screen %i" |
26980 |
-msgstr "ei õnnestu hallata ekraani %i" |
26981 |
+msgstr "ekraani %i pole võimalik hallata" |
26982 |
|
26983 |
-#: ../src/startup.c:1016 |
26984 |
+#: ../src/startup.c:884 |
26985 |
msgid "could not manage any screen" |
26986 |
-msgstr "ei õnnestu hallata ühtegi ekraani" |
26987 |
+msgstr "ühtegi ekraani pole võimalik hallata" |
26988 |
|
26989 |
-#: ../src/switchmenu.c:137 |
26990 |
+#: ../src/switchmenu.c:145 |
26991 |
msgid "Windows" |
26992 |
msgstr "Aknad" |
26993 |
|
26994 |
#: ../src/texture.c:329 ../src/texture.c:371 |
26995 |
#, c-format |
26996 |
msgid "image file \"%s\" used as texture could not be found." |
26997 |
-msgstr "ei õnnestu leida tekstuuriks kasutatavat pildifaili \"%s\"." |
26998 |
+msgstr "tekstuuriks kasutatavat pildifaili \"%s\" pole võimalik leida." |
26999 |
|
27000 |
#: ../src/texture.c:335 ../src/texture.c:377 |
27001 |
#, c-format |
27002 |
msgid "could not load texture pixmap \"%s\":%s" |
27003 |
-msgstr "ei õnnestu laadida tekstuuri pixmap faili \"%s\":%s" |
27004 |
+msgstr "tekstuuri pildifaili \"%s\" pole võimalik laadida:%s" |
27005 |
|
27006 |
#: ../src/texture.c:437 |
27007 |
#, c-format |
27008 |
msgid "library \"%s\" cound not be opened." |
27009 |
-msgstr "ei õnnestu avada teeki \"%s\"" |
27010 |
+msgstr "teeki \"%s\" pole võimalik avada." |
27011 |
|
27012 |
#: ../src/texture.c:446 |
27013 |
#, c-format |
27014 |
msgid "function \"%s\" not found in library \"%s\"" |
27015 |
-msgstr "ei leia funktsiooni \"%s\" teegist \"%s\"" |
27016 |
+msgstr "funktsiooni \"%s\" pole teegist \"%s\" võimalik leida" |
27017 |
|
27018 |
#: ../src/texture.c:453 |
27019 |
msgid "function textures not supported on this system, sorry." |
27020 |
-msgstr "tekstuurifunktsioon ei ole selles süsteemis toetatud." |
27021 |
+msgstr "tekstuurifunktsioon pole selles süsteemis toetatud. vabandust." |
27022 |
|
27023 |
#: ../src/texture.c:598 |
27024 |
msgid "could not allocate image buffer" |
27025 |
-msgstr "ei õnnestu eraldada pildi puhvrit" |
27026 |
+msgstr "pildipuhvrit pole võimalik eraldada" |
27027 |
|
27028 |
#: ../src/wdefaults.c:437 |
27029 |
#, c-format |
27030 |
msgid "could not find icon file \"%s\"" |
27031 |
-msgstr "ei õnnestu leida ikoonifaili \"%s\"" |
27032 |
+msgstr "ikoonifaili \"%s\" pole võimalik leida" |
27033 |
|
27034 |
-#: ../src/window.c:2884 ../src/window.c:3023 |
27035 |
+#: ../src/window.c:3041 ../src/window.c:3182 |
27036 |
msgid "" |
27037 |
"the NumLock, ScrollLock or similar key seems to be turned on.\n" |
27038 |
"Turn it off or some mouse actions and keyboard shortcuts will not work." |
27039 |
msgstr "" |
27040 |
"klahvid NumLock, ScrollLock (või sarnased) näivad olevat sisse lülitatud.\n" |
27041 |
-"Lülita need välja või muidu ei tööta mõned hiire toimingud ja klaviatuuri\n" |
27042 |
+"Lülita need välja või muidu ei tööta mõned hiiretoimingud ja klaviatuuri\n" |
27043 |
"kiirkorraldused." |
27044 |
|
27045 |
#: ../src/winmenu.c:125 |
27046 |
@@ -1528,24 +1430,37 @@ |
27047 |
msgstr "" |
27048 |
"Programm suletakse jõuga.\n" |
27049 |
"Kõik salvestamata andmed lähevad kaotsi.\n" |
27050 |
-"Kas soovite seda teha?" |
27051 |
+"Kas soovid seda teha?" |
27052 |
|
27053 |
-#: ../src/winmenu.c:267 ../src/winmenu.c:276 |
27054 |
+#: ../src/winmenu.c:268 ../src/winmenu.c:277 |
27055 |
msgid "Set Shortcut" |
27056 |
msgstr "Määra kiirkorraldus" |
27057 |
|
27058 |
-#: ../src/winmenu.c:354 ../src/winmenu.c:399 |
27059 |
+#: ../src/winmenu.c:355 ../src/winmenu.c:400 |
27060 |
msgid "could not create submenu for window menu" |
27061 |
msgstr "ei õnnestu luua aknamenüü alammenüüd" |
27062 |
|
27063 |
-#: ../src/winmenu.c:403 |
27064 |
+#: ../src/winmenu.c:404 |
27065 |
msgid "Keep on top" |
27066 |
msgstr "Hoia esiplaanil" |
27067 |
|
27068 |
-#: ../src/winmenu.c:408 |
27069 |
+#: ../src/winmenu.c:409 |
27070 |
msgid "Keep at bottom" |
27071 |
msgstr "Hoia tagaplaanil" |
27072 |
|
27073 |
+#. |
27074 |
+#. * Warning: If you make some change that affects the order of the |
27075 |
+#. * entries, you must update the command #defines in the top of |
27076 |
+#. * this file. |
27077 |
+#. |
27078 |
+#: ../src/winmenu.c:437 ../src/winmenu.c:571 |
27079 |
+msgid "Maximize" |
27080 |
+msgstr "Maksimeeri" |
27081 |
+ |
27082 |
+#: ../src/winmenu.c:445 ../src/winmenu.c:557 |
27083 |
+msgid "Miniaturize" |
27084 |
+msgstr "Minimeeri" |
27085 |
+ |
27086 |
#: ../src/winmenu.c:453 ../src/winmenu.c:588 |
27087 |
msgid "Shade" |
27088 |
msgstr "Keri kokku" |
27089 |
@@ -1558,6 +1473,10 @@ |
27090 |
msgid "Select" |
27091 |
msgstr "Vali" |
27092 |
|
27093 |
+#: ../src/winmenu.c:485 |
27094 |
+msgid "Move To" |
27095 |
+msgstr "Teisalda" |
27096 |
+ |
27097 |
#: ../src/winmenu.c:490 |
27098 |
msgid "Attributes..." |
27099 |
msgstr "Rekvisiidid..." |
27100 |
@@ -1566,89 +1485,97 @@ |
27101 |
msgid "Options" |
27102 |
msgstr "Valikud" |
27103 |
|
27104 |
+#: ../src/winmenu.c:552 |
27105 |
+msgid "Deminiaturize" |
27106 |
+msgstr "Ava aken" |
27107 |
+ |
27108 |
+#: ../src/winmenu.c:566 |
27109 |
+msgid "Unmaximize" |
27110 |
+msgstr "Taasta suurus" |
27111 |
+ |
27112 |
#: ../src/winmenu.c:583 |
27113 |
msgid "Unshade" |
27114 |
msgstr "Keri lahti" |
27115 |
|
27116 |
-#: ../src/winspector.c:387 |
27117 |
+#: ../src/winspector.c:392 |
27118 |
#, c-format |
27119 |
msgid "Could not find icon \"%s\" specified for this window" |
27120 |
-msgstr "Ei õnnestu leida selle akna jaoks määratud ikooni \"%s\"" |
27121 |
+msgstr "Selle akna jaoks määratud ikooni \"%s\" pole võimalik leida" |
27122 |
|
27123 |
-#: ../src/winspector.c:404 |
27124 |
+#: ../src/winspector.c:409 |
27125 |
#, c-format |
27126 |
msgid "Could not open specified icon \"%s\":%s" |
27127 |
-msgstr "Ei õnnestu avada kirjeldatud ikooni \"%s\":%s" |
27128 |
+msgstr "Kirjeldatud ikooni \"%s\" pole võimalik avada:%s" |
27129 |
|
27130 |
-#: ../src/winspector.c:1135 |
27131 |
+#: ../src/winspector.c:1129 |
27132 |
#, c-format |
27133 |
msgid "Inspecting %s.%s" |
27134 |
-msgstr "Vaatlen %s.%s" |
27135 |
+msgstr "%s.%s vaatlemine" |
27136 |
|
27137 |
-#: ../src/winspector.c:1161 |
27138 |
+#: ../src/winspector.c:1155 |
27139 |
msgid "Click in the window you wish to inspect." |
27140 |
msgstr "Kliki aknale, mida soovid vaadelda." |
27141 |
|
27142 |
-#: ../src/winspector.c:1200 |
27143 |
+#: ../src/winspector.c:1194 |
27144 |
msgid "" |
27145 |
"The configuration will apply to all\n" |
27146 |
"windows that have their WM_CLASS\n" |
27147 |
"property set to the above selected\n" |
27148 |
"name, when saved." |
27149 |
msgstr "" |
27150 |
-"Häälestuse salvestamisel laieneb see\n" |
27151 |
+"Seadistuste salvestamisel laieneb see\n" |
27152 |
"kõigile akendele, mille WM_CLASS\n" |
27153 |
"omadus on üks ülalloetletud nimedest." |
27154 |
|
27155 |
-#: ../src/winspector.c:1229 |
27156 |
+#: ../src/winspector.c:1223 |
27157 |
msgid "Save" |
27158 |
msgstr "Salvesta" |
27159 |
|
27160 |
-#: ../src/winspector.c:1237 |
27161 |
+#: ../src/winspector.c:1231 |
27162 |
msgid "Apply" |
27163 |
msgstr "Rakenda" |
27164 |
|
27165 |
-#: ../src/winspector.c:1243 |
27166 |
+#: ../src/winspector.c:1237 |
27167 |
msgid "Reload" |
27168 |
msgstr "Taasta" |
27169 |
|
27170 |
-#: ../src/winspector.c:1252 ../src/winspector.c:1262 |
27171 |
+#: ../src/winspector.c:1246 ../src/winspector.c:1256 |
27172 |
msgid "Window Specification" |
27173 |
msgstr "Akna kirjeldus" |
27174 |
|
27175 |
-#: ../src/winspector.c:1253 |
27176 |
+#: ../src/winspector.c:1247 |
27177 |
msgid "Window Attributes" |
27178 |
msgstr "Akna rekvisiidid" |
27179 |
|
27180 |
-#: ../src/winspector.c:1254 |
27181 |
+#: ../src/winspector.c:1248 |
27182 |
msgid "Advanced Options" |
27183 |
msgstr "Laiendatud valikud" |
27184 |
|
27185 |
-#: ../src/winspector.c:1255 |
27186 |
+#: ../src/winspector.c:1249 |
27187 |
msgid "Icon and Initial Workspace" |
27188 |
msgstr "Ikoon ja töölaud" |
27189 |
|
27190 |
-#: ../src/winspector.c:1256 |
27191 |
+#: ../src/winspector.c:1250 |
27192 |
msgid "Application Specific" |
27193 |
msgstr "Rakendusele omane" |
27194 |
|
27195 |
-#: ../src/winspector.c:1270 |
27196 |
+#: ../src/winspector.c:1264 |
27197 |
msgid "Defaults for all windows" |
27198 |
msgstr "Vaikimisi kõigile akendele" |
27199 |
|
27200 |
-#: ../src/winspector.c:1324 |
27201 |
+#: ../src/winspector.c:1318 |
27202 |
msgid "Select window" |
27203 |
msgstr "Vali aken" |
27204 |
|
27205 |
-#: ../src/winspector.c:1338 |
27206 |
+#: ../src/winspector.c:1332 |
27207 |
msgid "Attributes" |
27208 |
msgstr "Rekvisiidid" |
27209 |
|
27210 |
-#: ../src/winspector.c:1349 |
27211 |
+#: ../src/winspector.c:1343 |
27212 |
msgid "Disable titlebar" |
27213 |
msgstr "Tiitliriba peidus" |
27214 |
|
27215 |
-#: ../src/winspector.c:1351 |
27216 |
+#: ../src/winspector.c:1345 |
27217 |
msgid "" |
27218 |
"Remove the titlebar of this window.\n" |
27219 |
"To access the window commands menu of a window\n" |
27220 |
@@ -1656,298 +1583,304 @@ |
27221 |
"equivalent shortcut, if you changed the default\n" |
27222 |
"settings)." |
27223 |
msgstr "" |
27224 |
-"Eemaldab akna tiitliriba. Ilma tiitliribata\n" |
27225 |
-"akna parameetreid saab muuta,\n" |
27226 |
-"vajutadades Control+Esc (või kui\n" |
27227 |
-"kontrollklahve on muudetud, siis sellele\n" |
27228 |
+"Aknalt tiitliriba eemaldamine. Ilma\n" |
27229 |
+"tiitliribata akna parameetreid saab\n" |
27230 |
+"muuta,vajutadades Control+Esc (või kui\n" |
27231 |
+"juhtklahve on muudetud, siis sellele\n" |
27232 |
"vastavat klahvikombinatsiooni)." |
27233 |
|
27234 |
-#: ../src/winspector.c:1358 |
27235 |
+#: ../src/winspector.c:1352 |
27236 |
msgid "Disable resizebar" |
27237 |
msgstr "Suuruse muutmise riba peidus" |
27238 |
|
27239 |
-#: ../src/winspector.c:1360 |
27240 |
+#: ../src/winspector.c:1354 |
27241 |
msgid "Remove the resizebar of this window." |
27242 |
-msgstr "Eemaldab riba, mille abil muudetakse akna suurust." |
27243 |
+msgstr "Akna suuruse muutmise riba eemaldamine sellelt aknalt." |
27244 |
|
27245 |
-#: ../src/winspector.c:1363 |
27246 |
+#: ../src/winspector.c:1357 |
27247 |
msgid "Disable close button" |
27248 |
msgstr "Sulgemisnupp peidus" |
27249 |
|
27250 |
-#: ../src/winspector.c:1365 |
27251 |
+#: ../src/winspector.c:1359 |
27252 |
msgid "Remove the `close window' button of this window." |
27253 |
-msgstr "Eemaldab sulgemisnupu akna tiitliribalt." |
27254 |
+msgstr "Akna sulgemisnupu eemaldamine selle akna tiitliribalt." |
27255 |
|
27256 |
-#: ../src/winspector.c:1368 |
27257 |
+#: ../src/winspector.c:1362 |
27258 |
msgid "Disable miniaturize button" |
27259 |
msgstr "Minimeerimisnupp peidus" |
27260 |
|
27261 |
-#: ../src/winspector.c:1370 |
27262 |
+#: ../src/winspector.c:1364 |
27263 |
msgid "Remove the `miniaturize window' button of the window." |
27264 |
-msgstr "Eemaldab minimeerimisnupu akna tiitliribalt." |
27265 |
+msgstr "Akna minimeerimisnupu eemaldamine selle akna tiitliribalt." |
27266 |
|
27267 |
-#: ../src/winspector.c:1373 |
27268 |
+#: ../src/winspector.c:1367 |
27269 |
msgid "Disable border" |
27270 |
msgstr "Raam peidus" |
27271 |
|
27272 |
-#: ../src/winspector.c:1375 |
27273 |
+#: ../src/winspector.c:1369 |
27274 |
msgid "Remove the 1 pixel black border around the window." |
27275 |
-msgstr "Eemaldab akna ümbert ühepikslise musta raami." |
27276 |
+msgstr "Akna ümbert ühepikslise musta raami eemaldamine." |
27277 |
|
27278 |
-#: ../src/winspector.c:1378 |
27279 |
+#: ../src/winspector.c:1372 |
27280 |
msgid "Keep on top (floating)" |
27281 |
-msgstr "Hoia esiplaanil" |
27282 |
+msgstr "Hoitakse esiplaanil (ujuv)" |
27283 |
|
27284 |
-#: ../src/winspector.c:1380 |
27285 |
+#: ../src/winspector.c:1374 |
27286 |
msgid "" |
27287 |
"Keep the window over other windows, not allowing\n" |
27288 |
"them to cover it." |
27289 |
-msgstr "Hoiab akent teiste akende suhtes esiplaanil." |
27290 |
+msgstr "Akna hoidmine teiste akende peal." |
27291 |
|
27292 |
-#: ../src/winspector.c:1384 |
27293 |
+#: ../src/winspector.c:1378 |
27294 |
+#, fuzzy |
27295 |
msgid "Keep at bottom (sunken)" |
27296 |
-msgstr "Hoia tagaplaanil" |
27297 |
+msgstr "Hoitakse tagaplaanil" |
27298 |
|
27299 |
-#: ../src/winspector.c:1386 |
27300 |
+#: ../src/winspector.c:1380 |
27301 |
msgid "Keep the window under all other windows." |
27302 |
-msgstr "Hoiab akent kõigi teiste akende taga." |
27303 |
+msgstr "Akna hoidmine kõigi teiste akende taga." |
27304 |
|
27305 |
-#: ../src/winspector.c:1391 |
27306 |
+#: ../src/winspector.c:1385 |
27307 |
msgid "Make window present in all workspaces." |
27308 |
-msgstr "Näitab akent kõigil töölaudadel." |
27309 |
+msgstr "Aken on kõigil töölaudadel." |
27310 |
|
27311 |
-#: ../src/winspector.c:1394 |
27312 |
+#: ../src/winspector.c:1388 |
27313 |
msgid "Start miniaturized" |
27314 |
-msgstr "Käivita minimeerituna" |
27315 |
+msgstr "Käivitatakse minimeerituna" |
27316 |
|
27317 |
-#: ../src/winspector.c:1396 |
27318 |
+#: ../src/winspector.c:1390 |
27319 |
msgid "" |
27320 |
"Make the window be automatically miniaturized when it's\n" |
27321 |
"first shown." |
27322 |
-msgstr "Programmi käivitamise hetkel minimeerib akna." |
27323 |
+msgstr "" |
27324 |
+"Programmi esmasel näitamisel minimeeritakse\n" |
27325 |
+"aken automaatselt." |
27326 |
|
27327 |
-#: ../src/winspector.c:1400 |
27328 |
+#: ../src/winspector.c:1394 |
27329 |
msgid "Start maximized" |
27330 |
msgstr "Käivita maksimeerituna" |
27331 |
|
27332 |
-#: ../src/winspector.c:1402 |
27333 |
+#: ../src/winspector.c:1396 |
27334 |
msgid "" |
27335 |
"Make the window be automatically maximized when it's\n" |
27336 |
"first shown." |
27337 |
-msgstr "Programmi käivitamise hetkel maksimeerib akna." |
27338 |
+msgstr "" |
27339 |
+"Programmi esmasel näitamisel maksimeeritakse\n" |
27340 |
+"aken automaatselt." |
27341 |
|
27342 |
-#: ../src/winspector.c:1406 |
27343 |
+#: ../src/winspector.c:1400 |
27344 |
msgid "Full screen maximization" |
27345 |
-msgstr "Maksimeeri üle kogu ekraani" |
27346 |
+msgstr "Maksimeeritakse üle kogu ekraani" |
27347 |
|
27348 |
-#: ../src/winspector.c:1408 |
27349 |
+#: ../src/winspector.c:1402 |
27350 |
msgid "" |
27351 |
"Make the window use the whole screen space when it's\n" |
27352 |
"maximized. The titlebar and resizebar will be moved\n" |
27353 |
"to outside the screen." |
27354 |
msgstr "" |
27355 |
-"Lubab akent maksimeerida kogu ekraani ulatuses.\n" |
27356 |
-"Kui lubatud, siis akna maksimeerimise korral\n" |
27357 |
-"jäävad akna tiitliriba ja suuruse muutmise riba\n" |
27358 |
-"väljapoole ekraani piirkonda." |
27359 |
+"Akent lubatakse suurendada kogu ekraani ulatuses.\n" |
27360 |
+"Akna tiitliriba ja suuruse muutmise riba jäävad\n" |
27361 |
+"siis väljaspoole ekraani piirkonda." |
27362 |
|
27363 |
-#: ../src/winspector.c:1425 |
27364 |
+#: ../src/winspector.c:1419 |
27365 |
msgid "Advanced" |
27366 |
msgstr "Laiendatud võimalused" |
27367 |
|
27368 |
-#: ../src/winspector.c:1442 |
27369 |
+#: ../src/winspector.c:1436 |
27370 |
msgid "Do not bind keyboard shortcuts" |
27371 |
msgstr "Kiirklahvidele ei reageerita" |
27372 |
|
27373 |
-#: ../src/winspector.c:1444 |
27374 |
+#: ../src/winspector.c:1438 |
27375 |
msgid "" |
27376 |
"Do not bind keyboard shortcuts from Window Maker\n" |
27377 |
"when this window is focused. This will allow the\n" |
27378 |
"window to receive all key combinations regardless\n" |
27379 |
"of your shortcut configuration." |
27380 |
msgstr "" |
27381 |
-"Keelab fookuses oleval aknal reageerimase\n" |
27382 |
+"Fookuses oleval aknal keelatakse reageerimast\n" |
27383 |
"Window Maker'i kiirklahvidele. See võimaldab\n" |
27384 |
"aknal vastu võtta kõiki klaviatuurilt tulevaid\n" |
27385 |
"koode." |
27386 |
|
27387 |
-#: ../src/winspector.c:1450 |
27388 |
+#: ../src/winspector.c:1444 |
27389 |
msgid "Do not bind mouse clicks" |
27390 |
msgstr "Hiirevajutustele ei reageerita" |
27391 |
|
27392 |
-#: ../src/winspector.c:1452 |
27393 |
+#: ../src/winspector.c:1446 |
27394 |
msgid "" |
27395 |
"Do not bind mouse actions, such as `Alt'+drag\n" |
27396 |
-"in the window (when alt is the modifier you haveconfigured)." |
27397 |
+"in the window (when alt is the modifier you have\n" |
27398 |
+"configured)." |
27399 |
msgstr "" |
27400 |
-"Keelab aknal reageerimast hiiretoimingutele.\n" |
27401 |
+"Aknal keelatakse reageerimast hiiretoimingutele.\n" |
27402 |
"Näiteks `Alt'+lohistamine (kui alt on määratud\n" |
27403 |
"muuteklahviks)." |
27404 |
|
27405 |
-#: ../src/winspector.c:1457 |
27406 |
+#: ../src/winspector.c:1451 |
27407 |
msgid "Do not show in the window list" |
27408 |
msgstr "Akende nimekirjas ei näidata" |
27409 |
|
27410 |
-#: ../src/winspector.c:1459 |
27411 |
+#: ../src/winspector.c:1453 |
27412 |
msgid "Do not list the window in the window list menu." |
27413 |
-msgstr "Keelab akna nime näitamise akende nimekirjas." |
27414 |
+msgstr "Akna nime ei näidata akende nimekirjas." |
27415 |
|
27416 |
-#: ../src/winspector.c:1462 |
27417 |
+#: ../src/winspector.c:1456 |
27418 |
msgid "Do not let it take focus" |
27419 |
msgstr "Akna fokuseerimine keelatud" |
27420 |
|
27421 |
-#: ../src/winspector.c:1464 |
27422 |
+#: ../src/winspector.c:1458 |
27423 |
msgid "" |
27424 |
"Do not let the window take keyboard focus when you\n" |
27425 |
"click on it." |
27426 |
msgstr "" |
27427 |
-"Keelab akna fokuseerimise. Aknale ei\n" |
27428 |
+"Akna fokuseerimine on keelatud. Aknale ei\n" |
27429 |
"mõju klaviatuurilt saabuvad vajutused." |
27430 |
|
27431 |
-#: ../src/winspector.c:1468 |
27432 |
+#: ../src/winspector.c:1462 |
27433 |
msgid "Keep inside screen" |
27434 |
msgstr "Hoia ekraani sees" |
27435 |
|
27436 |
-#: ../src/winspector.c:1470 |
27437 |
+#: ../src/winspector.c:1464 |
27438 |
msgid "" |
27439 |
"Do not allow the window to move itself completely\n" |
27440 |
"outside the screen. For bug compatibility.\n" |
27441 |
msgstr "" |
27442 |
-"Keelab akna liigutamise\n" |
27443 |
-"väljapoole ekraani pinda.\n" |
27444 |
+"Aknent ei saa liigutada\n" |
27445 |
+"väljaspoole ekraani pinda.\n" |
27446 |
|
27447 |
-#: ../src/winspector.c:1474 |
27448 |
+#: ../src/winspector.c:1468 |
27449 |
msgid "Ignore 'Hide Others'" |
27450 |
-msgstr "Eira käsku 'Peida teised aknad'" |
27451 |
+msgstr "Käsu 'Peida teised aknad' eiramine" |
27452 |
|
27453 |
-#: ../src/winspector.c:1476 |
27454 |
+#: ../src/winspector.c:1470 |
27455 |
msgid "" |
27456 |
"Do not hide the window when issuing the\n" |
27457 |
"`HideOthers' command." |
27458 |
msgstr "" |
27459 |
-"Keelab reageerimise käsule\n" |
27460 |
-"\"Peida teised aknad\"." |
27461 |
+"Akent ei peideta käsu\n" |
27462 |
+"\"Peida teised aknad\" puhul." |
27463 |
|
27464 |
-#: ../src/winspector.c:1480 |
27465 |
+#: ../src/winspector.c:1474 |
27466 |
msgid "Ignore 'Save Session'" |
27467 |
-msgstr "Eira seansi salvestamist" |
27468 |
+msgstr "Seansi salvestamist eiratakse" |
27469 |
|
27470 |
-#: ../src/winspector.c:1482 |
27471 |
+#: ../src/winspector.c:1476 |
27472 |
msgid "" |
27473 |
"Do not save the associated application in the\n" |
27474 |
"session's state, so that it won't be restarted\n" |
27475 |
"together with other applications when Window Maker\n" |
27476 |
"starts." |
27477 |
msgstr "" |
27478 |
-"Keelab akna andmete salvestamise seansi\n" |
27479 |
-"andmetesse. Rakendust ei käivitata koos\n" |
27480 |
-"seansi koosseisu kuuluvate akendega." |
27481 |
+"Akna andmeid ei salvestata seansi\n" |
27482 |
+"andmetesse ja seetõttu ei käivitata\n" |
27483 |
+"rakendust koos seansi koosseisu\n" |
27484 |
+"kuuluvate akendega." |
27485 |
|
27486 |
-#: ../src/winspector.c:1488 |
27487 |
+#: ../src/winspector.c:1482 |
27488 |
msgid "Emulate application icon" |
27489 |
-msgstr "Emuleeri rakenduse ikooni" |
27490 |
+msgstr "Rakenduse ikooni emuleeritakse" |
27491 |
|
27492 |
-#: ../src/winspector.c:1490 |
27493 |
+#: ../src/winspector.c:1484 |
27494 |
msgid "" |
27495 |
"Make this window act as an application that provides\n" |
27496 |
"enough information to Window Maker for a dockable\n" |
27497 |
"application icon to be created." |
27498 |
-msgstr "Loob aknale dokitava rakenduse ikooni." |
27499 |
+msgstr "" |
27500 |
+"Aknale luuakse dokitava rakenduse ikoon, mille alusel\n" |
27501 |
+"Window Maker on suuteline looma rakenduse ikooni." |
27502 |
|
27503 |
-#: ../src/winspector.c:1496 |
27504 |
+#: ../src/winspector.c:1490 |
27505 |
msgid "Disable language button" |
27506 |
msgstr "Keelenupp peidus" |
27507 |
|
27508 |
-#: ../src/winspector.c:1498 |
27509 |
+#: ../src/winspector.c:1492 |
27510 |
msgid "Remove the `toggle language' button of the window." |
27511 |
msgstr "" |
27512 |
-"Eemaldab keele sisse- ja väljalülitamise\n" |
27513 |
-"nupu akna tiitliribalt." |
27514 |
+"Keele sisse- ja väljalülitamise\n" |
27515 |
+"nupp on akna tiitliribalt eemaldatud." |
27516 |
|
27517 |
-#: ../src/winspector.c:1515 |
27518 |
+#: ../src/winspector.c:1509 |
27519 |
msgid "Miniwindow Image" |
27520 |
msgstr "Pisiakna pilt" |
27521 |
|
27522 |
-#: ../src/winspector.c:1542 |
27523 |
+#: ../src/winspector.c:1536 |
27524 |
msgid "Icon filename:" |
27525 |
msgstr "Ikoonifaili nimi:" |
27526 |
|
27527 |
-#: ../src/winspector.c:1555 |
27528 |
+#: ../src/winspector.c:1549 |
27529 |
msgid "Ignore client supplied icon" |
27530 |
-msgstr "Eira kliendi enda ikooni" |
27531 |
+msgstr "Kliendi enda ikooni eiramine" |
27532 |
|
27533 |
-#: ../src/winspector.c:1562 |
27534 |
+#: ../src/winspector.c:1556 |
27535 |
msgid "Initial Workspace" |
27536 |
msgstr "Töölaud, millel käivitatakse" |
27537 |
|
27538 |
-#: ../src/winspector.c:1564 |
27539 |
+#: ../src/winspector.c:1558 |
27540 |
msgid "The workspace to place the window when it'sfirst shown." |
27541 |
msgstr "Töölaua nimi, mille peal akent esimest korda näidatakse." |
27542 |
|
27543 |
-#: ../src/winspector.c:1570 |
27544 |
+#: ../src/winspector.c:1564 |
27545 |
msgid "Nowhere in particular" |
27546 |
msgstr "Ei oma tähtsust" |
27547 |
|
27548 |
-#: ../src/winspector.c:1588 |
27549 |
+#: ../src/winspector.c:1582 |
27550 |
msgid "Application Attributes" |
27551 |
msgstr "Rakenduse rekvisiidid" |
27552 |
|
27553 |
-#: ../src/winspector.c:1599 |
27554 |
+#: ../src/winspector.c:1593 |
27555 |
msgid "Start hidden" |
27556 |
msgstr "Käivita peidetuna" |
27557 |
|
27558 |
-#: ../src/winspector.c:1601 |
27559 |
+#: ../src/winspector.c:1595 |
27560 |
msgid "Automatically hide application when it's started." |
27561 |
-msgstr "Peidab akna programmi käivitamise hetkel." |
27562 |
+msgstr "Akna peitmine rakenduse käivitamise hetkel." |
27563 |
|
27564 |
-#: ../src/winspector.c:1604 |
27565 |
+#: ../src/winspector.c:1598 |
27566 |
msgid "No application icon" |
27567 |
msgstr "Rakenduse ikoon peidus" |
27568 |
|
27569 |
-#: ../src/winspector.c:1606 |
27570 |
+#: ../src/winspector.c:1600 |
27571 |
msgid "" |
27572 |
"Disable the application icon for the application.\n" |
27573 |
"Note that you won't be able to dock it anymore,\n" |
27574 |
"and any icons that are already docked will stop\n" |
27575 |
"working correctly." |
27576 |
msgstr "" |
27577 |
-"Keelab rakenduse ikooni. Keelamise korral ei ole\n" |
27578 |
-"võimalik rakendust dokkida ja kõik selle rakenduse\n" |
27579 |
-"juba dokitud ikoonid ei toimi enam korrektselt." |
27580 |
+"Rakenduse ikooni keelamine. Sel juhul pole\n" |
27581 |
+"rakendust võimalik dokkida ja kõik selle\n" |
27582 |
+"rakenduse juba dokitud ikoonid ei toimi enam\n" |
27583 |
+"korrektselt." |
27584 |
|
27585 |
-#: ../src/winspector.c:1612 |
27586 |
+#: ../src/winspector.c:1606 |
27587 |
msgid "Shared application icon" |
27588 |
msgstr "Rakenduse ikoon jagatud" |
27589 |
|
27590 |
-#: ../src/winspector.c:1614 |
27591 |
+#: ../src/winspector.c:1608 |
27592 |
msgid "" |
27593 |
"Use a single shared application icon for all of\n" |
27594 |
"the instances of this application.\n" |
27595 |
msgstr "" |
27596 |
-"Kasutab ühte jagatud ikooni kõigi\n" |
27597 |
+"Ãhe jagatud ikooni kasutamine kõigi\n" |
27598 |
"rakenduse instantside jaoks.\n" |
27599 |
|
27600 |
-#: ../src/wmspec.c:277 |
27601 |
-msgid "out of memory while updating wm hints" |
27602 |
-msgstr "mälu lõppes wm vihjete uuendamise käigus" |
27603 |
- |
27604 |
-#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:876 |
27605 |
+#: ../src/workspace.c:103 ../src/workspace.c:104 ../src/workspace.c:1302 |
27606 |
#, c-format |
27607 |
msgid "Workspace %i" |
27608 |
msgstr "Töölaud %i" |
27609 |
|
27610 |
-#: ../src/workspace.c:926 |
27611 |
+#: ../src/workspace.c:1352 |
27612 |
msgid "Workspaces" |
27613 |
msgstr "Töölauad" |
27614 |
|
27615 |
-#: ../src/workspace.c:928 |
27616 |
+#: ../src/workspace.c:1354 |
27617 |
msgid "could not create Workspace menu" |
27618 |
-msgstr "ei õnnestu luua töölaua menüüd" |
27619 |
+msgstr "töölaua menüüd pole võimalik luua" |
27620 |
|
27621 |
-#: ../src/workspace.c:935 |
27622 |
+#: ../src/workspace.c:1361 |
27623 |
msgid "New" |
27624 |
msgstr "Uus" |
27625 |
|
27626 |
-#: ../src/workspace.c:936 |
27627 |
+#: ../src/workspace.c:1362 |
27628 |
msgid "Destroy Last" |
27629 |
msgstr "Eemalda viimane" |
27630 |
+ |
27631 |
diff -uhrN WindowMaker-0.92.0/src/actions.c WindowMaker-CVS-20060123/src/actions.c |
27632 |
--- WindowMaker-0.92.0/src/actions.c 2005-07-03 19:25:14.000000000 +0200 |
27633 |
+++ WindowMaker-CVS-20060123/src/actions.c 2005-08-23 01:23:41.000000000 +0200 |
27634 |
@@ -365,7 +365,8 @@ |
27635 |
void |
27636 |
wMaximizeWindow(WWindow *wwin, int directions) |
27637 |
{ |
27638 |
- int new_width, new_height, new_x, new_y; |
27639 |
+ int new_x, new_y; |
27640 |
+ unsigned int new_width, new_height; |
27641 |
int changed_h, changed_v, shrink_h, shrink_v; |
27642 |
WArea usableArea, totalArea; |
27643 |
|
27644 |
diff -uhrN WindowMaker-0.92.0/src/event.c WindowMaker-CVS-20060123/src/event.c |
27645 |
--- WindowMaker-0.92.0/src/event.c 2005-03-13 01:13:55.000000000 +0100 |
27646 |
+++ WindowMaker-CVS-20060123/src/event.c 2005-12-07 20:22:09.000000000 +0100 |
27647 |
@@ -559,6 +559,10 @@ |
27648 |
wwin->flags.skip_next_animation = 1; |
27649 |
wIconifyWindow(wwin); |
27650 |
} |
27651 |
+ if (wwin->flags.fullscreen) { |
27652 |
+ wwin->flags.fullscreen = 0; |
27653 |
+ wFullscreenWindow(wwin); |
27654 |
+ } |
27655 |
if (wwin->flags.hidden) { |
27656 |
WApplication *wapp = wApplicationOf(wwin->main_window); |
27657 |
|
27658 |
diff -uhrN WindowMaker-0.92.0/src/icon.c WindowMaker-CVS-20060123/src/icon.c |
27659 |
--- WindowMaker-0.92.0/src/icon.c 2005-03-11 23:27:58.000000000 +0100 |
27660 |
+++ WindowMaker-CVS-20060123/src/icon.c 2005-08-23 00:18:46.000000000 +0200 |
27661 |
@@ -651,7 +651,7 @@ |
27662 |
if (icon->icon_win!=None) { |
27663 |
XWindowAttributes attr; |
27664 |
int resize=0; |
27665 |
- int width, height, depth; |
27666 |
+ unsigned int width, height, depth; |
27667 |
int theight; |
27668 |
Pixmap pixmap; |
27669 |
|
27670 |
diff -uhrN WindowMaker-0.92.0/src/misc.c WindowMaker-CVS-20060123/src/misc.c |
27671 |
--- WindowMaker-0.92.0/src/misc.c 2004-11-11 14:31:47.000000000 +0100 |
27672 |
+++ WindowMaker-CVS-20060123/src/misc.c 2005-08-23 00:46:24.000000000 +0200 |
27673 |
@@ -1128,7 +1128,7 @@ |
27674 |
void |
27675 |
SendHelperMessage(WScreen *scr, char type, int workspace, char *msg) |
27676 |
{ |
27677 |
- unsigned char *buffer; |
27678 |
+ char *buffer; |
27679 |
int len; |
27680 |
int i; |
27681 |
char buf[16]; |
27682 |
diff -uhrN WindowMaker-0.92.0/src/moveres.c WindowMaker-CVS-20060123/src/moveres.c |
27683 |
--- WindowMaker-0.92.0/src/moveres.c 2004-10-24 21:36:09.000000000 +0200 |
27684 |
+++ WindowMaker-CVS-20060123/src/moveres.c 2005-08-23 01:27:24.000000000 +0200 |
27685 |
@@ -1471,7 +1471,7 @@ |
27686 |
|
27687 |
ww=w;wh=h; |
27688 |
wh-=vert_border; |
27689 |
- wWindowConstrainSize(wwin, &ww, &wh); |
27690 |
+ wWindowConstrainSize(wwin, (unsigned int*)&ww, (unsigned int*)&wh); |
27691 |
wh+=vert_border; |
27692 |
|
27693 |
if (wPreferences.ws_cycle){ |
27694 |
@@ -2070,7 +2070,7 @@ |
27695 |
rh += dh; |
27696 |
fw = rw; |
27697 |
fh = rh - vert_border; |
27698 |
- wWindowConstrainSize(wwin, &fw, &fh); |
27699 |
+ wWindowConstrainSize(wwin, (unsigned int*)&fw, (unsigned int*)&fh); |
27700 |
fh += vert_border; |
27701 |
if (res & LEFT) |
27702 |
fx = rx2 - fw + 1; |
27703 |
diff -uhrN WindowMaker-0.92.0/src/properties.c WindowMaker-CVS-20060123/src/properties.c |
27704 |
--- WindowMaker-0.92.0/src/properties.c 2004-10-14 23:11:52.000000000 +0200 |
27705 |
+++ WindowMaker-CVS-20060123/src/properties.c 2005-08-23 00:19:58.000000000 +0200 |
27706 |
@@ -234,8 +234,8 @@ |
27707 |
if (image->format == RRGBAFormat) { |
27708 |
memcpy(&tmp[4], image->data, image->width*image->height*4); |
27709 |
} else { |
27710 |
- char *ptr = tmp+4; |
27711 |
- char *src = image->data; |
27712 |
+ char *ptr = (char*)(tmp+4); |
27713 |
+ char *src = (char*)image->data; |
27714 |
|
27715 |
for (y = 0; y < image->height; y++) { |
27716 |
for (x = 0; x < image->width; x++) { |
27717 |
diff -uhrN WindowMaker-0.92.0/src/startup.c WindowMaker-CVS-20060123/src/startup.c |
27718 |
--- WindowMaker-0.92.0/src/startup.c 2005-03-12 02:11:30.000000000 +0100 |
27719 |
+++ WindowMaker-CVS-20060123/src/startup.c 2005-08-23 00:20:16.000000000 +0200 |
27720 |
@@ -25,6 +25,7 @@ |
27721 |
#include <stdio.h> |
27722 |
#include <stdlib.h> |
27723 |
#include <unistd.h> |
27724 |
+#include <string.h> |
27725 |
#include <errno.h> |
27726 |
#include <signal.h> |
27727 |
#include <sys/wait.h> |
27728 |
diff -uhrN WindowMaker-0.92.0/src/switchpanel.c WindowMaker-CVS-20060123/src/switchpanel.c |
27729 |
--- WindowMaker-0.92.0/src/switchpanel.c 2004-10-30 09:16:04.000000000 +0200 |
27730 |
+++ WindowMaker-CVS-20060123/src/switchpanel.c 2006-01-22 19:08:39.000000000 +0100 |
27731 |
@@ -501,6 +501,7 @@ |
27732 |
|
27733 |
if (!panel->bg) { |
27734 |
WMFrame *frame = WMCreateFrame(panel->win); |
27735 |
+ WMColor *darkGray = WMDarkGrayColor(scr->wmscreen); |
27736 |
WMSetFrameRelief(frame, WRSimple); |
27737 |
WMSetViewExpandsToParent(WMWidgetView(frame), 0, 0, 0, 0); |
27738 |
|
27739 |
@@ -508,10 +509,11 @@ |
27740 |
WMResizeWidget(panel->label, width, LABEL_HEIGHT); |
27741 |
WMMoveWidget(panel->label, BORDER_SPACE, BORDER_SPACE+ICON_TILE_SIZE+5); |
27742 |
WMSetLabelRelief(panel->label, WRSimple); |
27743 |
- WMSetWidgetBackgroundColor(panel->label, WMDarkGrayColor(scr->wmscreen)); |
27744 |
+ WMSetWidgetBackgroundColor(panel->label, darkGray); |
27745 |
WMSetLabelFont(panel->label, panel->font); |
27746 |
WMSetLabelTextColor(panel->label, panel->white); |
27747 |
|
27748 |
+ WMReleaseColor(darkGray); |
27749 |
height+= 5; |
27750 |
} |
27751 |
|
27752 |
@@ -604,6 +606,8 @@ |
27753 |
RReleaseImage(panel->bg); |
27754 |
if (panel->font) |
27755 |
WMReleaseFont(panel->font); |
27756 |
+ if (panel->white) |
27757 |
+ WMReleaseColor(panel->white); |
27758 |
wfree(panel); |
27759 |
} |
27760 |
|
27761 |
diff -uhrN WindowMaker-0.92.0/src/window.c WindowMaker-CVS-20060123/src/window.c |
27762 |
--- WindowMaker-0.92.0/src/window.c 2005-07-01 02:56:11.000000000 +0200 |
27763 |
+++ WindowMaker-CVS-20060123/src/window.c 2005-08-23 01:20:14.000000000 +0200 |
27764 |
@@ -2043,10 +2043,10 @@ |
27765 |
*---------------------------------------------------------------------- |
27766 |
*/ |
27767 |
void |
27768 |
-wWindowConstrainSize(WWindow *wwin, int *nwidth, int *nheight) |
27769 |
+wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nheight) |
27770 |
{ |
27771 |
- int width = *nwidth; |
27772 |
- int height = *nheight; |
27773 |
+ int width = (int)*nwidth; |
27774 |
+ int height = (int)*nheight; |
27775 |
int winc = 1; |
27776 |
int hinc = 1; |
27777 |
int minW = 1, minH = 1; |
27778 |
@@ -2143,8 +2143,8 @@ |
27779 |
|
27780 |
|
27781 |
void |
27782 |
-wWindowCropSize(WWindow *wwin, int maxW, int maxH, |
27783 |
- int *width, int *height) |
27784 |
+wWindowCropSize(WWindow *wwin, unsigned int maxW, unsigned int maxH, |
27785 |
+ unsigned int *width, unsigned int *height) |
27786 |
{ |
27787 |
int baseW = 0, baseH = 0; |
27788 |
int winc = 1, hinc = 1; |
27789 |
diff -uhrN WindowMaker-0.92.0/src/window.h WindowMaker-CVS-20060123/src/window.h |
27790 |
--- WindowMaker-0.92.0/src/window.h 2005-07-01 02:05:43.000000000 +0200 |
27791 |
+++ WindowMaker-CVS-20060123/src/window.h 2005-08-23 01:20:31.000000000 +0200 |
27792 |
@@ -388,9 +388,9 @@ |
27793 |
void wWindowUnfocus(WWindow *wwin); |
27794 |
|
27795 |
void wWindowUpdateName(WWindow *wwin, char *newTitle); |
27796 |
-void wWindowConstrainSize(WWindow *wwin, int *nwidth, int *nheight); |
27797 |
-void wWindowCropSize(WWindow *wwin, int maxw, int maxh, |
27798 |
- int *nwidth, int *nheight); |
27799 |
+void wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nheight); |
27800 |
+void wWindowCropSize(WWindow *wwin, unsigned int maxw, unsigned int maxh, |
27801 |
+ unsigned int *nwidth, unsigned int *nheight); |
27802 |
void wWindowConfigure(WWindow *wwin, int req_x, int req_y, |
27803 |
int req_width, int req_height); |
27804 |
|
27805 |
diff -uhrN WindowMaker-0.92.0/src/wmspec.c WindowMaker-CVS-20060123/src/wmspec.c |
27806 |
--- WindowMaker-0.92.0/src/wmspec.c 2005-05-15 18:41:09.000000000 +0200 |
27807 |
+++ WindowMaker-CVS-20060123/src/wmspec.c 2006-01-22 18:28:21.000000000 +0100 |
27808 |
@@ -35,6 +35,7 @@ |
27809 |
|
27810 |
#include <X11/Xlib.h> |
27811 |
#include <X11/Xatom.h> |
27812 |
+#include <X11/Xarch.h> |
27813 |
#include <string.h> |
27814 |
|
27815 |
#include "WindowMaker.h" |
27816 |
@@ -70,22 +71,22 @@ |
27817 |
static Atom net_current_desktop; |
27818 |
static Atom net_desktop_names; |
27819 |
static Atom net_active_window; |
27820 |
-static Atom net_workarea; /* XXX: not xinerama compatible */ |
27821 |
+static Atom net_workarea; /* XXX: not xinerama compatible */ |
27822 |
static Atom net_supporting_wm_check; |
27823 |
-static Atom net_virtual_roots; /* N/A */ |
27824 |
-static Atom net_desktop_layout; /* XXX */ |
27825 |
+static Atom net_virtual_roots; /* N/A */ |
27826 |
+static Atom net_desktop_layout; /* XXX */ |
27827 |
static Atom net_showing_desktop; |
27828 |
|
27829 |
/* Other Root Window Messages */ |
27830 |
static Atom net_close_window; |
27831 |
-static Atom net_moveresize_window; /* TODO */ |
27832 |
-static Atom net_wm_moveresize; /* TODO */ |
27833 |
+static Atom net_moveresize_window; /* TODO */ |
27834 |
+static Atom net_wm_moveresize; /* TODO */ |
27835 |
|
27836 |
/* Application Window Properties */ |
27837 |
static Atom net_wm_name; |
27838 |
-static Atom net_wm_visible_name; /* TODO (unnecessary?) */ |
27839 |
+static Atom net_wm_visible_name; /* TODO (unnecessary?) */ |
27840 |
static Atom net_wm_icon_name; |
27841 |
-static Atom net_wm_visible_icon_name; /* TODO (unnecessary?) */ |
27842 |
+static Atom net_wm_visible_icon_name; /* TODO (unnecessary?) */ |
27843 |
static Atom net_wm_desktop; |
27844 |
static Atom net_wm_window_type; |
27845 |
static Atom net_wm_window_type_desktop; |
27846 |
@@ -97,7 +98,7 @@ |
27847 |
static Atom net_wm_window_type_dialog; |
27848 |
static Atom net_wm_window_type_normal; |
27849 |
static Atom net_wm_state; |
27850 |
-static Atom net_wm_state_modal; /* XXX: what is this?!? */ |
27851 |
+static Atom net_wm_state_modal; /* XXX: what is this?!? */ |
27852 |
static Atom net_wm_state_sticky; |
27853 |
static Atom net_wm_state_maximized_vert; |
27854 |
static Atom net_wm_state_maximized_horz; |
27855 |
@@ -119,15 +120,15 @@ |
27856 |
static Atom net_wm_action_fullscreen; |
27857 |
static Atom net_wm_action_change_desktop; |
27858 |
static Atom net_wm_action_close; |
27859 |
-static Atom net_wm_strut; /* XXX: see net_workarea */ |
27860 |
-static Atom net_wm_strut_partial; /* TODO: doesn't really fit into the current strut scheme */ |
27861 |
-static Atom net_wm_icon_geometry; /* FIXME: should work together with net_wm_handled_icons, gnome-panel-2.2.0.1 doesn't use _NET_WM_HANDLED_ICONS, thus present situation. */ |
27862 |
+static Atom net_wm_strut; /* XXX: see net_workarea */ |
27863 |
+static Atom net_wm_strut_partial; /* TODO: doesn't really fit into the current strut scheme */ |
27864 |
+static Atom net_wm_icon_geometry; /* FIXME: should work together with net_wm_handled_icons, gnome-panel-2.2.0.1 doesn't use _NET_WM_HANDLED_ICONS, thus present situation. */ |
27865 |
static Atom net_wm_icon; |
27866 |
-static Atom net_wm_pid; /* TODO */ |
27867 |
-static Atom net_wm_handled_icons; /* FIXME: see net_wm_icon_geometry */ |
27868 |
+static Atom net_wm_pid; /* TODO */ |
27869 |
+static Atom net_wm_handled_icons; /* FIXME: see net_wm_icon_geometry */ |
27870 |
|
27871 |
/* Window Manager Protocols */ |
27872 |
-static Atom net_wm_ping; /* TODO */ |
27873 |
+static Atom net_wm_ping; /* TODO */ |
27874 |
|
27875 |
static Atom utf8_string; |
27876 |
|
27877 |
@@ -322,15 +323,15 @@ |
27878 |
void |
27879 |
wNETWMUpdateDesktop(WScreen *scr) |
27880 |
{ |
27881 |
- CARD32 *views, sizes[2]; |
27882 |
+ long *views, sizes[2]; |
27883 |
int count, i; |
27884 |
|
27885 |
if (scr->workspace_count==0) |
27886 |
return; |
27887 |
|
27888 |
count = scr->workspace_count * 2; |
27889 |
- views = wmalloc(sizeof(CARD32) * count); |
27890 |
- /*memset(views, 0, sizeof(CARD32) * count);*/ |
27891 |
+ views = wmalloc(sizeof(long) * count); |
27892 |
+ /*memset(views, 0, sizeof(long) * count);*/ |
27893 |
|
27894 |
#ifdef VIRTUAL_DESKTOP |
27895 |
sizes[0] = scr->workspaces[scr->current_workspace]->width; |
27896 |
@@ -370,7 +371,7 @@ |
27897 |
0, 1, &count); |
27898 |
if (prop) |
27899 |
{ |
27900 |
- int desktop= *(CARD32*)prop; |
27901 |
+ int desktop= *(long*)prop; |
27902 |
XFree(prop); |
27903 |
return desktop; |
27904 |
} |
27905 |
@@ -389,12 +390,12 @@ |
27906 |
* |
27907 |
* The logic can also be changed to accept bigger images and scale them down. |
27908 |
*/ |
27909 |
-static CARD32* |
27910 |
-findBestIcon(CARD32 *data, unsigned long items) |
27911 |
+static unsigned long* |
27912 |
+findBestIcon(unsigned long *data, unsigned long items) |
27913 |
{ |
27914 |
int size, wanted, d, distance; |
27915 |
unsigned long i; |
27916 |
- CARD32 *icon; |
27917 |
+ unsigned long *icon; |
27918 |
|
27919 |
/* better use only 75% of icon_size. For 64x64 this means 48x48 |
27920 |
* This leaves room around the icon for the miniwindow title and |
27921 |
@@ -418,12 +419,12 @@ |
27922 |
|
27923 |
|
27924 |
static RImage* |
27925 |
-makeRImageFromARGBData(CARD32 *data) |
27926 |
+makeRImageFromARGBData(unsigned long *data) |
27927 |
{ |
27928 |
int size, width, height, i; |
27929 |
RImage *image; |
27930 |
unsigned char *imgdata; |
27931 |
- CARD32 pixel; |
27932 |
+ unsigned long pixel; |
27933 |
|
27934 |
width = data[0]; |
27935 |
height = data[1]; |
27936 |
@@ -436,10 +437,18 @@ |
27937 |
|
27938 |
for (imgdata=image->data, i=2; i<size+2; i++, imgdata+=4) { |
27939 |
pixel = data[i]; |
27940 |
+#if BYTE_ORDER == BIG_ENDIAN |
27941 |
+ imgdata[2] = (pixel >> 24) & 0xff; /* A */ |
27942 |
+ imgdata[1] = (pixel >> 16) & 0xff; /* R */ |
27943 |
+ imgdata[0] = (pixel >> 8) & 0xff; /* G */ |
27944 |
+ imgdata[3] = (pixel >> 0) & 0xff; /* B */ |
27945 |
+#else /* Little endian */ |
27946 |
imgdata[3] = (pixel >> 24) & 0xff; /* A */ |
27947 |
imgdata[0] = (pixel >> 16) & 0xff; /* R */ |
27948 |
imgdata[1] = (pixel >> 8) & 0xff; /* G */ |
27949 |
imgdata[2] = (pixel >> 0) & 0xff; /* B */ |
27950 |
+#endif /* endianness */ |
27951 |
+ |
27952 |
} |
27953 |
|
27954 |
return image; |
27955 |
@@ -449,7 +458,7 @@ |
27956 |
static void |
27957 |
updateIconImage(WScreen *scr, WWindow *wwin) |
27958 |
{ |
27959 |
- CARD32 *property, *data; |
27960 |
+ unsigned long *property, *data; |
27961 |
unsigned long items, rest; |
27962 |
Atom type; |
27963 |
int format; |
27964 |
@@ -487,7 +496,7 @@ |
27965 |
static void |
27966 |
updateShowDesktop(WScreen * scr, Bool show) |
27967 |
{ |
27968 |
- CARD32 foo; |
27969 |
+ long foo; |
27970 |
|
27971 |
foo = (show == True); |
27972 |
XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32, |
27973 |
@@ -660,7 +669,7 @@ |
27974 |
void |
27975 |
wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea) |
27976 |
{ |
27977 |
- CARD32 *area; |
27978 |
+ long *area; |
27979 |
int count, i; |
27980 |
|
27981 |
/* XXX: not Xinerama compatible, |
27982 |
@@ -670,7 +679,7 @@ |
27983 |
return; |
27984 |
|
27985 |
count = scr->workspace_count * 4; |
27986 |
- area = wmalloc(sizeof(CARD32) * count); |
27987 |
+ area = wmalloc(sizeof(long) * count); |
27988 |
for (i=0; i<scr->workspace_count; i++) { |
27989 |
area[4*i + 0] = usableArea.x1; |
27990 |
area[4*i + 1] = usableArea.y1; |
27991 |
@@ -793,7 +802,7 @@ |
27992 |
static void |
27993 |
updateWorkspaceCount(WScreen *scr) /* changeable */ |
27994 |
{ |
27995 |
- CARD32 count; |
27996 |
+ long count; |
27997 |
|
27998 |
count = scr->workspace_count; |
27999 |
|
28000 |
@@ -805,7 +814,7 @@ |
28001 |
static void |
28002 |
updateCurrentWorkspace(WScreen *scr) /* changeable */ |
28003 |
{ |
28004 |
- CARD32 count; |
28005 |
+ long count; |
28006 |
|
28007 |
count = scr->current_workspace; |
28008 |
|
28009 |
@@ -852,7 +861,7 @@ |
28010 |
static void |
28011 |
updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del) |
28012 |
{ |
28013 |
- CARD32 l; |
28014 |
+ long l; |
28015 |
|
28016 |
if (del) { |
28017 |
XDeleteProperty(dpy, wwin->client_win, net_wm_desktop); |
28018 |
diff -uhrN WindowMaker-0.92.0/test/wtest.c WindowMaker-CVS-20060123/test/wtest.c |
28019 |
--- WindowMaker-0.92.0/test/wtest.c 2004-10-12 23:03:04.000000000 +0200 |
28020 |
+++ WindowMaker-CVS-20060123/test/wtest.c 2005-08-23 00:40:15.000000000 +0200 |
28021 |
@@ -15,11 +15,11 @@ |
28022 |
#include <X11/Xproto.h> |
28023 |
#include <WMaker.h> |
28024 |
|
28025 |
-static unsigned char bits[] = { |
28026 |
+static char bits[] = { |
28027 |
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, |
28028 |
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; |
28029 |
|
28030 |
-static unsigned char mbits[] = { |
28031 |
+static char mbits[] = { |
28032 |
0xff, 0x03, 0xff, 0x01, 0xff, 0x00, 0x7f, 0x00, 0x3f, 0x00, 0x1f, 0x00, |
28033 |
0x0f, 0x00, 0x07, 0x00, 0x03, 0x00, 0x01, 0x00}; |
28034 |
|
28035 |
diff -uhrN WindowMaker-0.92.0/util/wmsetbg.c WindowMaker-CVS-20060123/util/wmsetbg.c |
28036 |
--- WindowMaker-0.92.0/util/wmsetbg.c 2004-10-27 05:01:38.000000000 +0200 |
28037 |
+++ WindowMaker-CVS-20060123/util/wmsetbg.c 2005-08-23 00:49:29.000000000 +0200 |
28038 |
@@ -787,7 +787,7 @@ |
28039 |
freeTexture(BackgroundTexture *texture) |
28040 |
{ |
28041 |
if (texture->solid) { |
28042 |
- long pixel[1]; |
28043 |
+ unsigned long pixel[1]; |
28044 |
|
28045 |
pixel[0] = texture->color.pixel; |
28046 |
/* dont free black/white pixels */ |
28047 |
@@ -966,7 +966,7 @@ |
28048 |
|
28049 |
|
28050 |
int |
28051 |
-readmsg(int fd, unsigned char *buffer, int size) |
28052 |
+readmsg(int fd, char *buffer, int size) |
28053 |
{ |
28054 |
int count; |
28055 |
|
28056 |
@@ -998,7 +998,7 @@ |
28057 |
{ |
28058 |
BackgroundTexture *textures[WORKSPACE_COUNT]; |
28059 |
int maxTextures = 0; |
28060 |
- unsigned char buffer[2048], buf[8]; |
28061 |
+ char buffer[2048], buf[8]; |
28062 |
int size; |
28063 |
int errcount = 4; |
28064 |
|
28065 |
diff -uhrN WindowMaker-0.92.0/WINGs/ChangeLog WindowMaker-CVS-20060123/WINGs/ChangeLog |
28066 |
--- WindowMaker-0.92.0/WINGs/ChangeLog 2004-10-23 04:21:59.000000000 +0200 |
28067 |
+++ WindowMaker-CVS-20060123/WINGs/ChangeLog 2006-01-22 21:33:00.000000000 +0100 |
28068 |
@@ -1,3 +1,17 @@ |
28069 |
+Changes since wmaker 0.92.0: |
28070 |
+............................ |
28071 |
+ |
28072 |
+- updated the XDND code in to work with GDK based applications. |
28073 |
+ WINGs based applications should now work with both KDE and GNOME |
28074 |
+ applications (Sylvain Reynal <sreynal@×××××.net>) |
28075 |
+- better check for the XDND protocol version when interoperating with other |
28076 |
+ applications. As it seems xdnd version 3 (which WINGs supports) and newer |
28077 |
+ are not backward compatible with xdnd version 1 and 2. This is why WINGs |
28078 |
+ applications cannot interoperate with GNUstep applications (which uses |
28079 |
+ xdnd version 2). Xdnd version 4 and 5 are backwards compatible with |
28080 |
+ version 3 though. (Sylvain Reynal <sreynal@×××××.net>) |
28081 |
+ |
28082 |
+ |
28083 |
Changes since wmaker 0.80.1: |
28084 |
............................ |
28085 |
|
28086 |
diff -uhrN WindowMaker-0.92.0/WINGs/connection.c WindowMaker-CVS-20060123/WINGs/connection.c |
28087 |
--- WindowMaker-0.92.0/WINGs/connection.c 2004-10-23 04:46:36.000000000 +0200 |
28088 |
+++ WindowMaker-CVS-20060123/WINGs/connection.c 2005-08-23 00:10:49.000000000 +0200 |
28089 |
@@ -201,7 +201,7 @@ |
28090 |
|
28091 |
if (cPtr->state == WCInProgress) { |
28092 |
Bool failed; |
28093 |
- int len = sizeof(result); |
28094 |
+ socklen_t len = sizeof(result); |
28095 |
|
28096 |
WCErrorCode = 0; |
28097 |
if (getsockopt(cPtr->sock, SOL_SOCKET, SO_ERROR, |
28098 |
@@ -462,8 +462,8 @@ |
28099 |
{ |
28100 |
WMConnection *cPtr; |
28101 |
struct sockaddr_in *socketaddr; |
28102 |
+ socklen_t size; |
28103 |
int sock, on; |
28104 |
- int size; |
28105 |
|
28106 |
WCErrorCode = 0; |
28107 |
|
28108 |
@@ -678,7 +678,7 @@ |
28109 |
WMAcceptConnection(WMConnection *listener) |
28110 |
{ |
28111 |
struct sockaddr_in clientname; |
28112 |
- int size; |
28113 |
+ socklen_t size; |
28114 |
int newSock; |
28115 |
WMConnection *newConnection; |
28116 |
|
28117 |
diff -uhrN WindowMaker-0.92.0/WINGs/dragcommon.c WindowMaker-CVS-20060123/WINGs/dragcommon.c |
28118 |
--- WindowMaker-0.92.0/WINGs/dragcommon.c 2004-10-28 11:25:23.000000000 +0200 |
28119 |
+++ WindowMaker-CVS-20060123/WINGs/dragcommon.c 2006-01-22 21:15:43.000000000 +0100 |
28120 |
@@ -2,11 +2,9 @@ |
28121 |
|
28122 |
#include "WINGsP.h" |
28123 |
|
28124 |
-#define VERSION_INFO(dragInfo) dragInfo->protocolVersion |
28125 |
+#define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion |
28126 |
#define XDND_DEST_INFO(dragInfo) dragInfo->destInfo |
28127 |
#define XDND_DEST_VIEW(dragInfo) dragInfo->destInfo->destView |
28128 |
-#define XDND_DEST_VIEW_STORED(dragInfo) ((dragInfo->destInfo) != NULL)\ |
28129 |
- && ((dragInfo->destInfo->destView) != NULL) |
28130 |
|
28131 |
|
28132 |
static Bool _WindowExists; |
28133 |
@@ -151,6 +149,13 @@ |
28134 |
{ |
28135 |
XEvent ev; |
28136 |
|
28137 |
+#ifdef XDND_DEBUG |
28138 |
+ char* msgName = XGetAtomName(dpy, message); |
28139 |
+ |
28140 |
+ printf("sending message %s ... ", msgName); |
28141 |
+ XFree(msgName); |
28142 |
+#endif |
28143 |
+ |
28144 |
if (! windowExists(dpy, win)) { |
28145 |
wwarning("xdnd message target %d does no longer exist.", win); |
28146 |
return False; /* message not sent */ |
28147 |
@@ -170,6 +175,9 @@ |
28148 |
XSendEvent(dpy, win, False, 0, &ev); |
28149 |
XFlush(dpy); |
28150 |
|
28151 |
+#ifdef XDND_DEBUG |
28152 |
+ printf("sent\n"); |
28153 |
+#endif |
28154 |
return True; /* message sent */ |
28155 |
} |
28156 |
|
28157 |
@@ -178,7 +186,9 @@ |
28158 |
handleLeaveMessage(WMDraggingInfo *info) |
28159 |
{ |
28160 |
if (XDND_DEST_INFO(info) != NULL) { |
28161 |
- if (XDND_DEST_VIEW(info) != NULL) { |
28162 |
+ /* XDND_DEST_VIEW is never NULL (it's the xdnd aware view) */ |
28163 |
+ wassertr(XDND_DEST_VIEW(info) != NULL); |
28164 |
+ if (XDND_DEST_VIEW(info)->dragDestinationProcs != NULL) { |
28165 |
XDND_DEST_VIEW(info)->dragDestinationProcs->concludeDragOperation( |
28166 |
XDND_DEST_VIEW(info)); |
28167 |
} |
28168 |
@@ -216,11 +226,15 @@ |
28169 |
|
28170 |
/* Messages from source to destination */ |
28171 |
if (messageType == scr->xdndEnterAtom) { |
28172 |
+ Bool positionSent = (XDND_DEST_INFO(info) != NULL); |
28173 |
+ |
28174 |
W_DragDestinationStopTimer(); |
28175 |
W_DragDestinationStoreEnterMsgInfo(info, toplevel, event); |
28176 |
|
28177 |
- if (VERSION_INFO(info) <= XDND_VERSION) { |
28178 |
- if (XDND_DEST_VIEW_STORED(info)) { |
28179 |
+ /* Xdnd version 3 and up are not compatible with version 1 or 2 */ |
28180 |
+ if (XDND_SOURCE_VERSION(info) > 2) { |
28181 |
+ |
28182 |
+ if (positionSent) { |
28183 |
/* xdndPosition previously received on xdnd aware view */ |
28184 |
W_DragDestinationStateHandler(info, event); |
28185 |
return; |
28186 |
@@ -230,7 +244,7 @@ |
28187 |
} |
28188 |
} else { |
28189 |
wwarning("received dnd enter msg with unsupported version %i", |
28190 |
- VERSION_INFO(info)); |
28191 |
+ XDND_SOURCE_VERSION(info)); |
28192 |
W_DragDestinationCancelDropOnEnter(toplevel, info); |
28193 |
return; |
28194 |
} |
28195 |
diff -uhrN WindowMaker-0.92.0/WINGs/dragdestination.c WindowMaker-CVS-20060123/WINGs/dragdestination.c |
28196 |
--- WindowMaker-0.92.0/WINGs/dragdestination.c 2004-10-28 11:25:36.000000000 +0200 |
28197 |
+++ WindowMaker-CVS-20060123/WINGs/dragdestination.c 2006-01-22 21:19:18.000000000 +0100 |
28198 |
@@ -5,15 +5,16 @@ |
28199 |
|
28200 |
#define XDND_SOURCE_RESPONSE_MAX_DELAY 3000 |
28201 |
|
28202 |
-#define VERSION_INFO(dragInfo) dragInfo->protocolVersion |
28203 |
- |
28204 |
#define XDND_PROPERTY_FORMAT 32 |
28205 |
#define XDND_ACTION_DESCRIPTION_FORMAT 8 |
28206 |
|
28207 |
+#define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion |
28208 |
#define XDND_DEST_INFO(dragInfo) dragInfo->destInfo |
28209 |
+#define XDND_AWARE_VIEW(dragInfo) dragInfo->destInfo->xdndAwareView |
28210 |
#define XDND_SOURCE_WIN(dragInfo) dragInfo->destInfo->sourceWindow |
28211 |
#define XDND_DEST_VIEW(dragInfo) dragInfo->destInfo->destView |
28212 |
#define XDND_DEST_STATE(dragInfo) dragInfo->destInfo->state |
28213 |
+#define XDND_SOURCE_ACTION_CHANGED(dragInfo) dragInfo->destInfo->sourceActionChanged |
28214 |
#define XDND_SOURCE_TYPES(dragInfo) dragInfo->destInfo->sourceTypes |
28215 |
#define XDND_TYPE_LIST_AVAILABLE(dragInfo) dragInfo->destInfo->typeListAvailable |
28216 |
#define XDND_REQUIRED_TYPES(dragInfo) dragInfo->destInfo->requiredTypes |
28217 |
@@ -22,8 +23,8 @@ |
28218 |
#define XDND_SOURCE_OPERATIONS(dragInfo) dragInfo->destInfo->sourceOperations |
28219 |
#define XDND_DROP_DATAS(dragInfo) dragInfo->destInfo->dropDatas |
28220 |
#define XDND_DROP_DATA_COUNT(dragInfo) dragInfo->destInfo->dropDataCount |
28221 |
-#define XDND_DEST_VIEW_STORED(dragInfo) ((dragInfo->destInfo) != NULL)\ |
28222 |
- && ((dragInfo->destInfo->destView) != NULL) |
28223 |
+#define XDND_DEST_VIEW_IS_REGISTERED(dragInfo) ((dragInfo->destInfo) != NULL)\ |
28224 |
+ && ((dragInfo->destInfo->destView->dragDestinationProcs) != NULL) |
28225 |
|
28226 |
|
28227 |
static unsigned char XDNDversion = XDND_VERSION; |
28228 |
@@ -81,7 +82,6 @@ |
28229 |
static WMArray* |
28230 |
getTypesFromTypeList(WMScreen *scr, Window sourceWin) |
28231 |
{ |
28232 |
- /* // WMDraggingInfo *info = &scr->dragInfo;*/ |
28233 |
Atom dataType; |
28234 |
Atom* typeAtomList; |
28235 |
WMArray* typeList; |
28236 |
@@ -138,22 +138,29 @@ |
28237 |
WMScreen *scr = W_VIEW_SCREEN(destView); |
28238 |
WMArray *requiredTypes; |
28239 |
|
28240 |
- /* First, see if the 3 source types are enough for dest requirements */ |
28241 |
+ /* First, see if the stored source types are enough for dest requirements */ |
28242 |
requiredTypes = destView->dragDestinationProcs->requiredDataTypes( |
28243 |
destView, |
28244 |
W_ActionToOperation(scr, XDND_SOURCE_ACTION(info)), |
28245 |
XDND_SOURCE_TYPES(info)); |
28246 |
|
28247 |
if (requiredTypes == NULL && XDND_TYPE_LIST_AVAILABLE(info)) { |
28248 |
- /* None of the 3 source types fits, get the whole type list */ |
28249 |
+ /* None of the stored source types fits, but the whole type list |
28250 |
+ hasn't been retrieved yet. */ |
28251 |
+ WMFreeArray(XDND_SOURCE_TYPES(info)); |
28252 |
+ XDND_SOURCE_TYPES(info) = getTypesFromTypeList( |
28253 |
+ scr, |
28254 |
+ XDND_SOURCE_WIN(info)); |
28255 |
+ /* Don't retrieve the type list again */ |
28256 |
+ XDND_TYPE_LIST_AVAILABLE(info) = False; |
28257 |
+ |
28258 |
requiredTypes = |
28259 |
destView->dragDestinationProcs->requiredDataTypes( |
28260 |
destView, |
28261 |
W_ActionToOperation(scr, XDND_SOURCE_ACTION(info)), |
28262 |
- getTypesFromTypeList(scr, XDND_SOURCE_WIN(info))); |
28263 |
+ XDND_SOURCE_TYPES(info)); |
28264 |
} |
28265 |
|
28266 |
- |
28267 |
XDND_REQUIRED_TYPES(info) = requiredTypes; |
28268 |
} |
28269 |
|
28270 |
@@ -219,7 +226,7 @@ |
28271 |
} |
28272 |
|
28273 |
operationArray = WMCreateDragOperationArray(count); |
28274 |
- description = descriptionList; |
28275 |
+ description = (char*)descriptionList; |
28276 |
|
28277 |
for (i=0; count > 0; i++) { |
28278 |
size = strlen(description); |
28279 |
@@ -249,47 +256,35 @@ |
28280 |
} |
28281 |
|
28282 |
|
28283 |
-static Window |
28284 |
-findChildInWindow(Display *dpy, Window toplevel, int x, int y) |
28285 |
+static WMView* |
28286 |
+findChildInView(WMView* parent, int x, int y) |
28287 |
{ |
28288 |
- Window foo, bar; |
28289 |
- Window *children; |
28290 |
- unsigned nchildren; |
28291 |
- int i; |
28292 |
+ if (parent->childrenList == NULL) |
28293 |
+ return parent; |
28294 |
+ else { |
28295 |
+ WMView* child = parent->childrenList; |
28296 |
|
28297 |
- if (!XQueryTree(dpy, toplevel, &foo, &bar, |
28298 |
- &children, &nchildren) || children == NULL) { |
28299 |
- return None; |
28300 |
- } |
28301 |
- |
28302 |
- /* first window that contains the point is the one */ |
28303 |
- for (i = nchildren-1; i >= 0; i--) { |
28304 |
- XWindowAttributes attr; |
28305 |
- |
28306 |
- if (XGetWindowAttributes(dpy, children[i], &attr) |
28307 |
- && attr.map_state == IsViewable |
28308 |
- && x >= attr.x && y >= attr.y |
28309 |
- && x < attr.x + attr.width && y < attr.y + attr.height) { |
28310 |
- Window child, tmp; |
28311 |
- |
28312 |
- tmp = children[i]; |
28313 |
- child = findChildInWindow(dpy, tmp, x - attr.x, y - attr.y); |
28314 |
- XFree(children); |
28315 |
- |
28316 |
- if (child == None) |
28317 |
- return tmp; |
28318 |
- else |
28319 |
- return child; |
28320 |
- } |
28321 |
+ while (child != NULL |
28322 |
+ && (! child->flags.mapped |
28323 |
+ || x < WMGetViewPosition(child).x |
28324 |
+ || x > WMGetViewPosition(child).x + WMGetViewSize(child).width |
28325 |
+ || y < WMGetViewPosition(child).y |
28326 |
+ || y > WMGetViewPosition(child).y + WMGetViewSize(child).height)) |
28327 |
+ |
28328 |
+ child = child->nextSister; |
28329 |
+ |
28330 |
+ if (child == NULL) |
28331 |
+ return parent; |
28332 |
+ else |
28333 |
+ return findChildInView(child, |
28334 |
+ x - WMGetViewPosition(child).x, |
28335 |
+ y - WMGetViewPosition(child).y); |
28336 |
} |
28337 |
- |
28338 |
- XFree(children); |
28339 |
- return None; |
28340 |
} |
28341 |
|
28342 |
|
28343 |
static WMView* |
28344 |
-findXdndViewInToplevel(WMView* toplevel, int x, int y) |
28345 |
+findDestinationViewInToplevel(WMView* toplevel, int x, int y) |
28346 |
{ |
28347 |
WMScreen *scr = W_VIEW_SCREEN(toplevel); |
28348 |
Window toplevelWin = WMViewXID(toplevel); |
28349 |
@@ -300,20 +295,7 @@ |
28350 |
XTranslateCoordinates(scr->display, scr->rootWin, toplevelWin, |
28351 |
x, y, &xInToplevel, &yInToplevel, |
28352 |
&foo); |
28353 |
- |
28354 |
- child = findChildInWindow(scr->display, toplevelWin, |
28355 |
- xInToplevel, yInToplevel); |
28356 |
- |
28357 |
- if (child != None) { |
28358 |
- childView = W_GetViewForXWindow(scr->display, child); |
28359 |
- |
28360 |
- /* if childView supports Xdnd, return childView */ |
28361 |
- if (childView != NULL |
28362 |
- && childView->dragDestinationProcs != NULL) |
28363 |
- return childView; |
28364 |
- } |
28365 |
- |
28366 |
- return NULL; |
28367 |
+ return findChildInView(toplevel, xInToplevel, yInToplevel); |
28368 |
} |
28369 |
|
28370 |
|
28371 |
@@ -334,6 +316,7 @@ |
28372 |
XDND_REQUIRED_TYPES(info) = NULL; |
28373 |
} |
28374 |
|
28375 |
+ |
28376 |
void |
28377 |
W_DragDestinationInfoClear(WMDraggingInfo *info) |
28378 |
{ |
28379 |
@@ -347,15 +330,19 @@ |
28380 |
} |
28381 |
} |
28382 |
|
28383 |
+ |
28384 |
static void |
28385 |
-initDestinationDragInfo(WMDraggingInfo *info) |
28386 |
+initDestinationDragInfo(WMDraggingInfo *info, WMView *destView) |
28387 |
{ |
28388 |
+ wassertr(destView != NULL); |
28389 |
+ |
28390 |
XDND_DEST_INFO(info) = |
28391 |
(W_DragDestinationInfo*) wmalloc(sizeof(W_DragDestinationInfo)); |
28392 |
|
28393 |
XDND_DEST_STATE(info) = idleState; |
28394 |
- XDND_DEST_VIEW(info) = NULL; |
28395 |
+ XDND_DEST_VIEW(info) = destView; |
28396 |
|
28397 |
+ XDND_SOURCE_ACTION_CHANGED(info) = False; |
28398 |
XDND_SOURCE_TYPES(info) = NULL; |
28399 |
XDND_REQUIRED_TYPES(info) = NULL; |
28400 |
XDND_DROP_DATAS(info) = NULL; |
28401 |
@@ -369,13 +356,19 @@ |
28402 |
WMScreen *scr = W_VIEW_SCREEN(toplevel); |
28403 |
|
28404 |
if (XDND_DEST_INFO(info) == NULL) |
28405 |
- initDestinationDragInfo(info); |
28406 |
+ initDestinationDragInfo(info, toplevel); |
28407 |
|
28408 |
+ XDND_SOURCE_VERSION(info) = (event->data.l[1] >> 24); |
28409 |
+ XDND_AWARE_VIEW(info) = toplevel; |
28410 |
updateSourceWindow(info, event); |
28411 |
|
28412 |
- /* store xdnd version for source */ |
28413 |
- info->protocolVersion = (event->data.l[1] >> 24); |
28414 |
- |
28415 |
+/* |
28416 |
+ if (event->data.l[1] & 1) |
28417 |
+ /* XdndTypeList property is available */ |
28418 |
+/* XDND_SOURCE_TYPES(info) = getTypesFromTypeList(scr, XDND_SOURCE_WIN(info)); |
28419 |
+ else |
28420 |
+ XDND_SOURCE_TYPES(info) = getTypesFromThreeTypes(scr, event); |
28421 |
+*/ |
28422 |
XDND_SOURCE_TYPES(info) = getTypesFromThreeTypes(scr, event); |
28423 |
|
28424 |
/* to use if the 3 types are not enough */ |
28425 |
@@ -383,45 +376,30 @@ |
28426 |
} |
28427 |
|
28428 |
|
28429 |
-static void |
28430 |
-cancelDrop(WMView *destView, WMDraggingInfo *info); |
28431 |
- |
28432 |
-static void |
28433 |
-suspendDropAuthorization(WMView *destView, WMDraggingInfo *info); |
28434 |
- |
28435 |
- |
28436 |
void |
28437 |
- W_DragDestinationStorePositionMsgInfo(WMDraggingInfo *info, |
28438 |
- WMView *toplevel, XClientMessageEvent *event) |
28439 |
+W_DragDestinationStorePositionMsgInfo(WMDraggingInfo *info, |
28440 |
+ WMView *toplevel, XClientMessageEvent *event) |
28441 |
{ |
28442 |
int x = event->data.l[2] >> 16; |
28443 |
int y = event->data.l[2] & 0xffff; |
28444 |
- WMView *oldDestView; |
28445 |
WMView *newDestView; |
28446 |
|
28447 |
- newDestView = findXdndViewInToplevel(toplevel, x, y); |
28448 |
+ newDestView = findDestinationViewInToplevel(toplevel, x, y); |
28449 |
|
28450 |
if (XDND_DEST_INFO(info) == NULL) { |
28451 |
- initDestinationDragInfo(info); |
28452 |
+ initDestinationDragInfo(info, newDestView); |
28453 |
+ XDND_AWARE_VIEW(info) = toplevel; |
28454 |
updateSourceWindow(info, event); |
28455 |
- XDND_DEST_VIEW(info) = newDestView; |
28456 |
- } |
28457 |
- else { |
28458 |
- oldDestView = XDND_DEST_VIEW(info); |
28459 |
- |
28460 |
- if (newDestView != oldDestView) { |
28461 |
- if (oldDestView != NULL) { |
28462 |
- suspendDropAuthorization(oldDestView, info); |
28463 |
- XDND_DEST_STATE(info) = dropNotAllowedState; |
28464 |
- } |
28465 |
- |
28466 |
+ } else { |
28467 |
+ if (newDestView != XDND_DEST_VIEW(info)) { |
28468 |
updateSourceWindow(info, event); |
28469 |
XDND_DEST_VIEW(info) = newDestView; |
28470 |
+ XDND_SOURCE_ACTION_CHANGED(info) = False; |
28471 |
|
28472 |
- if (newDestView != NULL) { |
28473 |
- if (XDND_DEST_STATE(info) != waitEnterState) |
28474 |
- XDND_DEST_STATE(info) = idleState; |
28475 |
- } |
28476 |
+ if (XDND_DEST_STATE(info) != waitEnterState) |
28477 |
+ XDND_DEST_STATE(info) = idleState; |
28478 |
+ } else { |
28479 |
+ XDND_SOURCE_ACTION_CHANGED(info) = (XDND_SOURCE_ACTION(info) != event->data.l[4]); |
28480 |
} |
28481 |
} |
28482 |
|
28483 |
@@ -437,27 +415,62 @@ |
28484 |
|
28485 |
/* send a DnD message to the source window */ |
28486 |
static void |
28487 |
-sendDnDClientMessage(WMView *destView, Atom message, |
28488 |
+sendDnDClientMessage(WMDraggingInfo *info, Atom message, |
28489 |
unsigned long data1, |
28490 |
unsigned long data2, |
28491 |
unsigned long data3, |
28492 |
unsigned long data4) |
28493 |
{ |
28494 |
- WMScreen *scr = W_VIEW_SCREEN(destView); |
28495 |
- WMDraggingInfo *info = &scr->dragInfo; |
28496 |
+ if (! W_SendDnDClientMessage(W_VIEW_SCREEN(XDND_AWARE_VIEW(info))->display, |
28497 |
+ XDND_SOURCE_WIN(info), |
28498 |
+ message, |
28499 |
+ WMViewXID(XDND_AWARE_VIEW(info)), |
28500 |
+ data1, |
28501 |
+ data2, |
28502 |
+ data3, |
28503 |
+ data4)) { |
28504 |
+ /* drop failed */ |
28505 |
+ W_DragDestinationInfoClear(info); |
28506 |
+ } |
28507 |
+} |
28508 |
|
28509 |
- if (XDND_DEST_INFO(info) != NULL) { |
28510 |
- if (! W_SendDnDClientMessage(scr->display, |
28511 |
- XDND_SOURCE_WIN(info), |
28512 |
- message, |
28513 |
- WMViewXID(destView), |
28514 |
- data1, |
28515 |
- data2, |
28516 |
- data3, |
28517 |
- data4)) { |
28518 |
- /* drop failed */ |
28519 |
- W_DragDestinationInfoClear(info); |
28520 |
- } |
28521 |
+ |
28522 |
+/* send a xdndStatus message to the source, with position and size |
28523 |
+ of the destination if it has no subwidget (requesting a position message |
28524 |
+ on every move otherwise) */ |
28525 |
+static void |
28526 |
+sendStatusMessage(WMView *destView, WMDraggingInfo *info, Atom action) |
28527 |
+{ |
28528 |
+ unsigned long data1; |
28529 |
+ |
28530 |
+ data1 = (action == None) ? 0 : 1; |
28531 |
+ |
28532 |
+ if (destView->childrenList == NULL) { |
28533 |
+ WMScreen *scr = W_VIEW_SCREEN(destView); |
28534 |
+ int destX, destY; |
28535 |
+ WMSize destSize = WMGetViewSize(destView); |
28536 |
+ Window foo; |
28537 |
+ |
28538 |
+ XTranslateCoordinates(scr->display, WMViewXID(destView), scr->rootWin, |
28539 |
+ 0, 0, &destX, &destY, |
28540 |
+ &foo); |
28541 |
+ |
28542 |
+ sendDnDClientMessage(info, |
28543 |
+ W_VIEW_SCREEN(destView)->xdndStatusAtom, |
28544 |
+ data1, |
28545 |
+ (destX << 16)|destY, |
28546 |
+ (destSize.width << 16)|destSize.height, |
28547 |
+ action); |
28548 |
+ } else { |
28549 |
+ /* set bit 1 to request explicitly position message on every move */ |
28550 |
+ data1 = data1 | 2; |
28551 |
+ |
28552 |
+ sendDnDClientMessage(info, |
28553 |
+ W_VIEW_SCREEN(destView)->xdndStatusAtom, |
28554 |
+ data1, |
28555 |
+ 0, |
28556 |
+ 0, |
28557 |
+ action); |
28558 |
} |
28559 |
} |
28560 |
|
28561 |
@@ -534,31 +547,26 @@ |
28562 |
static void |
28563 |
cancelDrop(WMView *destView, WMDraggingInfo *info) |
28564 |
{ |
28565 |
- /* send XdndStatus with action None */ |
28566 |
- sendDnDClientMessage(destView, |
28567 |
- W_VIEW_SCREEN(destView)->xdndStatusAtom, |
28568 |
- 0, 0, 0, None); |
28569 |
+ sendStatusMessage(destView, info, None); |
28570 |
concludeDrop(destView); |
28571 |
freeDestinationViewInfos(info); |
28572 |
} |
28573 |
|
28574 |
|
28575 |
-/* suspend drop, when dragged icon enter an unaware subview of destView */ |
28576 |
+/* suspend drop, when dragged icon enter an unregistered view |
28577 |
+ or a register view that doesn't accept the drop */ |
28578 |
static void |
28579 |
suspendDropAuthorization(WMView *destView, WMDraggingInfo *info) |
28580 |
{ |
28581 |
- /* free datas that depend on destination behaviour */ |
28582 |
- /* (in short: only keep source's types) */ |
28583 |
+ sendStatusMessage(destView, info, None); |
28584 |
+ |
28585 |
+ /* Free datas that depend on destination behaviour */ |
28586 |
if (XDND_DROP_DATAS(info) != NULL) { |
28587 |
WMFreeArray(XDND_DROP_DATAS(info)); |
28588 |
XDND_DROP_DATAS(info) = NULL; |
28589 |
} |
28590 |
- XDND_REQUIRED_TYPES(info) = NULL; |
28591 |
|
28592 |
- /* send XdndStatus with action None */ |
28593 |
- sendDnDClientMessage(destView, |
28594 |
- W_VIEW_SCREEN(destView)->xdndStatusAtom, |
28595 |
- 0, 0, 0, None); |
28596 |
+ XDND_REQUIRED_TYPES(info) = NULL; |
28597 |
} |
28598 |
|
28599 |
|
28600 |
@@ -566,14 +574,10 @@ |
28601 |
void |
28602 |
W_DragDestinationCancelDropOnEnter(WMView *toplevel, WMDraggingInfo *info) |
28603 |
{ |
28604 |
- if (XDND_DEST_VIEW_STORED(info)) |
28605 |
+ if (XDND_DEST_VIEW_IS_REGISTERED(info)) |
28606 |
cancelDrop(XDND_DEST_VIEW(info), info); |
28607 |
- else { |
28608 |
- /* send XdndStatus with action None */ |
28609 |
- sendDnDClientMessage(toplevel, |
28610 |
- W_VIEW_SCREEN(toplevel)->xdndStatusAtom, |
28611 |
- 0, 0, 0, None); |
28612 |
- } |
28613 |
+ else |
28614 |
+ sendStatusMessage(toplevel, info, None); |
28615 |
|
28616 |
W_DragDestinationInfoClear(info); |
28617 |
} |
28618 |
@@ -582,7 +586,7 @@ |
28619 |
static void |
28620 |
finishDrop(WMView *destView, WMDraggingInfo *info) |
28621 |
{ |
28622 |
- sendDnDClientMessage(destView, |
28623 |
+ sendDnDClientMessage(info, |
28624 |
W_VIEW_SCREEN(destView)->xdndFinishedAtom, |
28625 |
0, 0, 0, 0); |
28626 |
concludeDrop(destView); |
28627 |
@@ -603,31 +607,6 @@ |
28628 |
} |
28629 |
|
28630 |
|
28631 |
-/* send the action that can be performed, |
28632 |
- and the limits outside wich the source must re-send |
28633 |
- its position and action */ |
28634 |
-static void |
28635 |
-sendAllowedAction(WMView *destView, Atom action) |
28636 |
-{ |
28637 |
- WMScreen *scr = W_VIEW_SCREEN(destView); |
28638 |
- /* // WMPoint destPos = WMGetViewScreenPosition(destView); */ |
28639 |
- WMSize destSize = WMGetViewSize(destView); |
28640 |
- int destX, destY; |
28641 |
- Window foo; |
28642 |
- |
28643 |
- XTranslateCoordinates(scr->display, scr->rootWin, WMViewXID(destView), |
28644 |
- 0, 0, &destX, &destY, |
28645 |
- &foo); |
28646 |
- |
28647 |
- sendDnDClientMessage(destView, |
28648 |
- scr->xdndStatusAtom, |
28649 |
- 1, |
28650 |
- (destX << 16)|destY, |
28651 |
- (destSize.width << 16)|destSize.height, |
28652 |
- action); |
28653 |
-} |
28654 |
- |
28655 |
- |
28656 |
static void* |
28657 |
checkActionAllowed(WMView *destView, WMDraggingInfo* info) |
28658 |
{ |
28659 |
@@ -639,10 +618,11 @@ |
28660 |
return dropNotAllowedState; |
28661 |
} |
28662 |
|
28663 |
- sendAllowedAction(destView, XDND_DEST_ACTION(info)); |
28664 |
+ sendStatusMessage(destView, info, XDND_DEST_ACTION(info)); |
28665 |
return dropAllowedState; |
28666 |
} |
28667 |
|
28668 |
+ |
28669 |
static void* |
28670 |
checkDropAllowed(WMView *destView, XClientMessageEvent *event, |
28671 |
WMDraggingInfo* info) |
28672 |
@@ -670,6 +650,7 @@ |
28673 |
return checkActionAllowed(destView, info); |
28674 |
} |
28675 |
|
28676 |
+ |
28677 |
static WMPoint* |
28678 |
getDropLocationInView(WMView *view) |
28679 |
{ |
28680 |
@@ -690,6 +671,7 @@ |
28681 |
return location; |
28682 |
} |
28683 |
|
28684 |
+ |
28685 |
static void |
28686 |
callPerformDragOperation(WMView *destView, WMDraggingInfo *info) |
28687 |
{ |
28688 |
@@ -721,21 +703,17 @@ |
28689 |
WMDraggingInfo *info; |
28690 |
|
28691 |
wwarning("delay for drag source response expired"); |
28692 |
- if (view != NULL) { |
28693 |
- info = &(W_VIEW_SCREEN(view)->dragInfo); |
28694 |
- if (XDND_DEST_VIEW_STORED(info)) |
28695 |
- cancelDrop(view, info); |
28696 |
- else { |
28697 |
- /* send XdndStatus with action None */ |
28698 |
- sendDnDClientMessage(view, |
28699 |
- W_VIEW_SCREEN(view)->xdndStatusAtom, |
28700 |
- 0, 0, 0, None); |
28701 |
- } |
28702 |
- |
28703 |
- W_DragDestinationInfoClear(info); |
28704 |
+ info = &(W_VIEW_SCREEN(view)->dragInfo); |
28705 |
+ if (XDND_DEST_VIEW_IS_REGISTERED(info)) |
28706 |
+ cancelDrop(view, info); |
28707 |
+ else { |
28708 |
+ sendStatusMessage(view, info, None); |
28709 |
} |
28710 |
+ |
28711 |
+ W_DragDestinationInfoClear(info); |
28712 |
} |
28713 |
|
28714 |
+ |
28715 |
void |
28716 |
W_DragDestinationStopTimer() |
28717 |
{ |
28718 |
@@ -745,21 +723,17 @@ |
28719 |
} |
28720 |
} |
28721 |
|
28722 |
+ |
28723 |
void |
28724 |
W_DragDestinationStartTimer(WMDraggingInfo *info) |
28725 |
{ |
28726 |
W_DragDestinationStopTimer(); |
28727 |
|
28728 |
- if (XDND_DEST_STATE(info) != idleState |
28729 |
- || XDND_DEST_VIEW(info) == NULL) { |
28730 |
- /* note: info->destView == NULL means : |
28731 |
- Enter message has been received, waiting for Position message */ |
28732 |
- |
28733 |
+ if (XDND_DEST_STATE(info) != idleState) |
28734 |
dndDestinationTimer = WMAddTimerHandler( |
28735 |
XDND_SOURCE_RESPONSE_MAX_DELAY, |
28736 |
dragSourceResponseTimeOut, |
28737 |
XDND_DEST_VIEW(info)); |
28738 |
- } |
28739 |
} |
28740 |
/* ----- End of Destination timer ----- */ |
28741 |
|
28742 |
@@ -795,6 +769,7 @@ |
28743 |
} |
28744 |
#endif |
28745 |
|
28746 |
+ |
28747 |
static void* |
28748 |
idleState(WMView *destView, XClientMessageEvent *event, |
28749 |
WMDraggingInfo *info) |
28750 |
@@ -802,21 +777,24 @@ |
28751 |
WMScreen *scr; |
28752 |
Atom sourceMsg; |
28753 |
|
28754 |
- scr = W_VIEW_SCREEN(destView); |
28755 |
- sourceMsg = event->message_type; |
28756 |
- |
28757 |
- if (sourceMsg == scr->xdndPositionAtom) { |
28758 |
- destView->dragDestinationProcs->prepareForDragOperation(destView); |
28759 |
+ if (destView->dragDestinationProcs != NULL) { |
28760 |
+ scr = W_VIEW_SCREEN(destView); |
28761 |
+ sourceMsg = event->message_type; |
28762 |
+ |
28763 |
+ if (sourceMsg == scr->xdndPositionAtom) { |
28764 |
+ destView->dragDestinationProcs->prepareForDragOperation(destView); |
28765 |
+ |
28766 |
+ if (XDND_SOURCE_TYPES(info) != NULL) { |
28767 |
+ /* enter message infos are available */ |
28768 |
+ return checkDropAllowed(destView, event, info); |
28769 |
+ } |
28770 |
|
28771 |
- if (XDND_SOURCE_TYPES(info) != NULL) { |
28772 |
- /* enter message infos are available */ |
28773 |
- return checkDropAllowed(destView, event, info); |
28774 |
+ /* waiting for enter message */ |
28775 |
+ return waitEnterState; |
28776 |
} |
28777 |
- |
28778 |
- /* waiting for enter message */ |
28779 |
- return waitEnterState; |
28780 |
} |
28781 |
|
28782 |
+ suspendDropAuthorization(destView, info); |
28783 |
return idleState; |
28784 |
} |
28785 |
|
28786 |
@@ -881,6 +859,15 @@ |
28787 |
return idleState; |
28788 |
} |
28789 |
|
28790 |
+ if (sourceMsg == scr->xdndPositionAtom) { |
28791 |
+ if (XDND_SOURCE_ACTION_CHANGED(info)) { |
28792 |
+ return checkDropAllowed(destView, event, info); |
28793 |
+ } else { |
28794 |
+ sendStatusMessage(destView, info, None); |
28795 |
+ return dropNotAllowedState; |
28796 |
+ } |
28797 |
+ } |
28798 |
+ |
28799 |
return dropNotAllowedState; |
28800 |
} |
28801 |
|
28802 |
@@ -912,6 +899,15 @@ |
28803 |
return idleState; |
28804 |
} |
28805 |
|
28806 |
+ if (sourceMsg == scr->xdndPositionAtom) { |
28807 |
+ if (XDND_SOURCE_ACTION_CHANGED(info)) { |
28808 |
+ return checkDropAllowed(destView, event, info); |
28809 |
+ } else { |
28810 |
+ sendStatusMessage(destView, info, XDND_DEST_ACTION(info)); |
28811 |
+ return dropAllowedState; |
28812 |
+ } |
28813 |
+ } |
28814 |
+ |
28815 |
return dropAllowedState; |
28816 |
} |
28817 |
|
28818 |
@@ -947,29 +943,30 @@ |
28819 |
WMView *destView; |
28820 |
W_DndState* newState; |
28821 |
|
28822 |
- if (XDND_DEST_VIEW_STORED(info)) { |
28823 |
- destView = XDND_DEST_VIEW(info); |
28824 |
- if (XDND_DEST_STATE(info) == NULL) |
28825 |
- XDND_DEST_STATE(info) = idleState; |
28826 |
+ wassertr(XDND_DEST_INFO(info) != NULL); |
28827 |
+ wassertr(XDND_DEST_VIEW(info) != NULL); |
28828 |
+ |
28829 |
+ destView = XDND_DEST_VIEW(info); |
28830 |
+ if (XDND_DEST_STATE(info) == NULL) |
28831 |
+ XDND_DEST_STATE(info) = idleState; |
28832 |
|
28833 |
#ifdef XDND_DEBUG |
28834 |
|
28835 |
- printf("current dest state: %s\n", |
28836 |
- stateName(XDND_DEST_STATE(info))); |
28837 |
+ printf("current dest state: %s\n", |
28838 |
+ stateName(XDND_DEST_STATE(info))); |
28839 |
#endif |
28840 |
|
28841 |
- newState = (W_DndState*) XDND_DEST_STATE(info)(destView, event, info); |
28842 |
+ newState = (W_DndState*) XDND_DEST_STATE(info)(destView, event, info); |
28843 |
|
28844 |
#ifdef XDND_DEBUG |
28845 |
|
28846 |
- printf("new dest state: %s\n", stateName(newState)); |
28847 |
+ printf("new dest state: %s\n", stateName(newState)); |
28848 |
#endif |
28849 |
|
28850 |
- if (XDND_DEST_INFO(info) != NULL) { |
28851 |
- XDND_DEST_STATE(info) = newState; |
28852 |
- if (XDND_DEST_STATE(info) != idleState) |
28853 |
- W_DragDestinationStartTimer(info); |
28854 |
- } |
28855 |
+ if (XDND_DEST_INFO(info) != NULL) { |
28856 |
+ XDND_DEST_STATE(info) = newState; |
28857 |
+ if (XDND_DEST_STATE(info) != idleState) |
28858 |
+ W_DragDestinationStartTimer(info); |
28859 |
} |
28860 |
} |
28861 |
|
28862 |
@@ -1104,7 +1101,7 @@ |
28863 |
Process drop |
28864 |
dropDatas: datas (WMData*) required by destination (self) |
28865 |
(given in same order as returned by requiredDataTypes). |
28866 |
- A NULL data means it couldn't be retrivied. |
28867 |
+ A NULL data means it couldn't be retrieved. |
28868 |
Destroyed when drop ends. |
28869 |
operationList: if source operation is WDOperationAsk, contains |
28870 |
operations (and associated texts) that can be asked |
28871 |
diff -uhrN WindowMaker-0.92.0/WINGs/dragsource.c WindowMaker-CVS-20060123/WINGs/dragsource.c |
28872 |
--- WindowMaker-0.92.0/WINGs/dragsource.c 2004-10-28 11:29:59.000000000 +0200 |
28873 |
+++ WindowMaker-CVS-20060123/WINGs/dragsource.c 2006-01-22 21:19:36.000000000 +0100 |
28874 |
@@ -16,10 +16,10 @@ |
28875 |
#define MIN_Y_MOVE_OFFSET 5 |
28876 |
#define MAX_SLIDEBACK_ITER 15 |
28877 |
|
28878 |
-#define VERSION_INFO(dragInfo) dragInfo->protocolVersion |
28879 |
#define XDND_PROPERTY_FORMAT 32 |
28880 |
#define XDND_ACTION_DESCRIPTION_FORMAT 8 |
28881 |
|
28882 |
+#define XDND_DEST_VERSION(dragInfo) dragInfo->protocolVersion |
28883 |
#define XDND_SOURCE_INFO(dragInfo) dragInfo->sourceInfo |
28884 |
#define XDND_DEST_WIN(dragInfo) dragInfo->sourceInfo->destinationWindow |
28885 |
#define XDND_SOURCE_ACTION(dragInfo) dragInfo->sourceAction |
28886 |
@@ -415,21 +415,25 @@ |
28887 |
sendEnterMessage(WMDraggingInfo *info) |
28888 |
{ |
28889 |
WMScreen *scr = sourceScreen(info); |
28890 |
- unsigned long data1; |
28891 |
+ unsigned long version; |
28892 |
|
28893 |
- data1 = (VERSION_INFO(info) << 24)|1; /* 1: support of type list */ |
28894 |
+ if (XDND_DEST_VERSION(info) > 2) { |
28895 |
+ if (XDND_DEST_VERSION(info) < XDND_VERSION) |
28896 |
+ version = XDND_DEST_VERSION(info); |
28897 |
+ else |
28898 |
+ version = XDND_VERSION; |
28899 |
+ } else { |
28900 |
+ version = 3; |
28901 |
+ } |
28902 |
|
28903 |
return sendDnDClientMessage(info, scr->xdndEnterAtom, |
28904 |
- data1, |
28905 |
+ (version << 24) | 1, /* 1: support of type list */ |
28906 |
XDND_3_TYPES(info)[0], |
28907 |
XDND_3_TYPES(info)[1], |
28908 |
XDND_3_TYPES(info)[2]); |
28909 |
} |
28910 |
|
28911 |
|
28912 |
-/* |
28913 |
-// this functon doesn't return something in all cases. |
28914 |
-// control reaches end of non-void function. fix this -Dan */ |
28915 |
static Bool |
28916 |
sendPositionMessage(WMDraggingInfo *info, WMPoint *mousePos) |
28917 |
{ |
28918 |
@@ -440,7 +444,7 @@ |
28919 |
if (mousePos->x < noPosZone->pos.x |
28920 |
|| mousePos->x > (noPosZone->pos.x + noPosZone->size.width) |
28921 |
|| mousePos->y < noPosZone->pos.y |
28922 |
- || mousePos->y > (noPosZone->pos.y + noPosZone->size.width)) { |
28923 |
+ || mousePos->y > (noPosZone->pos.y + noPosZone->size.height)) { |
28924 |
/* send position if out of zone defined by destination */ |
28925 |
return sendDnDClientMessage(info, scr->xdndPositionAtom, |
28926 |
0, |
28927 |
@@ -448,14 +452,18 @@ |
28928 |
XDND_TIMESTAMP(info), |
28929 |
XDND_SOURCE_ACTION(info)); |
28930 |
} |
28931 |
- } else { |
28932 |
- /* send position on each move */ |
28933 |
- return sendDnDClientMessage(info, scr->xdndPositionAtom, |
28934 |
- 0, |
28935 |
- mousePos->x<<16|mousePos->y, |
28936 |
- XDND_TIMESTAMP(info), |
28937 |
- XDND_SOURCE_ACTION(info)); |
28938 |
+ |
28939 |
+ /* Nothing to send, always succeed */ |
28940 |
+ return True; |
28941 |
+ |
28942 |
} |
28943 |
+ |
28944 |
+ /* send position on each move */ |
28945 |
+ return sendDnDClientMessage(info, scr->xdndPositionAtom, |
28946 |
+ 0, |
28947 |
+ mousePos->x<<16|mousePos->y, |
28948 |
+ XDND_TIMESTAMP(info), |
28949 |
+ XDND_SOURCE_ACTION(info)); |
28950 |
} |
28951 |
|
28952 |
|
28953 |
@@ -846,6 +854,30 @@ |
28954 |
|
28955 |
|
28956 |
static void |
28957 |
+storeDestinationProtocolVersion(WMDraggingInfo *info) |
28958 |
+{ |
28959 |
+ Atom type; |
28960 |
+ int format; |
28961 |
+ unsigned long count, remain; |
28962 |
+ unsigned char *winXdndVersion; |
28963 |
+ WMScreen *scr = W_VIEW_SCREEN(XDND_SOURCE_VIEW(info)); |
28964 |
+ |
28965 |
+ wassertr(XDND_DEST_WIN(info) != None); |
28966 |
+ |
28967 |
+ if (XGetWindowProperty(scr->display, XDND_DEST_WIN(info), |
28968 |
+ scr->xdndAwareAtom, |
28969 |
+ 0, 1, False, XA_ATOM, &type, &format, |
28970 |
+ &count, &remain, &winXdndVersion) == Success) { |
28971 |
+ XDND_DEST_VERSION(info) = *winXdndVersion; |
28972 |
+ XFree(winXdndVersion); |
28973 |
+ } else { |
28974 |
+ XDND_DEST_VERSION(info) = 0; |
28975 |
+ wwarning("failed to read XDND version of drop target"); |
28976 |
+ } |
28977 |
+} |
28978 |
+ |
28979 |
+ |
28980 |
+static void |
28981 |
initMotionProcess(WMView *view, WMDraggingInfo *info, |
28982 |
XEvent *event, WMPoint *startLocation) |
28983 |
{ |
28984 |
@@ -878,9 +910,8 @@ |
28985 |
|
28986 |
|
28987 |
static void |
28988 |
-processMotion(WMDraggingInfo *info, Window windowUnderDrag, WMPoint *mousePos) |
28989 |
+processMotion(WMDraggingInfo *info, WMPoint *mousePos) |
28990 |
{ |
28991 |
- /* // WMScreen *scr = sourceScreen(info); */ |
28992 |
Window newDestination = findDestination(info, mousePos); |
28993 |
|
28994 |
W_DragSourceStopTimer(); |
28995 |
@@ -894,20 +925,24 @@ |
28996 |
} |
28997 |
|
28998 |
XDND_DEST_WIN(info) = newDestination; |
28999 |
- XDND_SOURCE_STATE(info) = idleState; |
29000 |
XDND_DEST_ACTION(info) = None; |
29001 |
XDND_NO_POS_ZONE(info).size.width = 0; |
29002 |
XDND_NO_POS_ZONE(info).size.height = 0; |
29003 |
|
29004 |
if (newDestination != None) { |
29005 |
/* entering a xdnd window */ |
29006 |
+ XDND_SOURCE_STATE(info) = idleState; |
29007 |
+ storeDestinationProtocolVersion(info); |
29008 |
+ |
29009 |
if (! sendEnterMessage(info)) { |
29010 |
XDND_DEST_WIN(info) = None; |
29011 |
return; |
29012 |
} |
29013 |
|
29014 |
W_DragSourceStartTimer(info); |
29015 |
- } |
29016 |
+ } else { |
29017 |
+ XDND_SOURCE_STATE(info) = NULL; |
29018 |
+ } |
29019 |
} else { |
29020 |
if (XDND_DEST_WIN(info) != None) { |
29021 |
if (! sendPositionMessage(info, mousePos)) { |
29022 |
@@ -1010,9 +1045,7 @@ |
29023 |
mouseLocation.y - XDND_MOUSE_OFFSET(info).y; |
29024 |
|
29025 |
refreshDragImage(view, info); |
29026 |
- processMotion(info, |
29027 |
- event->xmotion.window, |
29028 |
- &mouseLocation); |
29029 |
+ processMotion(info, &mouseLocation); |
29030 |
} |
29031 |
} |
29032 |
} |
29033 |
@@ -1041,7 +1074,7 @@ |
29034 |
printf("Xdnd status message:\n"); |
29035 |
|
29036 |
if (statusEvent->data.l[1] & 0x2UL) |
29037 |
- printf("send position on every move\n"); |
29038 |
+ printf("\tsend position on every move\n"); |
29039 |
else { |
29040 |
int x, y, w, h; |
29041 |
x = statusEvent->data.l[2] >> 16; |
29042 |
@@ -1049,15 +1082,15 @@ |
29043 |
w = statusEvent->data.l[3] >> 16; |
29044 |
h = statusEvent->data.l[3] & 0xFFFFL; |
29045 |
|
29046 |
- printf("send position out of ((%d,%d) , (%d,%d))\n", |
29047 |
+ printf("\tsend position out of ((%d,%d) , (%d,%d))\n", |
29048 |
x, y, x+w, y+h); |
29049 |
} |
29050 |
|
29051 |
if (statusEvent->data.l[1] & 0x1L) |
29052 |
- printf("allowed action: %s\n", |
29053 |
+ printf("\tallowed action: %s\n", |
29054 |
XGetAtomName(dpy, statusEvent->data.l[4])); |
29055 |
else |
29056 |
- printf("no action allowed\n"); |
29057 |
+ printf("\tno action allowed\n"); |
29058 |
} |
29059 |
#endif |
29060 |
|
29061 |
@@ -1231,23 +1264,28 @@ |
29062 |
W_DndState* newState; |
29063 |
|
29064 |
if (XDND_SOURCE_VIEW_STORED(info)) { |
29065 |
- view = XDND_SOURCE_VIEW(info); |
29066 |
+ if (XDND_SOURCE_STATE(info) != NULL) { |
29067 |
+ view = XDND_SOURCE_VIEW(info); |
29068 |
#ifdef XDND_DEBUG |
29069 |
|
29070 |
- printf("current source state: %s\n", |
29071 |
- stateName(XDND_SOURCE_STATE(info))); |
29072 |
+ printf("current source state: %s\n", |
29073 |
+ stateName(XDND_SOURCE_STATE(info))); |
29074 |
#endif |
29075 |
|
29076 |
- newState = (W_DndState*) XDND_SOURCE_STATE(info)(view, event, info); |
29077 |
+ newState = (W_DndState*) XDND_SOURCE_STATE(info)(view, event, info); |
29078 |
|
29079 |
#ifdef XDND_DEBUG |
29080 |
|
29081 |
- printf("new source state: %s\n", stateName(newState)); |
29082 |
+ printf("new source state: %s\n", stateName(newState)); |
29083 |
#endif |
29084 |
|
29085 |
- if (newState != NULL) |
29086 |
- XDND_SOURCE_STATE(info) = newState; |
29087 |
- /* else drop finished, and info has been flushed */ |
29088 |
+ if (newState != NULL) |
29089 |
+ XDND_SOURCE_STATE(info) = newState; |
29090 |
+ /* else drop finished, and info has been flushed */ |
29091 |
+ } |
29092 |
+ |
29093 |
+ } else { |
29094 |
+ wwarning("received DnD message without having a target"); |
29095 |
} |
29096 |
} |
29097 |
|
29098 |
diff -uhrN WindowMaker-0.92.0/WINGs/Examples/server.c WindowMaker-CVS-20060123/WINGs/Examples/server.c |
29099 |
--- WindowMaker-0.92.0/WINGs/Examples/server.c 2004-10-12 21:31:51.000000000 +0200 |
29100 |
+++ WindowMaker-CVS-20060123/WINGs/Examples/server.c 2005-08-23 00:16:13.000000000 +0200 |
29101 |
@@ -126,8 +126,8 @@ |
29102 |
} |
29103 |
|
29104 |
|
29105 |
-static unsigned char* |
29106 |
-findDelimiter(unsigned char *data, unsigned const char *endPtr) |
29107 |
+static char* |
29108 |
+findDelimiter(char *data, const char *endPtr) |
29109 |
{ |
29110 |
wassertrv(data < endPtr, NULL); |
29111 |
|
29112 |
diff -uhrN WindowMaker-0.92.0/WINGs/Makefile.am WindowMaker-CVS-20060123/WINGs/Makefile.am |
29113 |
--- WindowMaker-0.92.0/WINGs/Makefile.am 2004-10-30 07:44:13.000000000 +0200 |
29114 |
+++ WindowMaker-CVS-20060123/WINGs/Makefile.am 2005-07-17 20:27:58.000000000 +0200 |
29115 |
@@ -108,12 +108,12 @@ |
29116 |
wutil.c |
29117 |
|
29118 |
|
29119 |
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" |
29120 |
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" -DDEBUG |
29121 |
|
29122 |
AM_CFLAGS = @NOSTRICTALIASING@ |
29123 |
|
29124 |
INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ |
29125 |
- -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG |
29126 |
+ @XFTFLAGS@ @HEADER_SEARCH_PATH@ |
29127 |
|
29128 |
|
29129 |
wcolorpanel.o: wcolorpanel.c |
29130 |
diff -uhrN WindowMaker-0.92.0/WINGs/Makefile.in WindowMaker-CVS-20060123/WINGs/Makefile.in |
29131 |
--- WindowMaker-0.92.0/WINGs/Makefile.in 2005-06-19 05:23:00.000000000 +0200 |
29132 |
+++ WindowMaker-CVS-20060123/WINGs/Makefile.in 2006-01-22 21:33:53.000000000 +0100 |
29133 |
@@ -134,11 +134,11 @@ |
29134 |
libWUtil_a_SOURCES = array.c bagtree.c connection.c data.c error.c findfile.c handlers.c hashtable.c host.c international.c memory.c misc.c notification.c proplist.c snprintf.c string.c tree.c userdefaults.c usleep.c wapplication.c wconfig.h wutil.c |
29135 |
|
29136 |
|
29137 |
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" |
29138 |
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" -DDEBUG |
29139 |
|
29140 |
AM_CFLAGS = @NOSTRICTALIASING@ |
29141 |
|
29142 |
-INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG |
29143 |
+INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src @XFTFLAGS@ @HEADER_SEARCH_PATH@ |
29144 |
|
29145 |
|
29146 |
DISTCLEANFILES = WINGs.pc |
29147 |
diff -uhrN WindowMaker-0.92.0/WINGs/po/de.po WindowMaker-CVS-20060123/WINGs/po/de.po |
29148 |
--- WindowMaker-0.92.0/WINGs/po/de.po 2005-07-03 02:45:48.000000000 +0200 |
29149 |
+++ WindowMaker-CVS-20060123/WINGs/po/de.po 2005-07-05 21:39:14.000000000 +0200 |
29150 |
@@ -1,23 +1,28 @@ |
29151 |
-# KTranslator Generated File |
29152 |
-# SOME DESCRIPTIVE TITLE. |
29153 |
-# Copyright (C) YEAR Free Software Foundation, Inc. |
29154 |
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
29155 |
# |
29156 |
+# German Message Catalog for WINGs |
29157 |
+# |
29158 |
+# Initial translation |
29159 |
+# Gudio Scholz <guido.scholz@××××××××××.de> |
29160 |
+# |
29161 |
+# Adapted to versions 0.80 ff. |
29162 |
+# Torsten Marek <shlomme@×××.net> |
29163 |
+# |
29164 |
+ |
29165 |
msgid "" |
29166 |
msgstr "" |
29167 |
-"Project-Id-Version: WINGs 0.80.0\n" |
29168 |
-"POT-Creation-Date: 2002-01-09 21:06+0100\n" |
29169 |
-"PO-Revision-Date: 2002-01-09 21:20+0100\n" |
29170 |
-"Last-Translator: Guido Scholz <guido.scholz@××××××××××.de>\n" |
29171 |
-"Language-Team: Deutsch <de@××.org>\n" |
29172 |
+"Project-Id-Version: WINGs\n" |
29173 |
+"POT-Creation-Date: 2004-11-01 16:24+0100\n" |
29174 |
+"PO-Revision-Date: 2004-11-05 23:48+0100\n" |
29175 |
+"Last-Translator: shlomme@×××.net\n" |
29176 |
+"Language-Team: German\n" |
29177 |
"MIME-Version: 1.0\n" |
29178 |
"Content-Type: text/plain; charset=UTF-8\n" |
29179 |
-"Content-Transfer-Encoding: unknown\n" |
29180 |
+"Content-Transfer-Encoding: 8bit\n" |
29181 |
|
29182 |
-#: ../../WINGs/connection.c:461 ../../WINGs/connection.c:526 |
29183 |
-#: ../../WINGs/connection.c:569 |
29184 |
+#: ../../WINGs/connection.c:471 ../../WINGs/connection.c:536 |
29185 |
+#: ../../WINGs/connection.c:579 |
29186 |
msgid "Bad address-service-protocol combination" |
29187 |
-msgstr "Ungültige Adress-Dienst-Protokoll Kombination" |
29188 |
+msgstr "Ungültige Kombination von Adresse und Dienstprotokoll" |
29189 |
|
29190 |
#: ../../WINGs/error.c:54 |
29191 |
#, c-format |
29192 |
@@ -44,346 +49,349 @@ |
29193 |
#: ../../WINGs/findfile.c:48 |
29194 |
#, c-format |
29195 |
msgid "could not get password entry for UID %i" |
29196 |
-msgstr "konnte Passwort nicht ermitteln für UID %i" |
29197 |
+msgstr "Passworteintrag für UID %i konnte nicht ermittelt werden" |
29198 |
|
29199 |
#: ../../WINGs/findfile.c:66 |
29200 |
#, c-format |
29201 |
msgid "could not get password entry for user %s" |
29202 |
-msgstr "konnte Passwort nicht ermitteln für Benutzer %s" |
29203 |
+msgstr "Passworteintrag für Benutzer %s konnte nicht ermittelt werden" |
29204 |
|
29205 |
#: ../../WINGs/host.c:114 |
29206 |
msgid "Cannot get current host name" |
29207 |
-msgstr "Kann aktuellen Hostnamen nicht ermitteln" |
29208 |
+msgstr "Aktueller Hostname kann nicht ermittelt werden" |
29209 |
+ |
29210 |
+#: ../../WINGs/proplist.c:91 |
29211 |
+#, c-format |
29212 |
+msgid "syntax error in %s %s, line %i: %s" |
29213 |
+msgstr "Syntaxfehler in %s %s, Zeile %i: %s" |
29214 |
|
29215 |
#: ../../WINGs/proplist.c:150 |
29216 |
msgid "Only string or data is supported for a proplist dictionary key" |
29217 |
msgstr "" |
29218 |
-"Nur string oder data wird als Schlüssel für ein proplist dictionary " |
29219 |
+"Nur Zeichenketten oder Binärdaten werden als Schlüssel für ein PropList-Dictionary " |
29220 |
"unterstützt" |
29221 |
|
29222 |
#: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236 |
29223 |
#: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474 |
29224 |
-#: ../../WINGs/proplist.c:1071 ../../WINGs/proplist.c:1123 |
29225 |
-#: ../../WINGs/proplist.c:1289 ../../WINGs/proplist.c:1368 |
29226 |
-#: ../../WINGs/proplist.c:1489 ../../WINGs/proplist.c:1536 |
29227 |
+#: ../../WINGs/proplist.c:1075 ../../WINGs/proplist.c:1127 |
29228 |
+#: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372 |
29229 |
+#: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540 |
29230 |
msgid "Used proplist functions on non-WMPropLists objects" |
29231 |
-msgstr "" |
29232 |
+msgstr "PropList-Funktionen werden auf nicht-WMPropList-Objekte angewendet" |
29233 |
|
29234 |
#: ../../WINGs/proplist.c:630 |
29235 |
msgid "unterminated PropList string" |
29236 |
-msgstr "nicht terminierter PropList string" |
29237 |
+msgstr "nicht terminierte PropList-Zeichenkette" |
29238 |
|
29239 |
#: ../../WINGs/proplist.c:670 |
29240 |
msgid "unterminated PropList data" |
29241 |
-msgstr "nicht terminiertes PropList data" |
29242 |
+msgstr "nicht terminierte PropList-Binärdaten" |
29243 |
|
29244 |
#: ../../WINGs/proplist.c:678 |
29245 |
msgid "unterminated PropList data (missing hexdigit)" |
29246 |
-msgstr "nicht terminiertes PropList data (fehlendes hex-Zeichen)" |
29247 |
+msgstr "nicht terminierte PropList-Binärdaten (fehlendes Hex-Zeichen)" |
29248 |
|
29249 |
-#: ../../WINGs/proplist.c:690 |
29250 |
+#: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695 |
29251 |
msgid "non hexdigit character in PropList data" |
29252 |
-msgstr "falsches hex-Zeichen in PropList data" |
29253 |
+msgstr "falsches Hex-Zeichen in PropList-Binärdaten" |
29254 |
|
29255 |
-#: ../../WINGs/proplist.c:725 |
29256 |
+#: ../../WINGs/proplist.c:729 |
29257 |
msgid "unterminated PropList array" |
29258 |
-msgstr "nicht terminiertes PropList array" |
29259 |
+msgstr "nicht terminiertes PropList-Array" |
29260 |
|
29261 |
-#: ../../WINGs/proplist.c:733 |
29262 |
+#: ../../WINGs/proplist.c:737 |
29263 |
msgid "missing or unterminated PropList array" |
29264 |
-msgstr "fehlendes oder nicht terminiertes PropList array" |
29265 |
+msgstr "fehlendes oder nicht terminiertes PropList-Array" |
29266 |
|
29267 |
-#: ../../WINGs/proplist.c:743 |
29268 |
+#: ../../WINGs/proplist.c:747 |
29269 |
msgid "could not get PropList array element" |
29270 |
-msgstr "" |
29271 |
+msgstr "PropList-Array-Element konnte nicht gelesen werden" |
29272 |
|
29273 |
-#: ../../WINGs/proplist.c:772 |
29274 |
+#: ../../WINGs/proplist.c:776 |
29275 |
msgid "unterminated PropList dictionary" |
29276 |
-msgstr "" |
29277 |
+msgstr "nicht terminiertes PropList-Dictionary" |
29278 |
|
29279 |
-#: ../../WINGs/proplist.c:789 |
29280 |
+#: ../../WINGs/proplist.c:793 |
29281 |
msgid "missing PropList dictionary key" |
29282 |
-msgstr "" |
29283 |
+msgstr "fehlender Schlüssel in PropList-Dictionary" |
29284 |
|
29285 |
-#: ../../WINGs/proplist.c:791 |
29286 |
+#: ../../WINGs/proplist.c:795 |
29287 |
msgid "missing PropList dictionary entry key or unterminated dictionary" |
29288 |
-msgstr "" |
29289 |
+msgstr "fehlender Schlüssel in PropList-Dictionary oder fehlende Terminierung" |
29290 |
|
29291 |
-#: ../../WINGs/proplist.c:799 |
29292 |
+#: ../../WINGs/proplist.c:803 |
29293 |
msgid "error parsing PropList dictionary key" |
29294 |
-msgstr "" |
29295 |
+msgstr "Fehler beim Parsen eines PropList-Dictionary-Schlüssels" |
29296 |
|
29297 |
-#: ../../WINGs/proplist.c:807 |
29298 |
+#: ../../WINGs/proplist.c:811 |
29299 |
msgid "missing = in PropList dictionary entry" |
29300 |
-msgstr "" |
29301 |
+msgstr "fehlendes \"=\" in PropList-Dictionary-Schlüssel" |
29302 |
|
29303 |
-#: ../../WINGs/proplist.c:815 |
29304 |
+#: ../../WINGs/proplist.c:819 |
29305 |
msgid "error parsing PropList dictionary entry value" |
29306 |
-msgstr "" |
29307 |
+msgstr "Fehler beim Parsen eines PropList-Dictionary-Wertes" |
29308 |
|
29309 |
-#: ../../WINGs/proplist.c:823 |
29310 |
+#: ../../WINGs/proplist.c:827 |
29311 |
msgid "missing ; in PropList dictionary entry" |
29312 |
-msgstr "" |
29313 |
+msgstr "fehlendes \";\" in PropList-Dictionary-Eintrag" |
29314 |
|
29315 |
-#: ../../WINGs/proplist.c:884 |
29316 |
+#: ../../WINGs/proplist.c:888 |
29317 |
msgid "" |
29318 |
"was expecting a string, data, array or dictionary. If it's a string, try " |
29319 |
"enclosing it with \"." |
29320 |
msgstr "" |
29321 |
-"string, data, array oder dictionary wurde erwartet. Zeichenketten mit \" " |
29322 |
+"Zeichenkette, Binärdaten, Array oder Dictionary erwartet. Zeichenketten ggf. mit \" " |
29323 |
"einklammern." |
29324 |
|
29325 |
-#: ../../WINGs/proplist.c:888 |
29326 |
+#: ../../WINGs/proplist.c:892 |
29327 |
msgid "Comments are not allowed inside WindowMaker owned domain files." |
29328 |
-msgstr "Kommentare sind in Domaindaten von WindowMaker nicht erlaubt." |
29329 |
+msgstr "Kommentare sind in Domänendaten von WindowMaker nicht erlaubt." |
29330 |
|
29331 |
-#: ../../WINGs/proplist.c:1559 ../../WINGs/proplist.c:1624 |
29332 |
+#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1630 |
29333 |
msgid "extra data after end of property list" |
29334 |
msgstr "zusätzliche Daten hinter dem Ende der Propertyliste" |
29335 |
|
29336 |
-#: ../../WINGs/proplist.c:1602 |
29337 |
+#: ../../WINGs/proplist.c:1606 |
29338 |
#, c-format |
29339 |
msgid "could not get size for file '%s'" |
29340 |
-msgstr "konnte DateigröÃe von '%s' nicht ermitteln" |
29341 |
+msgstr "DateigröÃe von '%s' konnte nicht ermittelt werden" |
29342 |
|
29343 |
-#: ../../WINGs/proplist.c:1614 |
29344 |
+#: ../../WINGs/proplist.c:1619 |
29345 |
#, c-format |
29346 |
msgid "error reading from file '%s'" |
29347 |
msgstr "Fehler beim Lesen der Datei '%s'" |
29348 |
|
29349 |
-#: ../../WINGs/proplist.c:1665 |
29350 |
+#: ../../WINGs/proplist.c:1671 |
29351 |
#, c-format |
29352 |
msgid "mkstemp (%s) failed" |
29353 |
-msgstr "mkstemp (%s) schlug fehl" |
29354 |
+msgstr "mkstemp (%s) fehlgeschlagen" |
29355 |
|
29356 |
-#: ../../WINGs/proplist.c:1676 |
29357 |
+#: ../../WINGs/proplist.c:1682 |
29358 |
#, c-format |
29359 |
msgid "mktemp (%s) failed" |
29360 |
-msgstr "mktemp (%s) schlug fehl" |
29361 |
+msgstr "mktemp (%s) fehlgeschlagen" |
29362 |
|
29363 |
-#: ../../WINGs/proplist.c:1687 |
29364 |
+#: ../../WINGs/proplist.c:1693 |
29365 |
#, c-format |
29366 |
msgid "open (%s) failed" |
29367 |
-msgstr "open (%s) schlug fehl" |
29368 |
+msgstr "open (%s) fehlgeschlagen" |
29369 |
|
29370 |
-#: ../../WINGs/proplist.c:1694 |
29371 |
+#: ../../WINGs/proplist.c:1700 |
29372 |
#, c-format |
29373 |
msgid "writing to file: %s failed" |
29374 |
-msgstr "Schreiben in Datei: %s schlug fehl" |
29375 |
+msgstr "Schreiben in Datei: %s fehlgeschlagen" |
29376 |
|
29377 |
-#: ../../WINGs/proplist.c:1702 |
29378 |
+#: ../../WINGs/proplist.c:1708 |
29379 |
#, c-format |
29380 |
msgid "fclose (%s) failed" |
29381 |
-msgstr "fclose (%s) schlug fehl" |
29382 |
+msgstr "fclose (%s) fehlgeschlagen" |
29383 |
|
29384 |
-#: ../../WINGs/proplist.c:1711 |
29385 |
+#: ../../WINGs/proplist.c:1717 |
29386 |
#, c-format |
29387 |
msgid "rename ('%s' to '%s') failed" |
29388 |
-msgstr "rename ('%s' to '%s') schlug fehl" |
29389 |
+msgstr "rename ('%s' nach '%s') fehlgeschlagen" |
29390 |
|
29391 |
#. something happened with the file. just overwrite it |
29392 |
-#: ../../WINGs/userdefaults.c:192 ../../WINGs/userdefaults.c:208 |
29393 |
+#: ../../WINGs/userdefaults.c:188 ../../WINGs/userdefaults.c:204 |
29394 |
#, c-format |
29395 |
msgid "cannot read domain from file '%s' when syncing" |
29396 |
-msgstr "Kann bei der Synchronisation nicht aus Datei '%s' lesen" |
29397 |
+msgstr "Bei der Synchronisation konnte nicht aus der Datei '%s' gelesen werden" |
29398 |
|
29399 |
-#: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250 |
29400 |
-#: ../../WINGs/wcolor.c:291 |
29401 |
+#: ../../WINGs/wcolor.c:237 ../../WINGs/wcolor.c:249 ../../WINGs/wcolor.c:288 |
29402 |
+#: ../../WINGs/wcolor.c:329 |
29403 |
#, c-format |
29404 |
msgid "could not allocate %s color" |
29405 |
-msgstr "konnte die Farbe %s nicht erzeugen" |
29406 |
+msgstr "Farbe %s konnte nicht erzeugt werden" |
29407 |
|
29408 |
-#: ../../WINGs/wcolor.c:198 |
29409 |
+#: ../../WINGs/wcolor.c:237 |
29410 |
msgid "white" |
29411 |
-msgstr "weiÃ" |
29412 |
+msgstr "WeiÃ" |
29413 |
|
29414 |
-#: ../../WINGs/wcolor.c:211 |
29415 |
+#: ../../WINGs/wcolor.c:249 |
29416 |
msgid "black" |
29417 |
-msgstr "schwarz" |
29418 |
+msgstr "Schwarz" |
29419 |
|
29420 |
-#: ../../WINGs/wcolor.c:250 |
29421 |
+#: ../../WINGs/wcolor.c:288 |
29422 |
msgid "gray" |
29423 |
-msgstr "grau" |
29424 |
+msgstr "Grau" |
29425 |
|
29426 |
-#: ../../WINGs/wcolor.c:291 |
29427 |
+#: ../../WINGs/wcolor.c:329 |
29428 |
msgid "dark gray" |
29429 |
-msgstr "dunkelgrau" |
29430 |
+msgstr "Dunkelgrau" |
29431 |
|
29432 |
-#: ../../WINGs/wcolorpanel.c:415 |
29433 |
+#: ../../WINGs/wcolorpanel.c:420 |
29434 |
msgid "Colors" |
29435 |
msgstr "Farben" |
29436 |
|
29437 |
-#: ../../WINGs/wcolorpanel.c:605 ../../WINGs/wcolorpanel.c:2824 |
29438 |
+#: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829 |
29439 |
msgid "Brightness" |
29440 |
msgstr "Helligkeit" |
29441 |
|
29442 |
-#: ../../WINGs/wcolorpanel.c:607 ../../WINGs/wcolorpanel.c:683 |
29443 |
-#: ../../WINGs/wcolorpanel.c:716 ../../WINGs/wcolorpanel.c:750 |
29444 |
-#: ../../WINGs/wcolorpanel.c:810 ../../WINGs/wcolorpanel.c:844 |
29445 |
-#: ../../WINGs/wcolorpanel.c:878 ../../WINGs/wcolorpanel.c:913 |
29446 |
-#: ../../WINGs/wcolorpanel.c:2164 ../../WINGs/wcolorpanel.c:2826 |
29447 |
-#: ../../WINGs/wcolorpanel.c:2862 ../../WINGs/wcolorpanel.c:2898 |
29448 |
-#: ../../WINGs/wcolorpanel.c:3746 |
29449 |
+#: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688 |
29450 |
+#: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755 |
29451 |
+#: ../../WINGs/wcolorpanel.c:815 ../../WINGs/wcolorpanel.c:849 |
29452 |
+#: ../../WINGs/wcolorpanel.c:883 ../../WINGs/wcolorpanel.c:918 |
29453 |
+#: ../../WINGs/wcolorpanel.c:2169 ../../WINGs/wcolorpanel.c:2831 |
29454 |
+#: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903 |
29455 |
+#: ../../WINGs/wcolorpanel.c:3745 |
29456 |
msgid "Color Panel: Could not allocate memory" |
29457 |
-msgstr "Color Panel: Konnte keinen Speicher reservieren" |
29458 |
+msgstr "Farb-Panel: Speicher konnte nicht reserviert werden" |
29459 |
|
29460 |
-#: ../../WINGs/wcolorpanel.c:680 ../../WINGs/wcolorpanel.c:681 |
29461 |
+#: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686 |
29462 |
msgid "Red" |
29463 |
msgstr "Rot" |
29464 |
|
29465 |
-#: ../../WINGs/wcolorpanel.c:713 ../../WINGs/wcolorpanel.c:714 |
29466 |
+#: ../../WINGs/wcolorpanel.c:718 ../../WINGs/wcolorpanel.c:719 |
29467 |
msgid "Green" |
29468 |
msgstr "Grün" |
29469 |
|
29470 |
-#: ../../WINGs/wcolorpanel.c:747 ../../WINGs/wcolorpanel.c:748 |
29471 |
+#: ../../WINGs/wcolorpanel.c:752 ../../WINGs/wcolorpanel.c:753 |
29472 |
msgid "Blue" |
29473 |
msgstr "Blau" |
29474 |
|
29475 |
-#: ../../WINGs/wcolorpanel.c:807 ../../WINGs/wcolorpanel.c:808 |
29476 |
+#: ../../WINGs/wcolorpanel.c:812 ../../WINGs/wcolorpanel.c:813 |
29477 |
msgid "Cyan" |
29478 |
msgstr "" |
29479 |
|
29480 |
-#: ../../WINGs/wcolorpanel.c:841 ../../WINGs/wcolorpanel.c:842 |
29481 |
+#: ../../WINGs/wcolorpanel.c:846 ../../WINGs/wcolorpanel.c:847 |
29482 |
msgid "Magenta" |
29483 |
msgstr "" |
29484 |
|
29485 |
-#: ../../WINGs/wcolorpanel.c:875 ../../WINGs/wcolorpanel.c:876 |
29486 |
+#: ../../WINGs/wcolorpanel.c:880 ../../WINGs/wcolorpanel.c:881 |
29487 |
msgid "Yellow" |
29488 |
msgstr "Gelb" |
29489 |
|
29490 |
-#: ../../WINGs/wcolorpanel.c:910 ../../WINGs/wcolorpanel.c:911 |
29491 |
+#: ../../WINGs/wcolorpanel.c:915 ../../WINGs/wcolorpanel.c:916 |
29492 |
msgid "Black" |
29493 |
msgstr "Schwarz" |
29494 |
|
29495 |
-#: ../../WINGs/wcolorpanel.c:991 |
29496 |
+#: ../../WINGs/wcolorpanel.c:996 |
29497 |
msgid "Spectrum" |
29498 |
msgstr "Spektrum" |
29499 |
|
29500 |
-#: ../../WINGs/wcolorpanel.c:1021 |
29501 |
+#: ../../WINGs/wcolorpanel.c:1026 |
29502 |
msgid "Palette" |
29503 |
msgstr "" |
29504 |
|
29505 |
-#: ../../WINGs/wcolorpanel.c:1027 |
29506 |
+#: ../../WINGs/wcolorpanel.c:1032 |
29507 |
msgid "New from File..." |
29508 |
msgstr "Neu aus Datei..." |
29509 |
|
29510 |
-#: ../../WINGs/wcolorpanel.c:1028 ../../WINGs/wcolorpanel.c:1076 |
29511 |
-#: ../../WINGs/wcolorpanel.c:1093 |
29512 |
+#: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081 |
29513 |
+#: ../../WINGs/wcolorpanel.c:1098 |
29514 |
msgid "Rename..." |
29515 |
msgstr "Umbenennen..." |
29516 |
|
29517 |
-#: ../../WINGs/wcolorpanel.c:1029 ../../WINGs/wcolorpanel.c:1077 |
29518 |
-#: ../../WINGs/wcolorpanel.c:1094 ../../WINGs/wcolorpanel.c:3321 |
29519 |
+#: ../../WINGs/wcolorpanel.c:1034 ../../WINGs/wcolorpanel.c:1082 |
29520 |
+#: ../../WINGs/wcolorpanel.c:1099 ../../WINGs/wcolorpanel.c:3326 |
29521 |
msgid "Remove" |
29522 |
msgstr "Entfernen" |
29523 |
|
29524 |
-#: ../../WINGs/wcolorpanel.c:1030 |
29525 |
+#: ../../WINGs/wcolorpanel.c:1035 |
29526 |
msgid "Copy" |
29527 |
msgstr "Kopieren" |
29528 |
|
29529 |
-#: ../../WINGs/wcolorpanel.c:1031 |
29530 |
+#: ../../WINGs/wcolorpanel.c:1036 |
29531 |
msgid "New from Clipboard" |
29532 |
msgstr "Neu aus Zwischenablage" |
29533 |
|
29534 |
-#: ../../WINGs/wcolorpanel.c:1052 |
29535 |
+#: ../../WINGs/wcolorpanel.c:1057 |
29536 |
msgid "X11-Colors" |
29537 |
msgstr "X11-Farben" |
29538 |
|
29539 |
-#: ../../WINGs/wcolorpanel.c:1069 |
29540 |
+#: ../../WINGs/wcolorpanel.c:1074 |
29541 |
msgid "Color" |
29542 |
msgstr "Farbe" |
29543 |
|
29544 |
-#: ../../WINGs/wcolorpanel.c:1075 |
29545 |
+#: ../../WINGs/wcolorpanel.c:1080 |
29546 |
msgid "Add..." |
29547 |
msgstr "Hinzufügen..." |
29548 |
|
29549 |
-#: ../../WINGs/wcolorpanel.c:1085 |
29550 |
+#: ../../WINGs/wcolorpanel.c:1090 |
29551 |
msgid "List" |
29552 |
msgstr "Liste" |
29553 |
|
29554 |
-#: ../../WINGs/wcolorpanel.c:1092 |
29555 |
+#: ../../WINGs/wcolorpanel.c:1097 |
29556 |
msgid "New..." |
29557 |
msgstr "Neu..." |
29558 |
|
29559 |
-#: ../../WINGs/wcolorpanel.c:1231 |
29560 |
+#: ../../WINGs/wcolorpanel.c:1236 |
29561 |
#, c-format |
29562 |
-msgid "" |
29563 |
-"Color Panel: Could not create directory %s needed to store configurations" |
29564 |
-msgstr "" |
29565 |
-"Color Panel: Konnte das Verzeichnis %s zum Speichern der Konfiguration nicht erzeugen" |
29566 |
+msgid "Color Panel: Could not create directory %s needed to store configurations" |
29567 |
+msgstr "Farb-Panel: Verzeichnis %s konnte zum Speichern der Konfiguration nicht erzeugt werden" |
29568 |
|
29569 |
#. Delete the file, it doesn't belong here |
29570 |
-#: ../../WINGs/wcolorpanel.c:1237 ../../WINGs/wcolorpanel.c:3207 |
29571 |
-#: ../../WINGs/wcolorpanel.c:3211 |
29572 |
+#: ../../WINGs/wcolorpanel.c:1242 ../../WINGs/wcolorpanel.c:3212 |
29573 |
+#: ../../WINGs/wcolorpanel.c:3216 |
29574 |
msgid "File Error" |
29575 |
msgstr "Dateifehler" |
29576 |
|
29577 |
-#: ../../WINGs/wcolorpanel.c:1238 |
29578 |
+#: ../../WINGs/wcolorpanel.c:1243 |
29579 |
msgid "Could not create ColorPanel configuration directory" |
29580 |
-msgstr "Konnte Konfigurationsverzeichnis für Farbdialog nicht erzeugen" |
29581 |
+msgstr "Konfigurationsverzeichnis für Farb-Panel konnte nicht erzeugt werden" |
29582 |
|
29583 |
-#: ../../WINGs/wcolorpanel.c:1239 ../../WINGs/wcolorpanel.c:3208 |
29584 |
-#: ../../WINGs/wcolorpanel.c:3213 ../../WINGs/wcolorpanel.c:3240 |
29585 |
-#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:647 |
29586 |
-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760 |
29587 |
-#: ../../WINGs/wfilepanel.c:971 ../../WINGs/wfontpanel.c:709 |
29588 |
+#: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213 |
29589 |
+#: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245 |
29590 |
+#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:650 |
29591 |
+#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763 |
29592 |
+#: ../../WINGs/wfilepanel.c:974 ../../WINGs/wfontpanel.c:591 |
29593 |
msgid "OK" |
29594 |
-msgstr "OK" |
29595 |
+msgstr "" |
29596 |
|
29597 |
-#: ../../WINGs/wcolorpanel.c:1245 ../../WINGs/wcolorpanel.c:1281 |
29598 |
-#: ../../WINGs/wcolorpanel.c:1299 |
29599 |
+#: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286 |
29600 |
+#: ../../WINGs/wcolorpanel.c:1304 |
29601 |
msgid "Color Panel: Could not find file" |
29602 |
-msgstr "Color Panel: Konnte Datei nicht finden" |
29603 |
+msgstr "Farb-Panel: Datei konnte nicht gefunden werden" |
29604 |
|
29605 |
-#: ../../WINGs/wcolorpanel.c:1486 ../../WINGs/wcolorpanel.c:1551 |
29606 |
-#: ../../WINGs/wcolorpanel.c:1615 |
29607 |
+#: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556 |
29608 |
+#: ../../WINGs/wcolorpanel.c:1620 |
29609 |
msgid "Color Panel: X failed request" |
29610 |
-msgstr "Color Panel: X Anfrage schlug fehl" |
29611 |
+msgstr "Farb-Panel: X-Anfrage fehlgeschlagen" |
29612 |
|
29613 |
-#: ../../WINGs/wcolorpanel.c:2860 |
29614 |
+#: ../../WINGs/wcolorpanel.c:2865 |
29615 |
msgid "Saturation" |
29616 |
msgstr "Sättigung" |
29617 |
|
29618 |
-#: ../../WINGs/wcolorpanel.c:2896 |
29619 |
+#: ../../WINGs/wcolorpanel.c:2901 |
29620 |
msgid "Hue" |
29621 |
msgstr "Farbton" |
29622 |
|
29623 |
-#: ../../WINGs/wcolorpanel.c:3146 |
29624 |
+#: ../../WINGs/wcolorpanel.c:3151 |
29625 |
msgid "Open Palette" |
29626 |
msgstr "Palette öffnen" |
29627 |
|
29628 |
-#: ../../WINGs/wcolorpanel.c:3208 |
29629 |
+#: ../../WINGs/wcolorpanel.c:3213 |
29630 |
msgid "Invalid file format !" |
29631 |
msgstr "Ungültiges Dateiformat!" |
29632 |
|
29633 |
-#: ../../WINGs/wcolorpanel.c:3210 |
29634 |
+#: ../../WINGs/wcolorpanel.c:3215 |
29635 |
#, c-format |
29636 |
msgid "can't remove file %s" |
29637 |
-msgstr "kann Datei %s nicht entfernen" |
29638 |
+msgstr "Datei %s konnte nicht entfert werden" |
29639 |
|
29640 |
-#: ../../WINGs/wcolorpanel.c:3212 |
29641 |
+#: ../../WINGs/wcolorpanel.c:3217 |
29642 |
msgid "Couldn't remove file from Configuration Directory !" |
29643 |
-msgstr "Konnte Datei nicht aus Konfigurationsverzeichnis entfernen!" |
29644 |
+msgstr "Datei konnte nicht aus Konfigurationsverzeichnis entfernt werden!" |
29645 |
|
29646 |
-#: ../../WINGs/wcolorpanel.c:3239 |
29647 |
+#: ../../WINGs/wcolorpanel.c:3244 |
29648 |
msgid "Rename" |
29649 |
msgstr "Umbenennen" |
29650 |
|
29651 |
-#: ../../WINGs/wcolorpanel.c:3239 |
29652 |
+#: ../../WINGs/wcolorpanel.c:3244 |
29653 |
msgid "Rename palette to:" |
29654 |
msgstr "Palette umbenennen in:" |
29655 |
|
29656 |
-#: ../../WINGs/wcolorpanel.c:3240 ../../WINGs/wfilepanel.c:259 |
29657 |
-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760 |
29658 |
+#: ../../WINGs/wcolorpanel.c:3245 ../../WINGs/wfilepanel.c:259 |
29659 |
+#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763 |
29660 |
msgid "Cancel" |
29661 |
msgstr "Abbrechen" |
29662 |
|
29663 |
#. Careful, this palette exists already |
29664 |
-#: ../../WINGs/wcolorpanel.c:3256 ../../WINGs/wfilepanel.c:760 |
29665 |
+#: ../../WINGs/wcolorpanel.c:3261 ../../WINGs/wfilepanel.c:763 |
29666 |
msgid "Warning" |
29667 |
msgstr "Warnung" |
29668 |
|
29669 |
-#: ../../WINGs/wcolorpanel.c:3257 |
29670 |
+#: ../../WINGs/wcolorpanel.c:3262 |
29671 |
msgid "" |
29672 |
"Palette already exists !\n" |
29673 |
"\n" |
29674 |
@@ -393,24 +401,24 @@ |
29675 |
"\n" |
29676 |
"Ãberschreiben?" |
29677 |
|
29678 |
-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321 |
29679 |
+#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326 |
29680 |
msgid "No" |
29681 |
msgstr "Nein" |
29682 |
|
29683 |
-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321 |
29684 |
+#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326 |
29685 |
msgid "Yes" |
29686 |
msgstr "Ja" |
29687 |
|
29688 |
-#: ../../WINGs/wcolorpanel.c:3289 |
29689 |
+#: ../../WINGs/wcolorpanel.c:3294 |
29690 |
#, c-format |
29691 |
msgid "Couldn't rename palette %s to %s\n" |
29692 |
-msgstr "Konnte Palette %s nicht in %s umbenennen\n" |
29693 |
+msgstr "Palette %s konnte nicht nach %s umbenannt werden\n" |
29694 |
|
29695 |
-#: ../../WINGs/wcolorpanel.c:3315 |
29696 |
+#: ../../WINGs/wcolorpanel.c:3320 |
29697 |
msgid "This will permanently remove the palette " |
29698 |
-msgstr "Das wird die Palette unwiderruflich löschen " |
29699 |
+msgstr "Hiermit wird die Palette unwiderruflich gelöscht " |
29700 |
|
29701 |
-#: ../../WINGs/wcolorpanel.c:3318 |
29702 |
+#: ../../WINGs/wcolorpanel.c:3323 |
29703 |
msgid "" |
29704 |
".\n" |
29705 |
"\n" |
29706 |
@@ -420,29 +428,29 @@ |
29707 |
"\n" |
29708 |
"Sind Sie sicher, dass Sie die Palette löschen wollen?" |
29709 |
|
29710 |
-#: ../../WINGs/wcolorpanel.c:3343 |
29711 |
+#: ../../WINGs/wcolorpanel.c:3348 |
29712 |
#, c-format |
29713 |
msgid "Couldn't remove palette %s\n" |
29714 |
-msgstr "Konnte Palette %s nicht löschen\n" |
29715 |
+msgstr "Palette %s konnte nicht gelöscht werden\n" |
29716 |
|
29717 |
-#: ../../WINGs/wcolorpanel.c:3648 |
29718 |
+#: ../../WINGs/wcolorpanel.c:3647 |
29719 |
#, c-format |
29720 |
msgid "Could not open %s" |
29721 |
-msgstr "Konnte %s nicht öffnen" |
29722 |
+msgstr "%s konnte nicht geöffnet werden" |
29723 |
|
29724 |
-#: ../../WINGs/wcolorpanel.c:3655 |
29725 |
+#: ../../WINGs/wcolorpanel.c:3654 |
29726 |
#, c-format |
29727 |
msgid "Could not create %s" |
29728 |
-msgstr "Konnte %s nicht erzeugen" |
29729 |
+msgstr "%s konnte nicht erzeugt werden" |
29730 |
|
29731 |
-#: ../../WINGs/wcolorpanel.c:3666 |
29732 |
+#: ../../WINGs/wcolorpanel.c:3665 |
29733 |
#, c-format |
29734 |
msgid "Write error on file %s" |
29735 |
msgstr "Schreibfehler bei Datei %s" |
29736 |
|
29737 |
-#: ../../WINGs/wcolorpanel.c:3711 |
29738 |
+#: ../../WINGs/wcolorpanel.c:3710 |
29739 |
msgid "Color Panel: Color unspecified" |
29740 |
-msgstr "Color Panel: Farbe nicht spezifiziert" |
29741 |
+msgstr "Farb-Panel: Farbe nicht spezifiziert" |
29742 |
|
29743 |
#: ../../WINGs/wfilepanel.c:235 |
29744 |
msgid "Name:" |
29745 |
@@ -456,208 +464,164 @@ |
29746 |
msgid "Save" |
29747 |
msgstr "Speichern" |
29748 |
|
29749 |
-#: ../../WINGs/wfilepanel.c:562 |
29750 |
+#: ../../WINGs/wfilepanel.c:565 |
29751 |
#, c-format |
29752 |
msgid "WINGs: could not open directory %s\n" |
29753 |
-msgstr "WINGs: Konnte Verzeichnis %s nicht öffen\n" |
29754 |
+msgstr "WINGs: Verzeichnis %s konnte nicht geöffnet werden\n" |
29755 |
|
29756 |
-#: ../../WINGs/wfilepanel.c:580 |
29757 |
+#: ../../WINGs/wfilepanel.c:583 |
29758 |
#, c-format |
29759 |
msgid "WINGs: could not stat %s\n" |
29760 |
-msgstr "WINGs: Dateistatus von %s nicht bestimmbar\n" |
29761 |
+msgstr "WINGs: Dateistatus von %s unbestimmbar\n" |
29762 |
|
29763 |
-#: ../../WINGs/wfilepanel.c:647 ../../WINGs/wfilepanel.c:970 |
29764 |
-#: ../../WINGs/wfontpanel.c:708 |
29765 |
+#: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973 |
29766 |
+#: ../../WINGs/wfontpanel.c:590 |
29767 |
msgid "Error" |
29768 |
msgstr "Fehler" |
29769 |
|
29770 |
-#: ../../WINGs/wfilepanel.c:658 |
29771 |
+#: ../../WINGs/wfilepanel.c:661 |
29772 |
msgid "Create Directory" |
29773 |
msgstr "Verzeichnis anlegen" |
29774 |
|
29775 |
-#: ../../WINGs/wfilepanel.c:659 |
29776 |
+#: ../../WINGs/wfilepanel.c:662 |
29777 |
msgid "Enter directory name" |
29778 |
msgstr "Verzeichnisname eingeben" |
29779 |
|
29780 |
-#: ../../WINGs/wfilepanel.c:695 ../../WINGs/wfilepanel.c:734 |
29781 |
-#: ../../WINGs/wfilepanel.c:765 ../../WINGs/wfilepanel.c:793 |
29782 |
+#: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737 |
29783 |
+#: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796 |
29784 |
msgid "Permission denied." |
29785 |
msgstr "Zugriff verweigert." |
29786 |
|
29787 |
-#: ../../WINGs/wfilepanel.c:698 |
29788 |
+#: ../../WINGs/wfilepanel.c:701 |
29789 |
#, c-format |
29790 |
msgid "'%s' already exists." |
29791 |
msgstr "'%s' existiert bereits." |
29792 |
|
29793 |
-#: ../../WINGs/wfilepanel.c:701 |
29794 |
+#: ../../WINGs/wfilepanel.c:704 |
29795 |
msgid "Path does not exist." |
29796 |
msgstr "Pfad existiert nicht." |
29797 |
|
29798 |
-#: ../../WINGs/wfilepanel.c:731 ../../WINGs/wfilepanel.c:790 |
29799 |
+#: ../../WINGs/wfilepanel.c:734 ../../WINGs/wfilepanel.c:793 |
29800 |
#, c-format |
29801 |
msgid "'%s' does not exist." |
29802 |
msgstr "'%s' existiert nicht." |
29803 |
|
29804 |
-#: ../../WINGs/wfilepanel.c:738 ../../WINGs/wfilepanel.c:797 |
29805 |
+#: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800 |
29806 |
msgid "Insufficient memory available." |
29807 |
msgstr "Nicht genügend Speicher verfügbar." |
29808 |
|
29809 |
-#: ../../WINGs/wfilepanel.c:742 ../../WINGs/wfilepanel.c:801 |
29810 |
+#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804 |
29811 |
#, c-format |
29812 |
msgid "'%s' is on a read-only filesystem." |
29813 |
-msgstr "'%s' liegt auf einem read-only Dateisystem." |
29814 |
+msgstr "'%s' liegt auf einem nur lesbaren Dateisystem." |
29815 |
|
29816 |
-#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:777 |
29817 |
-#: ../../WINGs/wfilepanel.c:804 |
29818 |
+#: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780 |
29819 |
+#: ../../WINGs/wfilepanel.c:807 |
29820 |
#, c-format |
29821 |
msgid "Can not delete '%s'." |
29822 |
msgstr "Kann %s nicht löschen." |
29823 |
|
29824 |
-#: ../../WINGs/wfilepanel.c:752 |
29825 |
+#: ../../WINGs/wfilepanel.c:755 |
29826 |
#, c-format |
29827 |
msgid "Delete directory %s ?" |
29828 |
-msgstr "Verzeichnis % s löschen?" |
29829 |
+msgstr "Verzeichnis %s löschen?" |
29830 |
|
29831 |
-#: ../../WINGs/wfilepanel.c:756 |
29832 |
+#: ../../WINGs/wfilepanel.c:759 |
29833 |
#, c-format |
29834 |
msgid "Delete file %s ?" |
29835 |
msgstr "Datei %s löschen?" |
29836 |
|
29837 |
-#: ../../WINGs/wfilepanel.c:768 |
29838 |
+#: ../../WINGs/wfilepanel.c:771 |
29839 |
#, c-format |
29840 |
msgid "Directory '%s' does not exist." |
29841 |
msgstr "Verzeichnis '%s' existiert nicht." |
29842 |
|
29843 |
-#: ../../WINGs/wfilepanel.c:771 |
29844 |
+#: ../../WINGs/wfilepanel.c:774 |
29845 |
#, c-format |
29846 |
msgid "Directory '%s' is not empty." |
29847 |
msgstr "Verzeichnis '%s' ist nicht leer." |
29848 |
|
29849 |
-#: ../../WINGs/wfilepanel.c:774 |
29850 |
+#: ../../WINGs/wfilepanel.c:777 |
29851 |
#, c-format |
29852 |
msgid "Directory '%s' is busy." |
29853 |
-msgstr "Verzeichnis '%s' ist belegt." |
29854 |
+msgstr "Verzeichnis '%s' wird benutz." |
29855 |
|
29856 |
-#: ../../WINGs/wfilepanel.c:787 |
29857 |
+#: ../../WINGs/wfilepanel.c:790 |
29858 |
#, c-format |
29859 |
msgid "'%s' is a directory." |
29860 |
msgstr "'%s' ist ein Verzeichnis." |
29861 |
|
29862 |
-#: ../../WINGs/wfilepanel.c:829 |
29863 |
+#: ../../WINGs/wfilepanel.c:832 |
29864 |
#, c-format |
29865 |
msgid "An error occured browsing '%s'." |
29866 |
msgstr "Fehler beim Lesen von '%s'." |
29867 |
|
29868 |
-#: ../../WINGs/wfilepanel.c:833 |
29869 |
+#: ../../WINGs/wfilepanel.c:836 |
29870 |
#, c-format |
29871 |
msgid "'%s' is not a directory." |
29872 |
msgstr "'%s' ist kein Verzeichnis." |
29873 |
|
29874 |
-#: ../../WINGs/wfilepanel.c:970 |
29875 |
+#: ../../WINGs/wfilepanel.c:973 |
29876 |
msgid "File does not exist." |
29877 |
msgstr "Datei existiert nicht." |
29878 |
|
29879 |
-#: ../../WINGs/wfont.c:129 |
29880 |
+#: ../../WINGs/wfont.c:40 |
29881 |
#, c-format |
29882 |
-msgid "the following character sets are missing in %s:" |
29883 |
-msgstr "die folgenden Zeichensätze fehlen in %s:" |
29884 |
+msgid "invalid font: %s. Trying '%s'" |
29885 |
+msgstr "Ungültige Schriftart: %s. Wird ersetzt durch %s." |
29886 |
|
29887 |
-#: ../../WINGs/wfont.c:136 |
29888 |
+#: ../../WINGs/wfont.c:257 ../../WINGs/wfont.c:277 |
29889 |
#, c-format |
29890 |
-msgid "" |
29891 |
-"the string \"%s\" will be used in place of any characters from those sets." |
29892 |
-msgstr "" |
29893 |
-"die Zeichenkette \"%s\" ersetzt alle anderen Zeichen dieser Zeichensätze." |
29894 |
+msgid "could not load font: %s." |
29895 |
+msgstr "Schriftart konnte nicht geladen werden: %s" |
29896 |
|
29897 |
-#: ../../WINGs/wfont.c:287 ../../WINGs/wfont.c:323 |
29898 |
-#, c-format |
29899 |
-msgid "could not load font set %s. Trying fixed." |
29900 |
-msgstr "konnte Fonts %s nicht laden. Nehme fixed-Font." |
29901 |
+#. WMSetWidgetBackgroundColor(panel->win, WMWhiteColor(scr)); |
29902 |
+#: ../../WINGs/wfontpanel.c:203 |
29903 |
+msgid "Font Panel" |
29904 |
+msgstr "Schrift-Panel" |
29905 |
|
29906 |
-#: ../../WINGs/wfont.c:293 ../../WINGs/wfont.c:329 |
29907 |
-#, c-format |
29908 |
-msgid "could not load font %s. Trying fixed." |
29909 |
-msgstr "Konnte Font %s nicht laden. Nehme fixed-Font." |
29910 |
- |
29911 |
-#: ../../WINGs/wfont.c:297 ../../WINGs/wfont.c:333 |
29912 |
-msgid "could not load fixed font!" |
29913 |
-msgstr "konnte fixed-Font nicht laden!" |
29914 |
- |
29915 |
-#: ../../WINGs/wfont.c:428 |
29916 |
-#, c-format |
29917 |
-msgid "font description %s is too large." |
29918 |
-msgstr "Fontbeschreibung %s ist zu groÃ." |
29919 |
- |
29920 |
-#: ../../WINGs/wfontpanel.c:205 |
29921 |
-msgid "Test!!!" |
29922 |
-msgstr "Test!" |
29923 |
+#: ../../WINGs/wfontpanel.c:239 |
29924 |
+msgid "The quick brown fox jumps over the lazy dog" |
29925 |
+msgstr "" |
29926 |
|
29927 |
-#: ../../WINGs/wfontpanel.c:211 |
29928 |
+#: ../../WINGs/wfontpanel.c:245 |
29929 |
msgid "Family" |
29930 |
msgstr "Familie" |
29931 |
|
29932 |
-#: ../../WINGs/wfontpanel.c:222 |
29933 |
+#: ../../WINGs/wfontpanel.c:256 |
29934 |
msgid "Typeface" |
29935 |
msgstr "Schriftart" |
29936 |
|
29937 |
-#: ../../WINGs/wfontpanel.c:233 |
29938 |
+#: ../../WINGs/wfontpanel.c:267 |
29939 |
msgid "Size" |
29940 |
msgstr "GröÃe" |
29941 |
|
29942 |
-#: ../../WINGs/wfontpanel.c:252 |
29943 |
+#: ../../WINGs/wfontpanel.c:286 |
29944 |
msgid "Set" |
29945 |
msgstr "Setzen" |
29946 |
|
29947 |
-#: ../../WINGs/wfontpanel.c:257 |
29948 |
+#: ../../WINGs/wfontpanel.c:292 |
29949 |
msgid "Revert" |
29950 |
-msgstr "Zurückn." |
29951 |
+msgstr "Zurücksetzen" |
29952 |
|
29953 |
-#: ../../WINGs/wfontpanel.c:709 |
29954 |
-msgid "Could not retrieve font list" |
29955 |
-msgstr "Konnte Fontliste nicht wiederherstellen" |
29956 |
+#: ../../WINGs/wfontpanel.c:591 |
29957 |
+msgid "Could not init font config library\n" |
29958 |
+msgstr "\"font-config\"-Bibliothek konnte nicht initialisiert werden\n" |
29959 |
|
29960 |
-#: ../../WINGs/wfontpanel.c:721 |
29961 |
-#, c-format |
29962 |
-msgid "font name %s is longer than 256, which is invalid." |
29963 |
-msgstr "Fontname %s ist ungültig, da länger als 256 Zeichen." |
29964 |
- |
29965 |
-#: ../../WINGs/wfontpanel.c:868 |
29966 |
-msgid "Roman" |
29967 |
-msgstr "Roman" |
29968 |
- |
29969 |
-#: ../../WINGs/wfontpanel.c:871 |
29970 |
-msgid "Italic" |
29971 |
-msgstr "Kursiv" |
29972 |
- |
29973 |
-#: ../../WINGs/wfontpanel.c:873 |
29974 |
-msgid "Oblique" |
29975 |
-msgstr "Schräg" |
29976 |
- |
29977 |
-#: ../../WINGs/wfontpanel.c:875 |
29978 |
-msgid "Rev Italic" |
29979 |
-msgstr "" |
29980 |
- |
29981 |
-#: ../../WINGs/wfontpanel.c:877 |
29982 |
-msgid "Rev Oblique" |
29983 |
-msgstr "" |
29984 |
- |
29985 |
-#: ../../WINGs/wfontpanel.c:883 |
29986 |
-msgid "Normal" |
29987 |
-msgstr "Normal" |
29988 |
- |
29989 |
-#: ../../WINGs/widgets.c:415 |
29990 |
+#: ../../WINGs/widgets.c:419 |
29991 |
#, c-format |
29992 |
msgid "WINGs: could not load widget images file: %s" |
29993 |
-msgstr "WINGs: Konnte Widget-Bildatei %s nicht laden." |
29994 |
+msgstr "WINGs: Widget-Bilderdatei konnte nicht geladen werden: %s" |
29995 |
|
29996 |
-#: ../../WINGs/widgets.c:763 |
29997 |
+#: ../../WINGs/widgets.c:767 |
29998 |
msgid "" |
29999 |
-"could not load any fonts. Make sure your font installationand locale " |
30000 |
+"could not load any fonts. Make sure your font installation and locale " |
30001 |
"settings are correct." |
30002 |
msgstr "" |
30003 |
-"Konnte keine Fonts laden. Ãberprüfen Sie, ob Ihre Fontinstallation und " |
30004 |
-"-einstellungen korrekt sind." |
30005 |
+"Keine Schrifen konnten geladen werden. Ãberprüfen Sie, ob Ihre Schrifteninstallation und -" |
30006 |
+"Lokalisierungseinstellungen korrekt sind." |
30007 |
|
30008 |
-#: ../../WINGs/wruler.c:189 |
30009 |
+#: ../../WINGs/wruler.c:192 |
30010 |
msgid "0 inches" |
30011 |
msgstr "0 Inch" |
30012 |
+ |
30013 |
diff -uhrN WindowMaker-0.92.0/WINGs/selection.c WindowMaker-CVS-20060123/WINGs/selection.c |
30014 |
--- WindowMaker-0.92.0/WINGs/selection.c 2004-10-12 20:31:44.000000000 +0200 |
30015 |
+++ WindowMaker-CVS-20060123/WINGs/selection.c 2005-08-23 00:12:16.000000000 +0200 |
30016 |
@@ -279,7 +279,7 @@ |
30017 |
WMData *wdata; |
30018 |
unsigned char *data; |
30019 |
Atom rtype; |
30020 |
- unsigned bits, bpi; |
30021 |
+ int bits, bpi; |
30022 |
unsigned long len, bytes; |
30023 |
|
30024 |
|
30025 |
diff -uhrN WindowMaker-0.92.0/WINGs/wapplication.c WindowMaker-CVS-20060123/WINGs/wapplication.c |
30026 |
--- WindowMaker-0.92.0/WINGs/wapplication.c 2004-10-24 05:13:29.000000000 +0200 |
30027 |
+++ WindowMaker-CVS-20060123/WINGs/wapplication.c 2005-07-17 20:33:09.000000000 +0200 |
30028 |
@@ -181,7 +181,6 @@ |
30029 |
return path; |
30030 |
} |
30031 |
|
30032 |
- |
30033 |
if (getenv("GNUSTEP_SYSTEM_ROOT")) { |
30034 |
path = checkFile(getenv("GNUSTEP_SYSTEM_ROOT"), appdir, ext, resource); |
30035 |
if (path) { |
30036 |
diff -uhrN WindowMaker-0.92.0/WINGs/wbrowser.c WindowMaker-CVS-20060123/WINGs/wbrowser.c |
30037 |
--- WindowMaker-0.92.0/WINGs/wbrowser.c 2004-10-12 22:43:22.000000000 +0200 |
30038 |
+++ WindowMaker-CVS-20060123/WINGs/wbrowser.c 2006-01-22 16:47:25.000000000 +0100 |
30039 |
@@ -188,7 +188,7 @@ |
30040 |
int curMaxVisibleColumns; |
30041 |
int newFirstVisibleColumn = 0; |
30042 |
|
30043 |
- assert ((int) bPtr); |
30044 |
+ assert (bPtr != NULL); |
30045 |
|
30046 |
columns = (columns < MIN_VISIBLE_COLUMNS) ? MIN_VISIBLE_COLUMNS : columns; |
30047 |
columns = (columns > MAX_VISIBLE_COLUMNS) ? MAX_VISIBLE_COLUMNS : columns; |
30048 |
@@ -324,7 +324,7 @@ |
30049 |
WMList **clist; |
30050 |
char **tlist; |
30051 |
|
30052 |
- assert ((int) bPtr); |
30053 |
+ assert (bPtr != NULL); |
30054 |
|
30055 |
column = (column < 0) ? 0 : column; |
30056 |
if (column >= bPtr->columnCount) { |
30057 |
diff -uhrN WindowMaker-0.92.0/WINGs/wcolor.c WindowMaker-CVS-20060123/WINGs/wcolor.c |
30058 |
--- WindowMaker-0.92.0/WINGs/wcolor.c 2004-10-25 03:48:39.000000000 +0200 |
30059 |
+++ WindowMaker-CVS-20060123/WINGs/wcolor.c 2005-08-23 00:36:29.000000000 +0200 |
30060 |
@@ -7,12 +7,12 @@ |
30061 |
|
30062 |
#define LIGHT_STIPPLE_WIDTH 4 |
30063 |
#define LIGHT_STIPPLE_HEIGHT 4 |
30064 |
-static unsigned char LIGHT_STIPPLE_BITS[] = { |
30065 |
+static char LIGHT_STIPPLE_BITS[] = { |
30066 |
0x05, 0x0a, 0x05, 0x0a}; |
30067 |
|
30068 |
#define DARK_STIPPLE_WIDTH 4 |
30069 |
#define DARK_STIPPLE_HEIGHT 4 |
30070 |
-static unsigned char DARK_STIPPLE_BITS[] = { |
30071 |
+static char DARK_STIPPLE_BITS[] = { |
30072 |
0x0a, 0x04, 0x0a, 0x01}; |
30073 |
|
30074 |
|
30075 |
diff -uhrN WindowMaker-0.92.0/WINGs/wfont.c WindowMaker-CVS-20060123/WINGs/wfont.c |
30076 |
--- WindowMaker-0.92.0/WINGs/wfont.c 2004-10-30 08:29:25.000000000 +0200 |
30077 |
+++ WindowMaker-CVS-20060123/WINGs/wfont.c 2005-08-23 01:22:44.000000000 +0200 |
30078 |
@@ -27,7 +27,7 @@ |
30079 |
/* Just skip old font names that contain %d in them. |
30080 |
* We don't support that anymore. */ |
30081 |
if (strchr(xlfd, '%')!=NULL) |
30082 |
- return FcNameParse(DEFAULT_FONT); |
30083 |
+ return FcNameParse((FcChar8*)DEFAULT_FONT); |
30084 |
|
30085 |
fname= wstrdup(xlfd); |
30086 |
if ((ptr = strchr(fname, ','))) { |
30087 |
@@ -38,7 +38,7 @@ |
30088 |
|
30089 |
if (!pattern) { |
30090 |
wwarning(_("invalid font: %s. Trying '%s'"), xlfd, DEFAULT_FONT); |
30091 |
- pattern = FcNameParse(DEFAULT_FONT); |
30092 |
+ pattern = FcNameParse((FcChar8*)DEFAULT_FONT); |
30093 |
} |
30094 |
|
30095 |
return pattern; |
30096 |
@@ -52,7 +52,7 @@ |
30097 |
char *fname; |
30098 |
|
30099 |
pattern = xlfdToFcPattern(xlfd); |
30100 |
- fname = FcNameUnparse(pattern); |
30101 |
+ fname = (char*)FcNameUnparse(pattern); |
30102 |
FcPatternDestroy(pattern); |
30103 |
|
30104 |
return fname; |
30105 |
@@ -102,7 +102,7 @@ |
30106 |
if (font[0]=='-') { |
30107 |
pattern = xlfdToFcPattern(font); |
30108 |
} else { |
30109 |
- pattern = FcNameParse(font); |
30110 |
+ pattern = FcNameParse((FcChar8*)font); |
30111 |
} |
30112 |
|
30113 |
/*FcPatternPrint(pattern);*/ |
30114 |
@@ -116,12 +116,12 @@ |
30115 |
} |
30116 |
|
30117 |
if (fallback && !hasPropertyWithStringValue(pattern, FC_FAMILY, fallback)) { |
30118 |
- FcPatternAddString(pattern, FC_FAMILY, fallback); |
30119 |
+ FcPatternAddString(pattern, FC_FAMILY, (FcChar8*)fallback); |
30120 |
} |
30121 |
|
30122 |
/*FcPatternPrint(pattern);*/ |
30123 |
|
30124 |
- result = FcNameUnparse(pattern); |
30125 |
+ result = (char*)FcNameUnparse(pattern); |
30126 |
FcPatternDestroy(pattern); |
30127 |
|
30128 |
return result; |
30129 |
@@ -366,7 +366,7 @@ |
30130 |
* return the closest match font to what we requested which is the |
30131 |
* oblique font. Same goes for using bold for weight. |
30132 |
*/ |
30133 |
- pattern = FcNameParse(WMGetFontName(font)); |
30134 |
+ pattern = FcNameParse((FcChar8*)WMGetFontName(font)); |
30135 |
switch (style) { |
30136 |
case WFSNormal: |
30137 |
FcPatternDel(pattern, FC_WEIGHT); |
30138 |
@@ -374,21 +374,21 @@ |
30139 |
break; |
30140 |
case WFSBold: |
30141 |
FcPatternDel(pattern, FC_WEIGHT); |
30142 |
- FcPatternAddString(pattern, FC_WEIGHT, "bold"); |
30143 |
+ FcPatternAddString(pattern, FC_WEIGHT, (FcChar8*)"bold"); |
30144 |
break; |
30145 |
case WFSItalic: |
30146 |
FcPatternDel(pattern, FC_SLANT); |
30147 |
- FcPatternAddString(pattern, FC_SLANT, "italic"); |
30148 |
+ FcPatternAddString(pattern, FC_SLANT, (FcChar8*)"italic"); |
30149 |
break; |
30150 |
case WFSBoldItalic: |
30151 |
FcPatternDel(pattern, FC_WEIGHT); |
30152 |
FcPatternDel(pattern, FC_SLANT); |
30153 |
- FcPatternAddString(pattern, FC_WEIGHT, "bold"); |
30154 |
- FcPatternAddString(pattern, FC_SLANT, "italic"); |
30155 |
+ FcPatternAddString(pattern, FC_WEIGHT, (FcChar8*)"bold"); |
30156 |
+ FcPatternAddString(pattern, FC_SLANT, (FcChar8*)"italic"); |
30157 |
break; |
30158 |
} |
30159 |
|
30160 |
- name = FcNameUnparse(pattern); |
30161 |
+ name = (char*)FcNameUnparse(pattern); |
30162 |
copy = WMCreateFont(scrPtr, name); |
30163 |
FcPatternDestroy(pattern); |
30164 |
wfree(name); |
30165 |
diff -uhrN WindowMaker-0.92.0/WINGs/wfontpanel.c WindowMaker-CVS-20060123/WINGs/wfontpanel.c |
30166 |
--- WindowMaker-0.92.0/WINGs/wfontpanel.c 2004-10-23 04:44:17.000000000 +0200 |
30167 |
+++ WindowMaker-CVS-20060123/WINGs/wfontpanel.c 2005-08-23 01:12:49.000000000 +0200 |
30168 |
@@ -83,7 +83,7 @@ |
30169 |
|
30170 |
|
30171 |
|
30172 |
-static void setFontPanelFontName(FontPanel *panel, FcChar8 *family, FcChar8 *style, double size); |
30173 |
+static void setFontPanelFontName(FontPanel *panel, char *family, char *style, double size); |
30174 |
|
30175 |
static int isXLFD(char *font, int *length_ret); |
30176 |
|
30177 |
@@ -370,7 +370,7 @@ |
30178 |
|
30179 |
if (!isXLFD(fontName, &fname_len)) { |
30180 |
/* maybe its proper fontconfig and we can parse it */ |
30181 |
- pattern = FcNameParse(fontName); |
30182 |
+ pattern = FcNameParse((FcChar8*)fontName); |
30183 |
} else { |
30184 |
/* maybe its proper xlfd and we can convert it to an FcPattern */ |
30185 |
pattern = XftXlfdParse(fontName, False, False); |
30186 |
@@ -383,7 +383,7 @@ |
30187 |
if (FcPatternGetString(pattern, FC_FAMILY, 0, &family)==FcResultMatch) |
30188 |
if (FcPatternGetString(pattern, FC_STYLE, 0, &style)==FcResultMatch) |
30189 |
if (FcPatternGetDouble(pattern, "pixelsize", 0, &size)==FcResultMatch) |
30190 |
- setFontPanelFontName(panel, family, style, size); |
30191 |
+ setFontPanelFontName(panel, (char*)family, (char*)style, size); |
30192 |
|
30193 |
FcPatternDestroy(pattern); |
30194 |
} |
30195 |
@@ -603,7 +603,7 @@ |
30196 |
|
30197 |
if (FcPatternGetString(fs->fonts[i],FC_FAMILY,0,&family)==FcResultMatch) |
30198 |
if (FcPatternGetString(fs->fonts[i],FC_STYLE,0,&style)==FcResultMatch) |
30199 |
- addFontToXftFamily(families, family, style); |
30200 |
+ addFontToXftFamily(families, (char*)family, (char*)style); |
30201 |
} |
30202 |
FcFontSetDestroy(fs); |
30203 |
} |
30204 |
@@ -815,7 +815,7 @@ |
30205 |
|
30206 |
|
30207 |
static void |
30208 |
-setFontPanelFontName(FontPanel *panel, FcChar8 *family, FcChar8 *style, double size) |
30209 |
+setFontPanelFontName(FontPanel *panel, char *family, char *style, double size) |
30210 |
{ |
30211 |
int famrow; |
30212 |
int stlrow; |
30213 |
diff -uhrN WindowMaker-0.92.0/WINGs/widgets.c WindowMaker-CVS-20060123/WINGs/widgets.c |
30214 |
--- WindowMaker-0.92.0/WINGs/widgets.c 2004-10-28 04:15:54.000000000 +0200 |
30215 |
+++ WindowMaker-CVS-20060123/WINGs/widgets.c 2005-08-23 00:41:43.000000000 +0200 |
30216 |
@@ -305,7 +305,7 @@ |
30217 |
|
30218 |
#define STIPPLE_WIDTH 8 |
30219 |
#define STIPPLE_HEIGHT 8 |
30220 |
-static unsigned char STIPPLE_BITS[] = { |
30221 |
+static char STIPPLE_BITS[] = { |
30222 |
0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55 |
30223 |
}; |
30224 |
|
30225 |
diff -uhrN WindowMaker-0.92.0/WINGs/WINGs/WINGsP.h WindowMaker-CVS-20060123/WINGs/WINGs/WINGsP.h |
30226 |
--- WindowMaker-0.92.0/WINGs/WINGs/WINGsP.h 2004-10-30 08:32:50.000000000 +0200 |
30227 |
+++ WindowMaker-CVS-20060123/WINGs/WINGs/WINGsP.h 2006-01-22 21:18:55.000000000 +0100 |
30228 |
@@ -29,7 +29,7 @@ |
30229 |
|
30230 |
#define SCROLLER_WIDTH 20 |
30231 |
|
30232 |
-#define XDND_VERSION 4 |
30233 |
+#define XDND_VERSION 3 |
30234 |
|
30235 |
|
30236 |
typedef struct W_Application { |
30237 |
@@ -78,7 +78,7 @@ |
30238 |
|
30239 |
typedef struct W_FocusInfo { |
30240 |
struct W_View *toplevel; |
30241 |
- struct W_View *focused; /* view that has the focus in this toplevel */ |
30242 |
+ struct W_View *focused; /* view that has the focus in this toplevel */ |
30243 |
struct W_FocusInfo *next; |
30244 |
} W_FocusInfo; |
30245 |
|
30246 |
@@ -110,8 +110,10 @@ |
30247 |
|
30248 |
typedef struct W_DragDestinationInfo { |
30249 |
WMView *destView; |
30250 |
+ WMView *xdndAwareView; |
30251 |
Window sourceWindow; |
30252 |
W_DndState *state; |
30253 |
+ Bool sourceActionChanged; |
30254 |
WMArray *sourceTypes; |
30255 |
WMArray *requiredTypes; |
30256 |
Bool typeListAvailable; |
30257 |
@@ -120,7 +122,7 @@ |
30258 |
|
30259 |
|
30260 |
struct W_DraggingInfo { |
30261 |
- unsigned char protocolVersion; |
30262 |
+ unsigned char protocolVersion; /* version supported on the other side */ |
30263 |
Time timestamp; |
30264 |
|
30265 |
Atom sourceAction; |
30266 |
@@ -162,7 +164,7 @@ |
30267 |
|
30268 |
struct W_Window *windowList; /* list of windows in the app */ |
30269 |
|
30270 |
- Window groupLeader; /* the leader of the application */ |
30271 |
+ Window groupLeader; /* the leader of the application */ |
30272 |
/* also used for other things */ |
30273 |
|
30274 |
struct W_SelectionHandlers *selectionHandlerList; |
30275 |
@@ -195,11 +197,11 @@ |
30276 |
GC copyGC; |
30277 |
GC clipGC; |
30278 |
|
30279 |
- GC monoGC; /* GC for 1bpp visuals */ |
30280 |
+ GC monoGC; /* GC for 1bpp visuals */ |
30281 |
|
30282 |
GC xorGC; |
30283 |
|
30284 |
- GC ixorGC; /* IncludeInferiors XOR */ |
30285 |
+ GC ixorGC; /* IncludeInferiors XOR */ |
30286 |
|
30287 |
GC drawStringGC; /* for WMDrawString() */ |
30288 |
|
30289 |
@@ -276,15 +278,15 @@ |
30290 |
|
30291 |
Cursor invisibleCursor; |
30292 |
|
30293 |
- Atom attribsAtom; /* GNUstepWindowAttributes */ |
30294 |
+ Atom attribsAtom; /* GNUstepWindowAttributes */ |
30295 |
|
30296 |
- Atom deleteWindowAtom; /* WM_DELETE_WINDOW */ |
30297 |
+ Atom deleteWindowAtom; /* WM_DELETE_WINDOW */ |
30298 |
|
30299 |
- Atom protocolsAtom; /* _XA_WM_PROTOCOLS */ |
30300 |
+ Atom protocolsAtom; /* _XA_WM_PROTOCOLS */ |
30301 |
|
30302 |
- Atom clipboardAtom; /* CLIPBOARD */ |
30303 |
+ Atom clipboardAtom; /* CLIPBOARD */ |
30304 |
|
30305 |
- Atom xdndAwareAtom; /* XdndAware */ |
30306 |
+ Atom xdndAwareAtom; /* XdndAware */ |
30307 |
Atom xdndSelectionAtom; |
30308 |
Atom xdndEnterAtom; |
30309 |
Atom xdndLeaveAtom; |
30310 |
@@ -304,7 +306,7 @@ |
30311 |
|
30312 |
Atom wmIconDragOffsetAtom; |
30313 |
|
30314 |
- Atom wmStateAtom; /* WM_STATE */ |
30315 |
+ Atom wmStateAtom; /* WM_STATE */ |
30316 |
|
30317 |
Atom utf8String; |
30318 |
|
30319 |
@@ -313,8 +315,8 @@ |
30320 |
Atom netwmIcon; |
30321 |
|
30322 |
/* stuff for detecting double-clicks */ |
30323 |
- Time lastClickTime; /* time of last mousedown event */ |
30324 |
- Window lastClickWindow; /* window of the last mousedown */ |
30325 |
+ Time lastClickTime; /* time of last mousedown event */ |
30326 |
+ Window lastClickWindow; /* window of the last mousedown */ |
30327 |
|
30328 |
struct W_View *modalView; |
30329 |
unsigned modalLoop:1; |
30330 |
@@ -341,8 +343,7 @@ |
30331 |
typedef struct W_View { |
30332 |
struct W_Screen *screen; |
30333 |
|
30334 |
- WMWidget *self; /* must point to the widget the |
30335 |
- * view belongs to */ |
30336 |
+ WMWidget *self; /* must point to the widget the view belongs to */ |
30337 |
|
30338 |
W_ViewDelegate *delegate; |
30339 |
|
30340 |
@@ -362,18 +363,18 @@ |
30341 |
|
30342 |
struct W_View *nextResponder; /* next to receive keyboard events */ |
30343 |
|
30344 |
- struct W_View *parent; /* parent WMView */ |
30345 |
+ struct W_View *parent; /* parent WMView */ |
30346 |
|
30347 |
struct W_View *childrenList; /* first in list of child windows */ |
30348 |
|
30349 |
- struct W_View *nextSister; /* next on parent's children list */ |
30350 |
+ struct W_View *nextSister; /* next on parent's children list */ |
30351 |
|
30352 |
- WMArray *eventHandlers; /* event handlers for this window */ |
30353 |
+ WMArray *eventHandlers; /* event handlers for this window */ |
30354 |
|
30355 |
unsigned long attribFlags; |
30356 |
XSetWindowAttributes attribs; |
30357 |
|
30358 |
- void *hangedData; /* data holder for user program */ |
30359 |
+ void *hangedData; /* data holder for user program */ |
30360 |
|
30361 |
WMColor *backColor; |
30362 |
|
30363 |
@@ -391,9 +392,9 @@ |
30364 |
unsigned int realized:1; |
30365 |
unsigned int mapped:1; |
30366 |
unsigned int parentDying:1; |
30367 |
- unsigned int dying:1; /* the view is being destroyed */ |
30368 |
+ unsigned int dying:1; /* the view is being destroyed */ |
30369 |
unsigned int topLevel:1; /* is a top level window */ |
30370 |
- unsigned int root:1; /* is the root window */ |
30371 |
+ unsigned int root:1; /* is the root window */ |
30372 |
unsigned int mapWhenRealized:1; /* map the view when it's realized */ |
30373 |
unsigned int alreadyDead:1; /* view was freed */ |
30374 |
|
30375 |
diff -uhrN WindowMaker-0.92.0/WINGs/wtext.c WindowMaker-CVS-20060123/WINGs/wtext.c |
30376 |
--- WindowMaker-0.92.0/WINGs/wtext.c 2004-10-28 05:14:55.000000000 +0200 |
30377 |
+++ WindowMaker-CVS-20060123/WINGs/wtext.c 2006-01-22 16:47:25.000000000 +0100 |
30378 |
@@ -207,7 +207,7 @@ |
30379 |
|
30380 |
#define STIPPLE_WIDTH 8 |
30381 |
#define STIPPLE_HEIGHT 8 |
30382 |
-static unsigned char STIPPLE_BITS[] = { |
30383 |
+static char STIPPLE_BITS[] = { |
30384 |
0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa |
30385 |
}; |
30386 |
|
30387 |
@@ -1969,7 +1969,7 @@ |
30388 |
} else if(tb->used == 0) { |
30389 |
tb->blank = 1; |
30390 |
} else if(tb->graphic) { |
30391 |
- Bool hasNext = (Bool)(tb->next); |
30392 |
+ Bool hasNext = (tb->next != NULL); |
30393 |
|
30394 |
WMDestroyTextBlock(tPtr, WMRemoveTextBlock(tPtr)); |
30395 |
if(hasNext) { |
30396 |
diff -uhrN WindowMaker-0.92.0/WINGs/wview.c WindowMaker-CVS-20060123/WINGs/wview.c |
30397 |
--- WindowMaker-0.92.0/WINGs/wview.c 2004-10-28 04:41:04.000000000 +0200 |
30398 |
+++ WindowMaker-CVS-20060123/WINGs/wview.c 2006-01-22 19:08:39.000000000 +0100 |
30399 |
@@ -450,6 +450,9 @@ |
30400 |
|
30401 |
W_FreeViewXdndPart(view); |
30402 |
|
30403 |
+ if (view->backColor) |
30404 |
+ WMReleaseColor(view->backColor); |
30405 |
+ |
30406 |
wfree(view); |
30407 |
} |
30408 |
|
30409 |
@@ -715,7 +718,8 @@ |
30410 |
{ |
30411 |
WMScreen *scr = W_VIEW_SCREEN(view); |
30412 |
Window foo; |
30413 |
- int x, y, topX, topY, bar; |
30414 |
+ int x, y, topX, topY; |
30415 |
+ unsigned int bar; |
30416 |
WMView *topView; |
30417 |
|
30418 |
topView = view; |
30419 |
diff -uhrN WindowMaker-0.92.0/WPrefs.app/FontSimple.c WindowMaker-CVS-20060123/WPrefs.app/FontSimple.c |
30420 |
--- WindowMaker-0.92.0/WPrefs.app/FontSimple.c 2004-10-26 14:03:42.000000000 +0200 |
30421 |
+++ WindowMaker-CVS-20060123/WPrefs.app/FontSimple.c 2005-08-23 01:15:17.000000000 +0200 |
30422 |
@@ -231,11 +231,11 @@ |
30423 |
|
30424 |
for (i= 0; i < fonts->nfont; i++) |
30425 |
{ |
30426 |
- FcChar8 *name; |
30427 |
+ char *name; |
30428 |
int weight, slant, width; |
30429 |
int j, found; |
30430 |
|
30431 |
- if (FcPatternGetString(fonts->fonts[i], FC_FAMILY, 0, &name) != FcResultMatch) |
30432 |
+ if (FcPatternGetString(fonts->fonts[i], FC_FAMILY, 0, (FcChar8**)&name) != FcResultMatch) |
30433 |
continue; |
30434 |
|
30435 |
if (FcPatternGetInteger(fonts->fonts[i], FC_WEIGHT, 0, &weight) != FcResultMatch) |
30436 |
@@ -309,7 +309,7 @@ |
30437 |
|
30438 |
|
30439 |
static char* |
30440 |
-getSelectedFont(_Panel *panel, char *curfont) |
30441 |
+getSelectedFont(_Panel *panel, FcChar8 *curfont) |
30442 |
{ |
30443 |
WMListItem *item; |
30444 |
FcPattern *pat= FcNameParse(curfont); |
30445 |
@@ -319,7 +319,7 @@ |
30446 |
if (item) |
30447 |
{ |
30448 |
FcPatternDel(pat, FC_FAMILY); |
30449 |
- FcPatternAddString(pat, FC_FAMILY, item->text); |
30450 |
+ FcPatternAddString(pat, FC_FAMILY, (FcChar8*)item->text); |
30451 |
} |
30452 |
|
30453 |
item= WMGetListSelectedItem(panel->styleL); |
30454 |
@@ -344,9 +344,9 @@ |
30455 |
FcPatternAddDouble(pat, FC_PIXEL_SIZE, atoi(item->text)); |
30456 |
} |
30457 |
|
30458 |
- name= FcNameUnparse(pat); |
30459 |
+ name = (char*)FcNameUnparse(pat); |
30460 |
FcPatternDestroy(pat); |
30461 |
- |
30462 |
+ |
30463 |
return name; |
30464 |
} |
30465 |
|
30466 |
@@ -446,12 +446,13 @@ |
30467 |
{ |
30468 |
int index= WMGetPopUpButtonSelectedItem(panel->optionP); |
30469 |
WMMenuItem *item= WMGetPopUpButtonMenuItem(panel->optionP, index); |
30470 |
- char *ofont, *nfont; |
30471 |
+ FcChar8 *ofont; |
30472 |
+ char *nfont; |
30473 |
|
30474 |
- ofont= (char*)WMGetMenuItemRepresentedObject(item); |
30475 |
- |
30476 |
+ ofont= (FcChar8*)WMGetMenuItemRepresentedObject(item); |
30477 |
nfont= getSelectedFont(panel, ofont); |
30478 |
- free(ofont); |
30479 |
+ wfree(ofont); |
30480 |
+ |
30481 |
WMSetMenuItemRepresentedObject(item, nfont); |
30482 |
} |
30483 |
updateSampleFont(panel); |
30484 |
@@ -465,12 +466,13 @@ |
30485 |
_Panel *panel= (_Panel*)data; |
30486 |
int index= WMGetPopUpButtonSelectedItem(panel->optionP); |
30487 |
WMMenuItem *item= WMGetPopUpButtonMenuItem(panel->optionP, index); |
30488 |
- char *ofont, *nfont; |
30489 |
+ FcChar8 *ofont; |
30490 |
+ char *nfont; |
30491 |
|
30492 |
- ofont= (char*)WMGetMenuItemRepresentedObject(item); |
30493 |
- |
30494 |
+ ofont = (FcChar8*)WMGetMenuItemRepresentedObject(item); |
30495 |
nfont= getSelectedFont(panel, ofont); |
30496 |
- free(ofont); |
30497 |
+ wfree(ofont); |
30498 |
+ |
30499 |
WMSetMenuItemRepresentedObject(item, nfont); |
30500 |
|
30501 |
updateSampleFont(panel); |
30502 |
@@ -490,10 +492,10 @@ |
30503 |
{ |
30504 |
FcPattern *pat; |
30505 |
|
30506 |
- pat= FcNameParse(font); |
30507 |
+ pat= FcNameParse((FcChar8*)font); |
30508 |
if (pat) |
30509 |
{ |
30510 |
- FcChar8 *name; |
30511 |
+ char *name; |
30512 |
int weight, slant, width; |
30513 |
double size; |
30514 |
int distance, closest, found; |
30515 |
@@ -501,7 +503,7 @@ |
30516 |
|
30517 |
FcDefaultSubstitute(pat); |
30518 |
|
30519 |
- if (FcPatternGetString(pat, FC_FAMILY, 0, &name) != FcResultMatch) |
30520 |
+ if (FcPatternGetString(pat, FC_FAMILY, 0, (FcChar8**)&name) != FcResultMatch) |
30521 |
name= "sans serif"; |
30522 |
|
30523 |
found= 0; |
30524 |
diff -uhrN WindowMaker-0.92.0/WPrefs.app/main.c WindowMaker-CVS-20060123/WPrefs.app/main.c |
30525 |
--- WindowMaker-0.92.0/WPrefs.app/main.c 2004-10-19 04:41:54.000000000 +0200 |
30526 |
+++ WindowMaker-CVS-20060123/WPrefs.app/main.c 2005-07-17 21:15:36.000000000 +0200 |
30527 |
@@ -100,7 +100,7 @@ |
30528 |
{ |
30529 |
Display *dpy; |
30530 |
WMScreen *scr; |
30531 |
- char *locale; |
30532 |
+ char *locale, *path; |
30533 |
int i; |
30534 |
char *display_name=""; |
30535 |
|
30536 |
@@ -110,6 +110,20 @@ |
30537 |
|
30538 |
WMInitializeApplication("WPrefs", &argc, argv); |
30539 |
|
30540 |
+ WMSetResourcePath(RESOURCE_PATH); |
30541 |
+ path = WMPathForResourceOfType("WPrefs.tiff", NULL); |
30542 |
+ if (!path) { |
30543 |
+ /* maybe it is run directly from the source directory */ |
30544 |
+ WMSetResourcePath("."); |
30545 |
+ path = WMPathForResourceOfType("WPrefs.tiff", NULL); |
30546 |
+ if (!path) { |
30547 |
+ WMSetResourcePath(".."); |
30548 |
+ } |
30549 |
+ } |
30550 |
+ if (path) { |
30551 |
+ wfree(path); |
30552 |
+ } |
30553 |
+ |
30554 |
if (argc>1) { |
30555 |
for (i=1; i<argc; i++) { |
30556 |
if (strcmp(argv[i], "-version")==0 |
30557 |
diff -uhrN WindowMaker-0.92.0/WPrefs.app/Makefile.am WindowMaker-CVS-20060123/WPrefs.app/Makefile.am |
30558 |
--- WindowMaker-0.92.0/WPrefs.app/Makefile.am 2004-11-06 20:41:39.000000000 +0100 |
30559 |
+++ WindowMaker-CVS-20060123/WPrefs.app/Makefile.am 2005-07-17 20:21:00.000000000 +0200 |
30560 |
@@ -42,7 +42,7 @@ |
30561 |
imagebrowser.h \ |
30562 |
xmodifier.c |
30563 |
|
30564 |
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" |
30565 |
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\" |
30566 |
|
30567 |
AM_CFLAGS = @NOSTRICTALIASING@ |
30568 |
|
30569 |
diff -uhrN WindowMaker-0.92.0/WPrefs.app/Makefile.in WindowMaker-CVS-20060123/WPrefs.app/Makefile.in |
30570 |
--- WindowMaker-0.92.0/WPrefs.app/Makefile.in 2005-06-19 05:23:01.000000000 +0200 |
30571 |
+++ WindowMaker-CVS-20060123/WPrefs.app/Makefile.in 2006-01-22 21:33:54.000000000 +0100 |
30572 |
@@ -129,7 +129,7 @@ |
30573 |
WPrefs_SOURCES = main.c WPrefs.c WPrefs.h Appearance.c Configurations.c Expert.c Focus.c FontSimple.c Icons.c KeyboardSettings.c KeyboardShortcuts.c Menu.c MenuPreferences.c MouseSettings.c Paths.c Preferences.c TexturePanel.c TexturePanel.h Themes.c WindowHandling.c Workspace.c double.c double.h editmenu.c editmenu.h imagebrowser.c imagebrowser.h xmodifier.c |
30574 |
|
30575 |
|
30576 |
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" |
30577 |
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\" |
30578 |
|
30579 |
AM_CFLAGS = @NOSTRICTALIASING@ |
30580 |
|
30581 |
diff -uhrN WindowMaker-0.92.0/WPrefs.app/po/de.po WindowMaker-CVS-20060123/WPrefs.app/po/de.po |
30582 |
--- WindowMaker-0.92.0/WPrefs.app/po/de.po 2004-10-17 08:28:06.000000000 +0200 |
30583 |
+++ WindowMaker-CVS-20060123/WPrefs.app/po/de.po 2005-07-05 21:39:14.000000000 +0200 |
30584 |
@@ -1,17 +1,26 @@ |
30585 |
-# SOME DESCRIPTIVE TITLE. |
30586 |
-# Copyright (C) YEAR Free Software Foundation, Inc. |
30587 |
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
30588 |
+# translation of wprefsneu.po to |
30589 |
+# |
30590 |
+# German Message Catalog for WPrefs.app |
30591 |
+# |
30592 |
+# Initial translation |
30593 |
+# Gudio Scholz <guido.scholz@××××××××××.de> |
30594 |
+# Bernd Eggert <Bernd.Eggert@××××××××.de> |
30595 |
+# |
30596 |
+# Fully retranslated and updated for newer versions |
30597 |
+# Torsten Marek <shlomme@×××.net> |
30598 |
+# , 2004. |
30599 |
# |
30600 |
msgid "" |
30601 |
msgstr "" |
30602 |
-"Project-Id-Version: WPrefs 0.45\n" |
30603 |
-"POT-Creation-Date: 2003-01-06 01:33+0100\n" |
30604 |
-"PO-Revision-Date: 2003-01-25 16:00CET\n" |
30605 |
-"Last-Translator: Guido Scholz <guido.scholz@××××××××××.de>\n" |
30606 |
-"Language-Team: Deutsch <de@××.org>\n" |
30607 |
+"Project-Id-Version: wprefsneu\n" |
30608 |
+"POT-Creation-Date: 2004-11-05 23:50+0100\n" |
30609 |
+"PO-Revision-Date: 2004-11-14 13:15+0100\n" |
30610 |
+"Last-Translator: \n" |
30611 |
+"Language-Team: <en@××.org>\n" |
30612 |
"MIME-Version: 1.0\n" |
30613 |
"Content-Type: text/plain; charset=UTF-8\n" |
30614 |
"Content-Transfer-Encoding: 8bit\n" |
30615 |
+"X-Generator: KBabel 1.9.1\n" |
30616 |
|
30617 |
#: ../../WPrefs.app/Appearance.c:1154 |
30618 |
msgid "Select File" |
30619 |
@@ -27,19 +36,20 @@ |
30620 |
|
30621 |
#: ../../WPrefs.app/Appearance.c:1565 |
30622 |
msgid "Owner of Focused Window" |
30623 |
-msgstr "Eigentümer des akt. Fensters" |
30624 |
+msgstr "Eigentümer des aktiven Fensters" |
30625 |
|
30626 |
#: ../../WPrefs.app/Appearance.c:1570 ../../WPrefs.app/Appearance.c:1893 |
30627 |
+#: ../../WPrefs.app/FontSimple.c:108 |
30628 |
msgid "Menu Title" |
30629 |
msgstr "Menütitel" |
30630 |
|
30631 |
#: ../../WPrefs.app/Appearance.c:1575 ../../WPrefs.app/Appearance.c:1578 |
30632 |
msgid "Normal Item" |
30633 |
-msgstr "Normal" |
30634 |
+msgstr "Normaler Eintrag" |
30635 |
|
30636 |
#: ../../WPrefs.app/Appearance.c:1583 |
30637 |
msgid "Disabled Item" |
30638 |
-msgstr "Deaktiviert" |
30639 |
+msgstr "Ausgeschalteter Eintrag" |
30640 |
|
30641 |
#: ../../WPrefs.app/Appearance.c:1595 |
30642 |
msgid "Highlighted" |
30643 |
@@ -59,11 +69,11 @@ |
30644 |
|
30645 |
#: ../../WPrefs.app/Appearance.c:1796 |
30646 |
msgid "Titlebar of Focused Window's Owner" |
30647 |
-msgstr "Titelleiste d. Eigent. d. akt. Fensters" |
30648 |
+msgstr "Titelleiste des Eigentümers des aktiven Fensters" |
30649 |
|
30650 |
#: ../../WPrefs.app/Appearance.c:1797 |
30651 |
msgid "Window Resizebar" |
30652 |
-msgstr "Fenster-GröÃenänderungsleiste" |
30653 |
+msgstr "GröÃenänderungsleiste" |
30654 |
|
30655 |
#: ../../WPrefs.app/Appearance.c:1798 |
30656 |
msgid "Titlebar of Menus" |
30657 |
@@ -91,19 +101,19 @@ |
30658 |
|
30659 |
#: ../../WPrefs.app/Appearance.c:1833 |
30660 |
msgid "Create a new texture." |
30661 |
-msgstr "Neue Textur erzeugen." |
30662 |
+msgstr "Neue Textur erstellen." |
30663 |
|
30664 |
#: ../../WPrefs.app/Appearance.c:1841 |
30665 |
msgid "Extract..." |
30666 |
-msgstr "Extrahieren..." |
30667 |
+msgstr "Holen" |
30668 |
|
30669 |
#: ../../WPrefs.app/Appearance.c:1845 |
30670 |
msgid "Extract texture(s) from a theme or a style file." |
30671 |
-msgstr "Extrahiere Textur(en) aus einer Themen- oder Stildatei." |
30672 |
+msgstr "Textur(en) aus einer Themen- oder Stildatei holen." |
30673 |
|
30674 |
#: ../../WPrefs.app/Appearance.c:1855 |
30675 |
msgid "Edit" |
30676 |
-msgstr "Bearbeiten" |
30677 |
+msgstr "Ãndern" |
30678 |
|
30679 |
#: ../../WPrefs.app/Appearance.c:1858 |
30680 |
msgid "Edit the highlighted texture." |
30681 |
@@ -131,7 +141,7 @@ |
30682 |
|
30683 |
#: ../../WPrefs.app/Appearance.c:1892 |
30684 |
msgid "Owner of Focused Window Title" |
30685 |
-msgstr "Titel d. Eigentümers d. akt. Fensters" |
30686 |
+msgstr "Titel des Eigentümers des aktiven Fensters" |
30687 |
|
30688 |
#: ../../WPrefs.app/Appearance.c:1894 |
30689 |
msgid "Menu Item Text" |
30690 |
@@ -139,7 +149,7 @@ |
30691 |
|
30692 |
#: ../../WPrefs.app/Appearance.c:1895 |
30693 |
msgid "Disabled Menu Item Text" |
30694 |
-msgstr "Text eines deaktiv. Menüeintrages" |
30695 |
+msgstr "Text eines ausgeschalteten Menüeintrages" |
30696 |
|
30697 |
#: ../../WPrefs.app/Appearance.c:1896 |
30698 |
msgid "Menu Highlight Color" |
30699 |
@@ -147,7 +157,7 @@ |
30700 |
|
30701 |
#: ../../WPrefs.app/Appearance.c:1897 |
30702 |
msgid "Highlighted Menu Text Color" |
30703 |
-msgstr "Text des ausgew. Menüeintrages" |
30704 |
+msgstr "Text des ausgewählten Menüeintrages" |
30705 |
|
30706 |
#: ../../WPrefs.app/Appearance.c:1936 |
30707 |
msgid "Background" |
30708 |
@@ -163,23 +173,23 @@ |
30709 |
|
30710 |
#: ../../WPrefs.app/Appearance.c:1968 |
30711 |
msgid "Menu Style" |
30712 |
-msgstr " Menüstil " |
30713 |
+msgstr "Menü-Stil" |
30714 |
|
30715 |
-#: ../../WPrefs.app/Appearance.c:1996 ../../WPrefs.app/Configurations.c:242 |
30716 |
-#: ../../WPrefs.app/Configurations.c:254 ../../WPrefs.app/Focus.c:288 |
30717 |
+#: ../../WPrefs.app/Appearance.c:1996 ../../WPrefs.app/Configurations.c:241 |
30718 |
+#: ../../WPrefs.app/Configurations.c:253 ../../WPrefs.app/Focus.c:288 |
30719 |
#: ../../WPrefs.app/Focus.c:299 ../../WPrefs.app/MenuPreferences.c:134 |
30720 |
#: ../../WPrefs.app/MenuPreferences.c:145 |
30721 |
#: ../../WPrefs.app/MenuPreferences.c:173 |
30722 |
#: ../../WPrefs.app/MenuPreferences.c:188 ../../WPrefs.app/MouseSettings.c:560 |
30723 |
-#: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:558 |
30724 |
-#: ../../WPrefs.app/WPrefs.c:583 |
30725 |
+#: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:546 |
30726 |
+#: ../../WPrefs.app/WPrefs.c:571 |
30727 |
#, c-format |
30728 |
msgid "could not load icon file %s" |
30729 |
-msgstr "Symboldatei %s konnte nicht geladen werden" |
30730 |
+msgstr "Symboldatei %s konnte nicht geöffnet werden" |
30731 |
|
30732 |
#: ../../WPrefs.app/Appearance.c:2010 |
30733 |
msgid "Title Alignment" |
30734 |
-msgstr " Titelausrichtung " |
30735 |
+msgstr "Titel-Ausrichtung" |
30736 |
|
30737 |
#: ../../WPrefs.app/Appearance.c:2017 |
30738 |
msgid "Left" |
30739 |
@@ -214,13 +224,13 @@ |
30740 |
msgid "Textures" |
30741 |
msgstr "Texturen" |
30742 |
|
30743 |
-#: ../../WPrefs.app/Appearance.c:2325 ../../WPrefs.app/WPrefs.c:302 |
30744 |
+#: ../../WPrefs.app/Appearance.c:2325 ../../WPrefs.app/WPrefs.c:301 |
30745 |
msgid "Close" |
30746 |
msgstr "SchlieÃen" |
30747 |
|
30748 |
#: ../../WPrefs.app/Appearance.c:2330 |
30749 |
msgid "Extract" |
30750 |
-msgstr "Extrahieren" |
30751 |
+msgstr "Holen" |
30752 |
|
30753 |
#: ../../WPrefs.app/Configurations.c:150 ../../WPrefs.app/Configurations.c:156 |
30754 |
#: ../../WPrefs.app/MouseSettings.c:490 ../../WPrefs.app/WindowHandling.c:339 |
30755 |
@@ -228,250 +238,239 @@ |
30756 |
#: ../../WPrefs.app/Workspace.c:101 |
30757 |
#, c-format |
30758 |
msgid "could not load icon %s" |
30759 |
-msgstr "Symbol %s konnte nicht geladen werden" |
30760 |
+msgstr "Symboldatei %s konnte nicht geöffnet werden" |
30761 |
|
30762 |
#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109 |
30763 |
#, c-format |
30764 |
msgid "could not process icon %s:" |
30765 |
-msgstr "Symbol %s konnte nicht verarbeitet werden" |
30766 |
+msgstr "Symboldatei %s konnte nicht verarbeitet werden" |
30767 |
|
30768 |
-#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164 |
30769 |
+#: ../../WPrefs.app/Configurations.c:188 ../../WPrefs.app/Workspace.c:164 |
30770 |
#, c-format |
30771 |
msgid "could not load image file %s" |
30772 |
msgstr "Bilddatei %s konnte nicht geladen werden" |
30773 |
|
30774 |
-#: ../../WPrefs.app/Configurations.c:203 |
30775 |
+#: ../../WPrefs.app/Configurations.c:202 |
30776 |
msgid "Icon Slide Speed" |
30777 |
msgstr "Symbol-Bewegungsgeschwindigkeit" |
30778 |
|
30779 |
-#: ../../WPrefs.app/Configurations.c:209 |
30780 |
+#: ../../WPrefs.app/Configurations.c:208 |
30781 |
msgid "Shade Animation Speed" |
30782 |
msgstr "Roll-Animationsgeschwindigkeit" |
30783 |
|
30784 |
-#: ../../WPrefs.app/Configurations.c:271 |
30785 |
+#: ../../WPrefs.app/Configurations.c:270 |
30786 |
msgid "Smooth Scaling" |
30787 |
msgstr "Weiche Skalierung" |
30788 |
|
30789 |
-#: ../../WPrefs.app/Configurations.c:272 |
30790 |
+#: ../../WPrefs.app/Configurations.c:271 |
30791 |
msgid "" |
30792 |
"Smooth scaled background images, neutralizing\n" |
30793 |
"the `pixelization' effect. This will slow\n" |
30794 |
"down loading of background images considerably." |
30795 |
msgstr "" |
30796 |
-"Weich skalierte Hintergrundbilder, neutralisiert\n" |
30797 |
-"Verpixelungen. Diese Option verlangsamt\n" |
30798 |
-"deutlich das Laden von Hintergrundbildern." |
30799 |
+"Weiche Skalierung von Hintergrundbilderverhindert\n" |
30800 |
+"Verpixelungen, aber führt zu einem deutlich\n" |
30801 |
+"längeren Ladeprozess." |
30802 |
|
30803 |
-#: ../../WPrefs.app/Configurations.c:313 |
30804 |
+#: ../../WPrefs.app/Configurations.c:312 |
30805 |
msgid "Titlebar Style" |
30806 |
msgstr "Titelleisten-Stil" |
30807 |
|
30808 |
-#: ../../WPrefs.app/Configurations.c:351 |
30809 |
+#: ../../WPrefs.app/Configurations.c:350 |
30810 |
msgid "Animations and Sound" |
30811 |
msgstr "Animationen und Klänge" |
30812 |
|
30813 |
-#: ../../WPrefs.app/Configurations.c:357 |
30814 |
+#: ../../WPrefs.app/Configurations.c:356 |
30815 |
msgid "Animations" |
30816 |
msgstr "Animationen" |
30817 |
|
30818 |
-#: ../../WPrefs.app/Configurations.c:368 |
30819 |
+#: ../../WPrefs.app/Configurations.c:367 |
30820 |
msgid "" |
30821 |
"Disable/enable animations such as those shown\n" |
30822 |
"for window miniaturization, shading etc." |
30823 |
msgstr "" |
30824 |
-"Animationen für Fenster-Minimierung,\n" |
30825 |
-"-Aufrollen usw. ein/ausschalten." |
30826 |
+"Animationen wie Fenster-Minimierung, Rollen usw. \n" |
30827 |
+"ein-/ausschalten" |
30828 |
|
30829 |
-#: ../../WPrefs.app/Configurations.c:376 |
30830 |
+#: ../../WPrefs.app/Configurations.c:375 |
30831 |
msgid "Superfluous" |
30832 |
-msgstr "Effekte" |
30833 |
+msgstr "Zusätzliche Effekte" |
30834 |
|
30835 |
-#: ../../WPrefs.app/Configurations.c:387 |
30836 |
+#: ../../WPrefs.app/Configurations.c:386 |
30837 |
msgid "" |
30838 |
"Disable/enable `superfluous' features and\n" |
30839 |
"animations. These include the `ghosting' of the\n" |
30840 |
"dock when it's being moved to another side and\n" |
30841 |
"the explosion animation when undocking icons." |
30842 |
msgstr "" |
30843 |
-"Ãberflüssige Effekte ein/ausschalten. Dazu gehören\n" |
30844 |
-"das 'Ghosten' des Docks beim Verschieben und die\n" |
30845 |
-"Explosion von aus dem Dock entfernten Symbolen." |
30846 |
+"Zusätzliche Effekte ein-/ausschalten. Dazu gehören\n" |
30847 |
+"das transparente Bild des Dock, wenn es auf die\n" |
30848 |
+"andere Seite verschoben wird und die Explosion\n" |
30849 |
+"der aus dem Dock entfernten Symbole." |
30850 |
|
30851 |
-#: ../../WPrefs.app/Configurations.c:397 |
30852 |
+#: ../../WPrefs.app/Configurations.c:396 |
30853 |
msgid "Sounds" |
30854 |
msgstr "Klänge" |
30855 |
|
30856 |
-#: ../../WPrefs.app/Configurations.c:408 |
30857 |
+#: ../../WPrefs.app/Configurations.c:407 |
30858 |
msgid "" |
30859 |
"Disable/enable support for sound effects played\n" |
30860 |
"for actions like shading and closing a window.\n" |
30861 |
"You will need a module distributed separately\n" |
30862 |
"for this. You can get it at:\n" |
30863 |
-"http://shadowmere.student.utwente.nl/" |
30864 |
+"http://largo.windowmaker.org/files.php#WSoundServer" |
30865 |
msgstr "" |
30866 |
-"Unterstützung für Klanguntermalung von Ereignissen\n" |
30867 |
-"wie dem Auf-/Abrollen oder SchlieÃen eines Fensters.\n" |
30868 |
-"Hierzu brauchen sie ein zusätzliches Modul, das separat\n" |
30869 |
-"vertrieben wird. Sie erhalten es bei\n" |
30870 |
-"http://shadowmere.student.utwente.nl/" |
30871 |
+"Klangsignale für Ereignisse wie Auf-/Abrollen und\n" |
30872 |
+"SchlieÃen eines Fenster ein-/ausschalten. Hierfür\n" |
30873 |
+"wird ein separates Modul benötigt, dass sie von\n" |
30874 |
+"http.//largo.windowmaker.org/files.php#WSoundServer\n" |
30875 |
+"herunterladen können." |
30876 |
|
30877 |
-#: ../../WPrefs.app/Configurations.c:419 |
30878 |
+#: ../../WPrefs.app/Configurations.c:418 |
30879 |
msgid "" |
30880 |
"Note: sound requires a module distributed\n" |
30881 |
"separately" |
30882 |
-msgstr "Achtung: Klänge benötigen ein separates Modul" |
30883 |
+msgstr "Achtung: Klänge benötigen separates Modul" |
30884 |
|
30885 |
-#: ../../WPrefs.app/Configurations.c:429 |
30886 |
+#: ../../WPrefs.app/Configurations.c:428 |
30887 |
msgid "Dithering colormap for 8bpp" |
30888 |
-msgstr "Dithering für 8 bpp-Farbpalette" |
30889 |
+msgstr "Dithering für 8bpp-Farbpalette" |
30890 |
|
30891 |
-#: ../../WPrefs.app/Configurations.c:431 |
30892 |
+#: ../../WPrefs.app/Configurations.c:430 |
30893 |
msgid "" |
30894 |
"Number of colors to reserve for Window Maker\n" |
30895 |
"on displays that support only 8bpp (PseudoColor)." |
30896 |
msgstr "" |
30897 |
"Anzahl der Farben, die für Window Maker auf\n" |
30898 |
-"Displays mit 8 bpp reserviert werden sollen (PseudoColor)." |
30899 |
+"Display mit nur 8bpp reserviert werden sollen (PseudoColor)." |
30900 |
|
30901 |
-#: ../../WPrefs.app/Configurations.c:438 |
30902 |
+#: ../../WPrefs.app/Configurations.c:437 |
30903 |
msgid "Disable dithering in any visual/depth" |
30904 |
-msgstr "Dithering für alle Visuals und Farbtiefen deaktivieren." |
30905 |
+msgstr "Dithering in jedem Visual und jeder Farbtiefe ausschalten." |
30906 |
|
30907 |
-#: ../../WPrefs.app/Configurations.c:459 |
30908 |
+#: ../../WPrefs.app/Configurations.c:458 |
30909 |
msgid "" |
30910 |
"More colors for\n" |
30911 |
"applications" |
30912 |
msgstr "" |
30913 |
-"Mehr Farben f.\n" |
30914 |
+"Mehr Farben für\n" |
30915 |
"Anwendungen" |
30916 |
|
30917 |
-#: ../../WPrefs.app/Configurations.c:466 |
30918 |
+#: ../../WPrefs.app/Configurations.c:465 |
30919 |
msgid "" |
30920 |
"More colors for\n" |
30921 |
"Window Maker" |
30922 |
msgstr "" |
30923 |
-"Mehr Farben f.\n" |
30924 |
+"Mehr Farben für\n" |
30925 |
"Window Maker" |
30926 |
|
30927 |
-#: ../../WPrefs.app/Configurations.c:521 |
30928 |
+#: ../../WPrefs.app/Configurations.c:520 |
30929 |
msgid "Other Configurations" |
30930 |
msgstr "Verschiedene Einstellungen" |
30931 |
|
30932 |
-#: ../../WPrefs.app/Configurations.c:523 |
30933 |
+#: ../../WPrefs.app/Configurations.c:522 |
30934 |
msgid "" |
30935 |
"Animation speeds, titlebar styles, various option\n" |
30936 |
"toggling and number of colors to reserve for\n" |
30937 |
"Window Maker on 8bit displays." |
30938 |
msgstr "" |
30939 |
"Animationsgeschwindigkeiten, Titelleisten-Stil,\n" |
30940 |
-"verschiedene Einstellungen und Festlegung der für\n" |
30941 |
-"Window Maker reservierten Farben auf 8 bpp-Displays." |
30942 |
+"Einstellen der für Window Maker reservierten\n" |
30943 |
+"Farben auf 8bpp-Displays." |
30944 |
|
30945 |
-#: ../../WPrefs.app/Expert.c:77 |
30946 |
-msgid "Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME." |
30947 |
+#: ../../WPrefs.app/Expert.c:75 |
30948 |
+msgid "Disable miniwindows (icons for minimized windows). For use with KDE/GNOME." |
30949 |
msgstr "Keine Minifenster (Symbole für minimierte Fenster). Für KDE/GNOME." |
30950 |
|
30951 |
-#: ../../WPrefs.app/Expert.c:78 |
30952 |
+#: ../../WPrefs.app/Expert.c:76 |
30953 |
msgid "Do not set non-WindowMaker specific parameters (do not use xset)." |
30954 |
msgstr "Keine Window Maker-spezifischen Parameter setzen (xset nicht benutzen)." |
30955 |
|
30956 |
-#: ../../WPrefs.app/Expert.c:79 |
30957 |
+#: ../../WPrefs.app/Expert.c:77 |
30958 |
msgid "Automatically save session when exiting Window Maker." |
30959 |
-msgstr "Automatisches Abspeichern der Sitzung beim Beenden." |
30960 |
+msgstr "Automatischens Abspeichern der Sitzung beim Beenden." |
30961 |
|
30962 |
-#: ../../WPrefs.app/Expert.c:80 |
30963 |
+#: ../../WPrefs.app/Expert.c:78 |
30964 |
msgid "Use SaveUnder in window frames, icons, menus and other objects." |
30965 |
-msgstr "\"SaveUnder\" für Fensterrahmen, Symbole, Menüs u. a. benutzen." |
30966 |
+msgstr "SaveUnder für Fensterrahmen, Symbole, Menü u. a. benutzen" |
30967 |
|
30968 |
-#: ../../WPrefs.app/Expert.c:81 |
30969 |
-msgid "Use Windoze style cycling." |
30970 |
-msgstr "\"Windoze\"-Stil beim Durchlaufen der Fenster." |
30971 |
- |
30972 |
-#: ../../WPrefs.app/Expert.c:82 |
30973 |
+#: ../../WPrefs.app/Expert.c:79 |
30974 |
msgid "Disable confirmation panel for the Kill command." |
30975 |
-msgstr "Kein Bestätigungsdialog für das \"Kill\"-Kommando." |
30976 |
+msgstr "Kein Bestätigungsdialog für den Töten-Befehl" |
30977 |
|
30978 |
-#: ../../WPrefs.app/Expert.c:83 |
30979 |
+#: ../../WPrefs.app/Expert.c:80 |
30980 |
msgid "Disable selection animation for selected icons." |
30981 |
-msgstr "Keine Auswahlanimation für ausgewählte Symbole." |
30982 |
+msgstr "Keine Auswahlanimation für ausgewählte Symbole" |
30983 |
|
30984 |
-#: ../../WPrefs.app/Expert.c:84 |
30985 |
+#: ../../WPrefs.app/Expert.c:81 |
30986 |
msgid "Smooth font edges (needs restart)." |
30987 |
msgstr "Geglättete Schriftarten (Neustart erforderlich)." |
30988 |
|
30989 |
-#: ../../WPrefs.app/Expert.c:123 |
30990 |
+#: ../../WPrefs.app/Expert.c:117 |
30991 |
msgid "Expert User Preferences" |
30992 |
-msgstr "Einstellugen für Experten" |
30993 |
+msgstr "Einstellungen für Experten" |
30994 |
|
30995 |
-#: ../../WPrefs.app/Expert.c:125 |
30996 |
+#: ../../WPrefs.app/Expert.c:119 |
30997 |
msgid "" |
30998 |
"Options for people who know what they're doing...\n" |
30999 |
"Also have some other misc. options." |
31000 |
msgstr "" |
31001 |
"Einstellungen für Leute, die wissen, was sie tun...\n" |
31002 |
-"und einige andere Einstellungen." |
31003 |
+"Und einige andere Einstellungen." |
31004 |
|
31005 |
#: ../../WPrefs.app/Focus.c:80 |
31006 |
#, c-format |
31007 |
msgid "bad option value %s for option FocusMode. Using default Manual" |
31008 |
-msgstr "falscher Eigenschaftswert %s für \"FocusMode\". Benutze Standard 'Manuell'" |
31009 |
+msgstr "falscher Eigenschaftswert %s für FocusMode. Standardwert 'Manuell' wird benutzt." |
31010 |
|
31011 |
#: ../../WPrefs.app/Focus.c:94 |
31012 |
#, c-format |
31013 |
msgid "bad option value %s for option ColormapMode. Using default Auto" |
31014 |
-msgstr "falscher Eigenschaftswert %s für \"ColormapMode\". Benutze Standard 'Auto'" |
31015 |
+msgstr "falscher Eigenschaftswert %s für ColormapMode. Standardwert 'Auto' wird benutzt." |
31016 |
|
31017 |
#: ../../WPrefs.app/Focus.c:214 |
31018 |
msgid "Input Focus Mode" |
31019 |
msgstr "Eingabefokus-Modus" |
31020 |
|
31021 |
#: ../../WPrefs.app/Focus.c:222 |
31022 |
-msgid "Manual: Click on the window to set keyboard input focus" |
31023 |
-msgstr "Manuell: Setzen des Tastaturfokus durch Klick" |
31024 |
+msgid "Manual: Click on the window to set keyboard input focus." |
31025 |
+msgstr "Manuell: Tastaturfokus durch Anklicken des Fensters setzen" |
31026 |
|
31027 |
#: ../../WPrefs.app/Focus.c:229 |
31028 |
-msgid "Auto: Set keyboard input focus to the window under the mouse pointer" |
31029 |
-msgstr "Automatisch: Tastaturfokus folgt dem Mauszeiger" |
31030 |
+msgid "Auto: Set keyboard input focus to the window under the mouse pointer." |
31031 |
+msgstr "Auto: Tastaturfokus immer auf das Fenster unter dem Mauszeiger setzen" |
31032 |
|
31033 |
#: ../../WPrefs.app/Focus.c:243 |
31034 |
msgid "Install colormap in the window..." |
31035 |
-msgstr "Farbtabelle im Fenster installieren, ..." |
31036 |
+msgstr "Farbtabelle im Fenster setzen, das..." |
31037 |
|
31038 |
#: ../../WPrefs.app/Focus.c:248 |
31039 |
msgid "...that has the input focus." |
31040 |
-msgstr "..das den Eingabefokus hat." |
31041 |
+msgstr "...den Eingabefokus hat." |
31042 |
|
31043 |
#: ../../WPrefs.app/Focus.c:253 |
31044 |
-msgid "...that is under the mouse pointer." |
31045 |
-msgstr "...das unter dem Mauszeiger ist." |
31046 |
+msgid "...that's under the mouse pointer." |
31047 |
+msgstr "...unter dem Mauszeiger ist." |
31048 |
|
31049 |
#: ../../WPrefs.app/Focus.c:262 |
31050 |
msgid "Automatic Window Raise Delay" |
31051 |
-msgstr "Verzögerung für \"Fenster nach vorne\"" |
31052 |
+msgstr "Verzögerung für Auto-Fensterheber" |
31053 |
|
31054 |
#: ../../WPrefs.app/Focus.c:319 ../../WPrefs.app/MouseSettings.c:601 |
31055 |
msgid "msec" |
31056 |
msgstr "ms" |
31057 |
|
31058 |
#: ../../WPrefs.app/Focus.c:336 |
31059 |
-msgid "" |
31060 |
-"Do not let applications receive\n" |
31061 |
-"the click used to focus windows." |
31062 |
-msgstr "" |
31063 |
-"Aktivierungsklick wird nicht an\n" |
31064 |
-"Anwendung gesendet." |
31065 |
+msgid "Do not let applications receive the click used to focus windows." |
31066 |
+msgstr "Mausklicks, die ein Fenster fokussiert haben, nicht an die Anwendung senden." |
31067 |
|
31068 |
#: ../../WPrefs.app/Focus.c:342 |
31069 |
-msgid "" |
31070 |
-"Automatically focus new\n" |
31071 |
-"windows." |
31072 |
-msgstr "" |
31073 |
-"Neue Fenster erhalten den\n" |
31074 |
-"Fokus automatisch." |
31075 |
+msgid "Automatically focus new windows." |
31076 |
+msgstr "Neue Fenster automatisch auswählen" |
31077 |
|
31078 |
#: ../../WPrefs.app/Focus.c:363 |
31079 |
msgid "Window Focus Preferences" |
31080 |
-msgstr "Fensterfokus-Einstellungen" |
31081 |
+msgstr "Einstellungen zum Fokusverhalten" |
31082 |
|
31083 |
#: ../../WPrefs.app/Focus.c:365 |
31084 |
msgid "" |
31085 |
@@ -479,78 +478,51 @@ |
31086 |
"policy for 8bpp displays and other related options." |
31087 |
msgstr "" |
31088 |
"Tastaturfokuswechsel, Farbtabellenwechsel für\n" |
31089 |
-"8 bpp-Displays und weitere verwandte Eigenschaften." |
31090 |
- |
31091 |
-#: ../../WPrefs.app/Font.c:276 |
31092 |
-msgid "Could not locate font information file WPrefs.app/font.data" |
31093 |
-msgstr "Schrifteninformationsdatei \"WPrefs.app/font.data\" konnte nicht gefunden werden." |
31094 |
- |
31095 |
-#: ../../WPrefs.app/Font.c:282 |
31096 |
-msgid "Could not read font information file WPrefs.app/font.data" |
31097 |
-msgstr "Schrifteninformationsdatei \"WPrefs.app/font.data\" konnte nicht gelesen werden." |
31098 |
- |
31099 |
-#: ../../WPrefs.app/Font.c:293 |
31100 |
-msgid "" |
31101 |
-"Invalid data in font information file WPrefs.app/font.data.\n" |
31102 |
-"Encodings data not found." |
31103 |
-msgstr "" |
31104 |
-"Ungültige Daten in Schrifteninformationsdatei \"WPrefs.app/font.data\".\n" |
31105 |
-"Daten für Kodierung nicht gefunden." |
31106 |
- |
31107 |
-#: ../../WPrefs.app/Font.c:298 |
31108 |
-msgid "- Custom -" |
31109 |
-msgstr "- Angepasst -" |
31110 |
- |
31111 |
-#: ../../WPrefs.app/Font.c:329 ../../WPrefs.app/Menu.c:1594 |
31112 |
-#: ../../WPrefs.app/MouseSettings.c:140 ../../WPrefs.app/MouseSettings.c:160 |
31113 |
-#: ../../WPrefs.app/TexturePanel.c:615 ../../WPrefs.app/TexturePanel.c:695 |
31114 |
-#: ../../WPrefs.app/Themes.c:96 ../../WPrefs.app/WPrefs.c:759 |
31115 |
-#: ../../WPrefs.app/WPrefs.c:764 ../../WPrefs.app/WPrefs.c:781 |
31116 |
-#: ../../WPrefs.app/WPrefs.c:791 ../../WPrefs.app/WPrefs.c:801 |
31117 |
-#: ../../WPrefs.app/WPrefs.c:839 ../../WPrefs.app/WPrefs.c:844 |
31118 |
-msgid "Error" |
31119 |
-msgstr "Fehler" |
31120 |
- |
31121 |
-#: ../../WPrefs.app/Font.c:329 ../../WPrefs.app/Menu.c:1594 |
31122 |
-#: ../../WPrefs.app/MouseSettings.c:142 ../../WPrefs.app/MouseSettings.c:162 |
31123 |
-#: ../../WPrefs.app/TexturePanel.c:616 ../../WPrefs.app/TexturePanel.c:697 |
31124 |
-#: ../../WPrefs.app/TexturePanel.c:1529 ../../WPrefs.app/Themes.c:98 |
31125 |
-#: ../../WPrefs.app/WPrefs.c:759 ../../WPrefs.app/WPrefs.c:764 |
31126 |
-#: ../../WPrefs.app/WPrefs.c:783 ../../WPrefs.app/WPrefs.c:795 |
31127 |
-#: ../../WPrefs.app/WPrefs.c:801 ../../WPrefs.app/WPrefs.c:808 |
31128 |
-#: ../../WPrefs.app/WPrefs.c:839 ../../WPrefs.app/WPrefs.c:844 |
31129 |
-#: ../../WPrefs.app/imagebrowser.c:105 |
31130 |
-msgid "OK" |
31131 |
-msgstr "OK" |
31132 |
+"8bpp-Display und weitere verwandte Eigenschaften." |
31133 |
|
31134 |
-#: ../../WPrefs.app/Font.c:376 |
31135 |
-msgid "Default Font Sets" |
31136 |
-msgstr "Standardschriftarten" |
31137 |
- |
31138 |
-#: ../../WPrefs.app/Font.c:389 |
31139 |
-msgid "Font Set" |
31140 |
-msgstr "Schriftart" |
31141 |
- |
31142 |
-#: ../../WPrefs.app/Font.c:418 |
31143 |
-msgid "Add..." |
31144 |
-msgstr "Hinzufügen..." |
31145 |
- |
31146 |
-#: ../../WPrefs.app/Font.c:423 ../../WPrefs.app/Font.c:438 |
31147 |
-msgid "Change..." |
31148 |
-msgstr "Ãndern..." |
31149 |
+#: ../../WPrefs.app/FontSimple.c:107 |
31150 |
+msgid "Window Title" |
31151 |
+msgstr "Titel des aktiven Fensters" |
31152 |
|
31153 |
-#: ../../WPrefs.app/Font.c:428 ../../WPrefs.app/Paths.c:284 |
31154 |
-#: ../../WPrefs.app/Paths.c:315 |
31155 |
-msgid "Remove" |
31156 |
-msgstr "Entfernen" |
31157 |
+#: ../../WPrefs.app/FontSimple.c:109 |
31158 |
+msgid "Menu Text" |
31159 |
+msgstr "Text eines Menüeintrages" |
31160 |
|
31161 |
-#: ../../WPrefs.app/Font.c:477 |
31162 |
-msgid "Font Preferences" |
31163 |
-msgstr "Schrift-Einstellungen" |
31164 |
- |
31165 |
-#: ../../WPrefs.app/Font.c:478 |
31166 |
-msgid "Font Configurations for Windows, Menus etc" |
31167 |
-msgstr "Schriftkonfiguration für Fenster, Menüs usw." |
31168 |
+#: ../../WPrefs.app/FontSimple.c:110 |
31169 |
+msgid "Icon Title" |
31170 |
+msgstr "Symboltitel" |
31171 |
+ |
31172 |
+#: ../../WPrefs.app/FontSimple.c:111 |
31173 |
+msgid "Clip Title" |
31174 |
+msgstr "Clip-Titel" |
31175 |
+ |
31176 |
+#: ../../WPrefs.app/FontSimple.c:112 |
31177 |
+msgid "Desktop Caption" |
31178 |
+msgstr "Arbeitsflächentitel" |
31179 |
+ |
31180 |
+#: ../../WPrefs.app/FontSimple.c:690 |
31181 |
+msgid "Sample Text" |
31182 |
+msgstr "Beispieltext" |
31183 |
+ |
31184 |
+#: ../../WPrefs.app/FontSimple.c:708 |
31185 |
+msgid "Family" |
31186 |
+msgstr "Familie" |
31187 |
+ |
31188 |
+#: ../../WPrefs.app/FontSimple.c:737 |
31189 |
+msgid "Style" |
31190 |
+msgstr "Stil" |
31191 |
+ |
31192 |
+#: ../../WPrefs.app/FontSimple.c:740 |
31193 |
+msgid "Size" |
31194 |
+msgstr "GröÃe" |
31195 |
+ |
31196 |
+#: ../../WPrefs.app/FontSimple.c:778 |
31197 |
+msgid "Font Configuration" |
31198 |
+msgstr "Schrifteinstellungen" |
31199 |
+ |
31200 |
+#: ../../WPrefs.app/FontSimple.c:780 |
31201 |
+msgid "Configure fonts for Window Maker titlebars, menus etc." |
31202 |
+msgstr "Schrifteinstellungen für Fenster, Menüs usw." |
31203 |
|
31204 |
#: ../../WPrefs.app/Icons.c:180 |
31205 |
msgid "Icon Positioning" |
31206 |
@@ -562,7 +534,7 @@ |
31207 |
|
31208 |
#: ../../WPrefs.app/Icons.c:238 |
31209 |
msgid "Shrinking/Zooming" |
31210 |
-msgstr "Verkleinern/VergröÃern" |
31211 |
+msgstr "Schrumpfen/VergröÃern" |
31212 |
|
31213 |
#: ../../WPrefs.app/Icons.c:239 |
31214 |
msgid "Spinning/Twisting" |
31215 |
@@ -583,11 +555,11 @@ |
31216 |
|
31217 |
#: ../../WPrefs.app/Icons.c:256 |
31218 |
msgid "Keep icons and miniwindows arranged all the time." |
31219 |
-msgstr "Symbole und Minifenster immer anordnen." |
31220 |
+msgstr "Symbole und Minifenster immer anordnen" |
31221 |
|
31222 |
#: ../../WPrefs.app/Icons.c:262 |
31223 |
msgid "Omnipresent miniwindows" |
31224 |
-msgstr "Omnipräsente Minifenster" |
31225 |
+msgstr "Haftende Minifenster" |
31226 |
|
31227 |
#: ../../WPrefs.app/Icons.c:264 |
31228 |
msgid "Make miniwindows be present in all workspaces." |
31229 |
@@ -603,7 +575,7 @@ |
31230 |
|
31231 |
#: ../../WPrefs.app/Icons.c:345 |
31232 |
msgid "Icon Preferences" |
31233 |
-msgstr "Symbol-Einstellungen" |
31234 |
+msgstr "Symboleinstellungen" |
31235 |
|
31236 |
#: ../../WPrefs.app/Icons.c:347 |
31237 |
msgid "" |
31238 |
@@ -633,237 +605,254 @@ |
31239 |
msgid "Not done" |
31240 |
msgstr "Noch nicht erstellt" |
31241 |
|
31242 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:307 ../../WPrefs.app/Menu.c:360 |
31243 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:310 ../../WPrefs.app/Menu.c:360 |
31244 |
#: ../../WPrefs.app/TexturePanel.c:1535 ../../WPrefs.app/imagebrowser.c:100 |
31245 |
msgid "Cancel" |
31246 |
msgstr "Abbrechen" |
31247 |
|
31248 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:308 |
31249 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:311 |
31250 |
msgid "Press the desired shortcut key(s) or click Cancel to stop capturing." |
31251 |
msgstr "" |
31252 |
-"Drücken Sie die gewünschte Tastenkombination oder auf \"Abbrechen\"." |
31253 |
+"Drücken Sie die gewünschte Tastenkombination oder klicken Sie auf Abbrechen " |
31254 |
+"zum Stoppen der Aufzeichnung." |
31255 |
|
31256 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:328 |
31257 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:575 ../../WPrefs.app/Menu.c:371 |
31258 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:331 |
31259 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:584 ../../WPrefs.app/Menu.c:371 |
31260 |
#: ../../WPrefs.app/Menu.c:830 |
31261 |
msgid "Capture" |
31262 |
msgstr "Aufzeichnen" |
31263 |
|
31264 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:329 |
31265 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:583 |
31266 |
-msgid "Click Capture to interactively define the shortcut key." |
31267 |
-msgstr "Zum interaktiven Auswählen einer Tastenkombination \"Aufzeichnen\" klicken." |
31268 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:332 |
31269 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:592 |
31270 |
+msgid "Click on Capture to interactively define the shortcut key." |
31271 |
+msgstr "Zum Erstellen eines Tastenkürzels auf \"Aufzeichnen\" klicken." |
31272 |
|
31273 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:483 |
31274 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:486 |
31275 |
msgid "Actions" |
31276 |
msgstr "Aktionen" |
31277 |
|
31278 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:497 |
31279 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:500 |
31280 |
msgid "Open applications menu" |
31281 |
-msgstr "Anwendungsmenü öffnen" |
31282 |
+msgstr "Anwendungmenü öffnen" |
31283 |
|
31284 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:498 |
31285 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:501 |
31286 |
msgid "Open window list menu" |
31287 |
msgstr "Fensterliste öffnen" |
31288 |
|
31289 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:499 |
31290 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:502 |
31291 |
msgid "Open window commands menu" |
31292 |
msgstr "Fenstermenü öffnen" |
31293 |
|
31294 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:500 |
31295 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:503 |
31296 |
msgid "Hide active application" |
31297 |
-msgstr "Aktive Anwendung ausblenden" |
31298 |
+msgstr "Aktive Anwendung verstecken" |
31299 |
|
31300 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:501 |
31301 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:504 |
31302 |
msgid "Hide other applications" |
31303 |
-msgstr "Alle anderen Anwendungen ausblenden" |
31304 |
+msgstr "Alle anderen Anwendung verstecken" |
31305 |
|
31306 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:502 |
31307 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:505 |
31308 |
msgid "Miniaturize active window" |
31309 |
msgstr "Aktives Fenster minimieren" |
31310 |
|
31311 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:503 |
31312 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:506 |
31313 |
msgid "Close active window" |
31314 |
msgstr "Aktives Fenster schlieÃen" |
31315 |
|
31316 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:504 |
31317 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:507 |
31318 |
msgid "Maximize active window" |
31319 |
msgstr "Aktives Fenster maximieren" |
31320 |
|
31321 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:505 |
31322 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:508 |
31323 |
msgid "Maximize active window vertically" |
31324 |
msgstr "Aktives Fenster vertikal maximieren" |
31325 |
|
31326 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:506 |
31327 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:509 |
31328 |
msgid "Maximize active window horizontally" |
31329 |
msgstr "Aktives Fenster horizontal maximieren" |
31330 |
|
31331 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:507 |
31332 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:510 |
31333 |
msgid "Raise active window" |
31334 |
msgstr "Aktives Fenster in den Vordergrund" |
31335 |
|
31336 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:508 |
31337 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:511 |
31338 |
msgid "Lower active window" |
31339 |
msgstr "Aktives Fenster in den Hintergrund" |
31340 |
|
31341 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:509 |
31342 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:512 |
31343 |
msgid "Raise/Lower window under mouse pointer" |
31344 |
-msgstr "Fenster unter Mauszeiger in Vor-/Hintergrund" |
31345 |
+msgstr "Fenster unter dem Mauszeiger in den Vor-/Hintergrund" |
31346 |
|
31347 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:510 |
31348 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:513 |
31349 |
msgid "Shade active window" |
31350 |
msgstr "Aktives Fenster aufrollen" |
31351 |
|
31352 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:511 |
31353 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:514 |
31354 |
msgid "Move/Resize active window" |
31355 |
msgstr "Aktives Fenster bewegen/verändern" |
31356 |
|
31357 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:512 |
31358 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:515 |
31359 |
msgid "Select active window" |
31360 |
msgstr "Aktives Fenster auswählen" |
31361 |
|
31362 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:513 |
31363 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:516 |
31364 |
msgid "Focus next window" |
31365 |
msgstr "Nächstes Fenster" |
31366 |
|
31367 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:514 |
31368 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:517 |
31369 |
msgid "Focus previous window" |
31370 |
msgstr "Vorheriges Fenster" |
31371 |
|
31372 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:515 |
31373 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:518 |
31374 |
msgid "Switch to next workspace" |
31375 |
msgstr "Zur nächsten Arbeitsfläche" |
31376 |
|
31377 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:516 |
31378 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:519 |
31379 |
msgid "Switch to previous workspace" |
31380 |
msgstr "Zur vorherigen Arbeitsfläche" |
31381 |
|
31382 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:517 |
31383 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:520 |
31384 |
msgid "Switch to next ten workspaces" |
31385 |
msgstr "Springe 10 Arbeitsflächen vorwärts" |
31386 |
|
31387 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:518 |
31388 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:521 |
31389 |
msgid "Switch to previous ten workspaces" |
31390 |
msgstr "Springe 10 Arbeitsflächen rückwärts" |
31391 |
|
31392 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:519 |
31393 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:522 |
31394 |
msgid "Switch to workspace 1" |
31395 |
msgstr "Springe zu Arbeitsfläche 1" |
31396 |
|
31397 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:520 |
31398 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:523 |
31399 |
msgid "Switch to workspace 2" |
31400 |
msgstr "Springe zu Arbeitsfläche 2" |
31401 |
|
31402 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:521 |
31403 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:524 |
31404 |
msgid "Switch to workspace 3" |
31405 |
msgstr "Springe zu Arbeitsfläche 3" |
31406 |
|
31407 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:522 |
31408 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:525 |
31409 |
msgid "Switch to workspace 4" |
31410 |
msgstr "Springe zu Arbeitsfläche 4" |
31411 |
|
31412 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:523 |
31413 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:526 |
31414 |
msgid "Switch to workspace 5" |
31415 |
msgstr "Springe zu Arbeitsfläche 5" |
31416 |
|
31417 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:524 |
31418 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:527 |
31419 |
msgid "Switch to workspace 6" |
31420 |
msgstr "Springe zu Arbeitsfläche 6" |
31421 |
|
31422 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:525 |
31423 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:528 |
31424 |
msgid "Switch to workspace 7" |
31425 |
msgstr "Springe zu Arbeitsfläche 7" |
31426 |
|
31427 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:526 |
31428 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:529 |
31429 |
msgid "Switch to workspace 8" |
31430 |
msgstr "Springe zu Arbeitsfläche 8" |
31431 |
|
31432 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:527 |
31433 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:530 |
31434 |
msgid "Switch to workspace 9" |
31435 |
msgstr "Springe zu Arbeitsfläche 9" |
31436 |
|
31437 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:528 |
31438 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:531 |
31439 |
msgid "Switch to workspace 10" |
31440 |
msgstr "Springe zu Arbeitsfläche 10" |
31441 |
|
31442 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:529 |
31443 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:532 |
31444 |
msgid "Shortcut for window 1" |
31445 |
msgstr "Tastenkürzel für Fenster 1" |
31446 |
|
31447 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:530 |
31448 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:533 |
31449 |
msgid "Shortcut for window 2" |
31450 |
msgstr "Tastenkürzel für Fenster 2" |
31451 |
|
31452 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:531 |
31453 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:534 |
31454 |
msgid "Shortcut for window 3" |
31455 |
msgstr "Tastenkürzel für Fenster 3" |
31456 |
|
31457 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:532 |
31458 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:535 |
31459 |
msgid "Shortcut for window 4" |
31460 |
msgstr "Tastenkürzel für Fenster 4" |
31461 |
|
31462 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:533 |
31463 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:536 |
31464 |
msgid "Shortcut for window 5" |
31465 |
msgstr "Tastenkürzel für Fenster 5" |
31466 |
|
31467 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:534 |
31468 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:537 |
31469 |
msgid "Shortcut for window 6" |
31470 |
msgstr "Tastenkürzel für Fenster 6" |
31471 |
|
31472 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:535 |
31473 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:538 |
31474 |
msgid "Shortcut for window 7" |
31475 |
msgstr "Tastenkürzel für Fenster 7" |
31476 |
|
31477 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:536 |
31478 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:539 |
31479 |
msgid "Shortcut for window 8" |
31480 |
msgstr "Tastenkürzel für Fenster 8" |
31481 |
|
31482 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:537 |
31483 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:540 |
31484 |
msgid "Shortcut for window 9" |
31485 |
msgstr "Tastenkürzel für Fenster 9" |
31486 |
|
31487 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:538 |
31488 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:541 |
31489 |
msgid "Shortcut for window 10" |
31490 |
msgstr "Tastenkürzel für Fenster 10" |
31491 |
|
31492 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:539 |
31493 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:542 |
31494 |
msgid "Switch to Next Screen/Monitor" |
31495 |
-msgstr "Springe zum nächsten Bildschirm" |
31496 |
+msgstr "Springe zu nächstem Bildschirm" |
31497 |
|
31498 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:540 |
31499 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:544 |
31500 |
+msgid "Move VirtualDesktop to next left edge" |
31501 |
+msgstr "Virtuelle Arbeitsfläche zur nächsten Kante links bewegen" |
31502 |
+ |
31503 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:545 |
31504 |
+msgid "Move VirtualDesktop to next right edge" |
31505 |
+msgstr "Virtuelle Arbeitsfläche zur nächsten Kante rechts bewegen" |
31506 |
+ |
31507 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:546 |
31508 |
+msgid "Move VirtualDesktop to next top edge" |
31509 |
+msgstr "Virtuelle Arbeitsfläche zur nächsten Kante oben bewegen" |
31510 |
+ |
31511 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:547 |
31512 |
+msgid "Move VirtualDesktop to next bottom edge" |
31513 |
+msgstr "Virtuelle Arbeitsfläche zur nächsten Kante unten bewegen" |
31514 |
+ |
31515 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:549 |
31516 |
msgid "Raise Clip" |
31517 |
msgstr "Clip in den Vordergrund" |
31518 |
|
31519 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:541 |
31520 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:550 |
31521 |
msgid "Lower Clip" |
31522 |
msgstr "Clip in den Hintergrund" |
31523 |
|
31524 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:542 |
31525 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:551 |
31526 |
msgid "Raise/Lower Clip" |
31527 |
msgstr "Clip in den Vor-/Hintergrund" |
31528 |
|
31529 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:544 |
31530 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:553 |
31531 |
msgid "Toggle keyboard language" |
31532 |
-msgstr "Tastatursprache ändern" |
31533 |
+msgstr "Tastatursbelegung ändern" |
31534 |
|
31535 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:558 |
31536 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:567 |
31537 |
msgid "Shortcut" |
31538 |
-msgstr " Tastatur-Kurzbefehle " |
31539 |
+msgstr "Kürzel" |
31540 |
|
31541 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:569 ../../WPrefs.app/Menu.c:836 |
31542 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:578 ../../WPrefs.app/Menu.c:836 |
31543 |
msgid "Clear" |
31544 |
msgstr "Löschen" |
31545 |
|
31546 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:631 |
31547 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:640 |
31548 |
msgid "Keyboard Shortcut Preferences" |
31549 |
-msgstr "Tastaturkürzel-Einstellungen" |
31550 |
+msgstr "Tastenkürzel-Einstellungen" |
31551 |
|
31552 |
-#: ../../WPrefs.app/KeyboardShortcuts.c:633 |
31553 |
+#: ../../WPrefs.app/KeyboardShortcuts.c:642 |
31554 |
msgid "" |
31555 |
"Change the keyboard shortcuts for actions such\n" |
31556 |
"as changing workspaces and opening menus." |
31557 |
msgstr "" |
31558 |
-"Ãndern der Tastenkombinationen für Aktionen wie das\n" |
31559 |
+"Ãndern der Tastenkürzel für Aktionen wie das\n" |
31560 |
"Wechseln der Arbeitsflächen und das Ãffnen von Menüs." |
31561 |
|
31562 |
#: ../../WPrefs.app/Menu.c:278 |
31563 |
@@ -872,11 +861,11 @@ |
31564 |
|
31565 |
#: ../../WPrefs.app/Menu.c:510 |
31566 |
msgid "New Items" |
31567 |
-msgstr "Neue Menüeinträge" |
31568 |
+msgstr "Neue Einträge" |
31569 |
|
31570 |
#: ../../WPrefs.app/Menu.c:511 |
31571 |
msgid "Sample Commands" |
31572 |
-msgstr "Beispielkommandos" |
31573 |
+msgstr "Beispielbefehle" |
31574 |
|
31575 |
#: ../../WPrefs.app/Menu.c:512 |
31576 |
msgid "Sample Submenus" |
31577 |
@@ -888,7 +877,7 @@ |
31578 |
|
31579 |
#: ../../WPrefs.app/Menu.c:527 |
31580 |
msgid "Internal Command" |
31581 |
-msgstr "Internes Kommando" |
31582 |
+msgstr "interner Befehl" |
31583 |
|
31584 |
#: ../../WPrefs.app/Menu.c:528 |
31585 |
msgid "Submenu" |
31586 |
@@ -896,11 +885,11 @@ |
31587 |
|
31588 |
#: ../../WPrefs.app/Menu.c:529 |
31589 |
msgid "External Submenu" |
31590 |
-msgstr "Externes Untermenü" |
31591 |
+msgstr "externes Untermenü" |
31592 |
|
31593 |
#: ../../WPrefs.app/Menu.c:530 |
31594 |
msgid "Generated Submenu" |
31595 |
-msgstr "Erzeugtes Untermenü" |
31596 |
+msgstr "erstelltes Untermenü" |
31597 |
|
31598 |
#: ../../WPrefs.app/Menu.c:531 |
31599 |
msgid "Directory Contents" |
31600 |
@@ -912,19 +901,19 @@ |
31601 |
|
31602 |
#: ../../WPrefs.app/Menu.c:533 ../../WPrefs.app/MouseSettings.c:840 |
31603 |
msgid "Window List Menu" |
31604 |
-msgstr "Fensterlistenmenü" |
31605 |
+msgstr "Fensterliste" |
31606 |
|
31607 |
#: ../../WPrefs.app/Menu.c:552 |
31608 |
msgid "XTerm" |
31609 |
-msgstr "XTerm" |
31610 |
+msgstr "" |
31611 |
|
31612 |
#: ../../WPrefs.app/Menu.c:555 |
31613 |
msgid "rxvt" |
31614 |
-msgstr "rxvt" |
31615 |
+msgstr "" |
31616 |
|
31617 |
#: ../../WPrefs.app/Menu.c:558 |
31618 |
msgid "ETerm" |
31619 |
-msgstr "ETerm" |
31620 |
+msgstr "" |
31621 |
|
31622 |
#: ../../WPrefs.app/Menu.c:561 |
31623 |
msgid "Run..." |
31624 |
@@ -933,35 +922,35 @@ |
31625 |
#: ../../WPrefs.app/Menu.c:562 |
31626 |
#, c-format |
31627 |
msgid "%a(Run,Type command to run)" |
31628 |
-msgstr "%a(Ausführen,Auszuführendes Kommando eingeben)" |
31629 |
+msgstr "%a(Befehl zum Ausführen eingeben)" |
31630 |
|
31631 |
#: ../../WPrefs.app/Menu.c:564 |
31632 |
msgid "Netscape" |
31633 |
-msgstr "Netscape" |
31634 |
+msgstr "" |
31635 |
|
31636 |
#: ../../WPrefs.app/Menu.c:567 |
31637 |
msgid "gimp" |
31638 |
-msgstr "gimp" |
31639 |
+msgstr "" |
31640 |
|
31641 |
#: ../../WPrefs.app/Menu.c:570 |
31642 |
msgid "epic" |
31643 |
-msgstr "epic" |
31644 |
+msgstr "" |
31645 |
|
31646 |
#: ../../WPrefs.app/Menu.c:573 |
31647 |
msgid "ee" |
31648 |
-msgstr "ee" |
31649 |
+msgstr "" |
31650 |
|
31651 |
#: ../../WPrefs.app/Menu.c:576 |
31652 |
msgid "xv" |
31653 |
-msgstr "xv" |
31654 |
+msgstr "" |
31655 |
|
31656 |
#: ../../WPrefs.app/Menu.c:579 |
31657 |
msgid "Acrobat Reader" |
31658 |
-msgstr "Acrobat Reader" |
31659 |
+msgstr "" |
31660 |
|
31661 |
#: ../../WPrefs.app/Menu.c:582 |
31662 |
msgid "ghostview" |
31663 |
-msgstr "ghostview" |
31664 |
+msgstr "" |
31665 |
|
31666 |
#: ../../WPrefs.app/Menu.c:585 ../../WPrefs.app/Menu.c:857 |
31667 |
msgid "Exit Window Maker" |
31668 |
@@ -985,15 +974,15 @@ |
31669 |
|
31670 |
#: ../../WPrefs.app/Menu.c:622 |
31671 |
msgid "Bg Images (scale)" |
31672 |
-msgstr "Hg Bilder (voll)" |
31673 |
+msgstr "Hintergrundbilder (skaliert)" |
31674 |
|
31675 |
#: ../../WPrefs.app/Menu.c:627 |
31676 |
msgid "Bg Images (tile)" |
31677 |
-msgstr "Hg Bilder (Kachel)" |
31678 |
+msgstr "Hintergrundbilder (Kacheln)" |
31679 |
|
31680 |
#: ../../WPrefs.app/Menu.c:632 |
31681 |
msgid "Assorted XTerms" |
31682 |
-msgstr "Versch. XTerms" |
31683 |
+msgstr "sortierte XTerms" |
31684 |
|
31685 |
#: ../../WPrefs.app/Menu.c:634 |
31686 |
msgid "XTerm Yellow on Blue" |
31687 |
@@ -1029,7 +1018,7 @@ |
31688 |
|
31689 |
#: ../../WPrefs.app/Menu.c:677 |
31690 |
msgid "Program to Run" |
31691 |
-msgstr "Auszuführendes Programm" |
31692 |
+msgstr "auszuführendes Programm" |
31693 |
|
31694 |
#: ../../WPrefs.app/Menu.c:687 |
31695 |
msgid "Browse" |
31696 |
@@ -1061,47 +1050,47 @@ |
31697 |
|
31698 |
#: ../../WPrefs.app/Menu.c:736 |
31699 |
msgid "Command" |
31700 |
-msgstr "Kommando" |
31701 |
+msgstr "Befehl" |
31702 |
|
31703 |
#: ../../WPrefs.app/Menu.c:750 |
31704 |
msgid "" |
31705 |
"Enter a command that outputs a menu\n" |
31706 |
"definition to stdout when invoked." |
31707 |
msgstr "" |
31708 |
-"Geben Sie ein Kommando ein, das beim Aufruf\n" |
31709 |
-"ein Menü nach STDOUT ausgibt." |
31710 |
+"Geben Sie einen Befehl ein, der bei Aufruf\n" |
31711 |
+"ein Menü auf der Standardausgabe zurückgibt." |
31712 |
|
31713 |
#: ../../WPrefs.app/Menu.c:758 |
31714 |
msgid "" |
31715 |
"Cache menu contents after opening for\n" |
31716 |
"the first time" |
31717 |
msgstr "" |
31718 |
-"Menüinhalt nach dem ersten Laden\n" |
31719 |
+"Menüinhalt nach erstem Laden\n" |
31720 |
"zwischenspeichern" |
31721 |
|
31722 |
#: ../../WPrefs.app/Menu.c:769 |
31723 |
msgid "Command to Open Files" |
31724 |
-msgstr "Befehl zum Ãffnen von Dateien" |
31725 |
+msgstr "Befehl zum Ãffnen der Dateien" |
31726 |
|
31727 |
#: ../../WPrefs.app/Menu.c:783 |
31728 |
msgid "" |
31729 |
"Enter the command you want to use to open the\n" |
31730 |
"files in the directories listed below." |
31731 |
msgstr "" |
31732 |
-"Geben Sie das Kommando zum Ãffnen der Dateien\n" |
31733 |
-"in den unten aufgelisteten Verzeichnissen ein." |
31734 |
+"Geben Sie den Befehl zum Ãffnen der Dateien\n" |
31735 |
+"in den augelisteten Verzeichnissen ein." |
31736 |
|
31737 |
#: ../../WPrefs.app/Menu.c:792 |
31738 |
msgid "Directories with Files" |
31739 |
-msgstr "Verzeichnisse mit Dateien" |
31740 |
+msgstr "Verzeichnis mit Dateien" |
31741 |
|
31742 |
#: ../../WPrefs.app/Menu.c:805 |
31743 |
msgid "Strip extensions from file names" |
31744 |
-msgstr "Dateierweiterungen entfernen" |
31745 |
+msgstr "Erweiterungen von den Dateinamen entfernen" |
31746 |
|
31747 |
#: ../../WPrefs.app/Menu.c:817 |
31748 |
msgid "Keyboard Shortcut" |
31749 |
-msgstr "Tastaturkürzel" |
31750 |
+msgstr "Tastenkürzel" |
31751 |
|
31752 |
#: ../../WPrefs.app/Menu.c:853 |
31753 |
msgid "Arrange Icons" |
31754 |
@@ -1109,7 +1098,7 @@ |
31755 |
|
31756 |
#: ../../WPrefs.app/Menu.c:854 |
31757 |
msgid "Hide All Windows Except For The Focused One" |
31758 |
-msgstr "Alle Fenster bis auf das aktive ausblenden" |
31759 |
+msgstr "Alle Fenster bis auf das aktive verstecken" |
31760 |
|
31761 |
#: ../../WPrefs.app/Menu.c:855 |
31762 |
msgid "Show All Windows" |
31763 |
@@ -1121,19 +1110,19 @@ |
31764 |
|
31765 |
#: ../../WPrefs.app/Menu.c:859 |
31766 |
msgid "Restart Window Maker" |
31767 |
-msgstr "Window Maker neu starten" |
31768 |
+msgstr "Window Maker neustarten" |
31769 |
|
31770 |
#: ../../WPrefs.app/Menu.c:860 |
31771 |
msgid "Start Another Window Manager : (" |
31772 |
-msgstr "Anderen Windowmanager starten : (" |
31773 |
+msgstr "anderen Windowmanager starten : (" |
31774 |
|
31775 |
#: ../../WPrefs.app/Menu.c:862 |
31776 |
msgid "Save Current Session" |
31777 |
-msgstr "Aktuelle Sitzung speichern" |
31778 |
+msgstr "aktuelle Sitzung speichern" |
31779 |
|
31780 |
#: ../../WPrefs.app/Menu.c:863 |
31781 |
msgid "Clear Saved Session" |
31782 |
-msgstr "Gespeicherte Sitzung löschen" |
31783 |
+msgstr "gespeicherte Sitzung löschen" |
31784 |
|
31785 |
#: ../../WPrefs.app/Menu.c:864 |
31786 |
msgid "Refresh Screen" |
31787 |
@@ -1141,21 +1130,21 @@ |
31788 |
|
31789 |
#: ../../WPrefs.app/Menu.c:865 |
31790 |
msgid "Open Info Panel" |
31791 |
-msgstr "Kurzinformation anzeigen" |
31792 |
+msgstr "Infodialog anzeigen" |
31793 |
|
31794 |
#: ../../WPrefs.app/Menu.c:866 |
31795 |
msgid "Open Copyright Panel" |
31796 |
-msgstr "Copyright anzeigen" |
31797 |
+msgstr "Copyrightinformationen anzeigen" |
31798 |
|
31799 |
#: ../../WPrefs.app/Menu.c:872 |
31800 |
msgid "Window Manager to Start" |
31801 |
-msgstr "Zu startender Windowmanager" |
31802 |
+msgstr "zu startender Windowmanager" |
31803 |
|
31804 |
#: ../../WPrefs.app/Menu.c:888 |
31805 |
msgid "Do not confirm action." |
31806 |
-msgstr "Aktion nicht bestätigen." |
31807 |
+msgstr "Aktion nicht bestätigen" |
31808 |
|
31809 |
-#: ../../WPrefs.app/Menu.c:898 |
31810 |
+#: ../../WPrefs.app/Menu.c:896 |
31811 |
msgid "" |
31812 |
"Instructions:\n" |
31813 |
"\n" |
31814 |
@@ -1166,110 +1155,125 @@ |
31815 |
" - double click in a menu item to change the label\n" |
31816 |
" - click on a menu item to change related information" |
31817 |
msgstr "" |
31818 |
-"Anweisungen:\n" |
31819 |
+"Hilfe:\n" |
31820 |
"\n" |
31821 |
-" - Neue Menüeinträge von links in das Menü ziehen.\n" |
31822 |
-" - Zum Löschen Menüeinträge aus dem Menü herausz.\n" |
31823 |
-" - Einträge im Menü durch Ziehen neu platzieren.\n" |
31824 |
-" - Einträge durch Ziehen mit gedr. 'Strg' kopieren.\n" |
31825 |
-" - Beschriftung durch Doppelklick ändern.\n" |
31826 |
-" - Nach Anklicken sind weitere Einstellungen sichtbar." |
31827 |
+" - ziehen Sie Einträge von links in das Menü, um neue Einträge zu erstellen\n" |
31828 |
+" - ziehen Sie Einträge aus dem Menu, um sie zu entfernen\n" |
31829 |
+" - ziehen Sie Einträge innerhalb des Menüs, um sie zu verschieben\n" |
31830 |
+" - ziehen Sie Einträge bei gedrückter Strg-Taste, um sie zu kopieren\n" |
31831 |
+" - doppelklicken Sie auf Einträge, um den Text zu verändern\n" |
31832 |
+" - klicken Sie auf die Einträge, um diese zu konfigurieren " |
31833 |
|
31834 |
-#: ../../WPrefs.app/Menu.c:1122 |
31835 |
+#: ../../WPrefs.app/Menu.c:1120 |
31836 |
#, c-format |
31837 |
msgid "unknown command '%s' in menu" |
31838 |
msgstr "unbekannter Menübefehl '%s'" |
31839 |
|
31840 |
-#: ../../WPrefs.app/Menu.c:1154 |
31841 |
+#: ../../WPrefs.app/Menu.c:1152 |
31842 |
msgid ": Execute Program" |
31843 |
msgstr ": Programm ausführen" |
31844 |
|
31845 |
-#: ../../WPrefs.app/Menu.c:1158 |
31846 |
+#: ../../WPrefs.app/Menu.c:1156 |
31847 |
msgid ": Perform Internal Command" |
31848 |
-msgstr ": Internen Befehl ausführen" |
31849 |
+msgstr ": internen Befehl ausführen" |
31850 |
|
31851 |
-#: ../../WPrefs.app/Menu.c:1162 |
31852 |
+#: ../../WPrefs.app/Menu.c:1160 |
31853 |
msgid ": Open a Submenu" |
31854 |
msgstr ": Untermenü öffnen" |
31855 |
|
31856 |
-#: ../../WPrefs.app/Menu.c:1166 |
31857 |
+#: ../../WPrefs.app/Menu.c:1164 |
31858 |
msgid ": Program Generated Submenu" |
31859 |
-msgstr ": Programmgeneriertes Untermenü" |
31860 |
+msgstr ": programmgeneriertes Unternmenü" |
31861 |
|
31862 |
-#: ../../WPrefs.app/Menu.c:1170 |
31863 |
+#: ../../WPrefs.app/Menu.c:1168 |
31864 |
msgid ": Directory Contents Menu" |
31865 |
msgstr ": Menü mit Verzeichnisinhalt" |
31866 |
|
31867 |
-#: ../../WPrefs.app/Menu.c:1174 |
31868 |
+#: ../../WPrefs.app/Menu.c:1172 |
31869 |
msgid ": Open Workspaces Submenu" |
31870 |
msgstr ": Arbeitsflächen-Untermenü" |
31871 |
|
31872 |
-#: ../../WPrefs.app/Menu.c:1178 |
31873 |
+#: ../../WPrefs.app/Menu.c:1176 |
31874 |
msgid ": Open Window List Submenu" |
31875 |
msgstr ": Fensterlisten-Untermenü" |
31876 |
|
31877 |
-#: ../../WPrefs.app/Menu.c:1403 |
31878 |
+#: ../../WPrefs.app/Menu.c:1401 |
31879 |
msgid "Remove Submenu" |
31880 |
msgstr "Untermenü entfernen" |
31881 |
|
31882 |
-#: ../../WPrefs.app/Menu.c:1404 |
31883 |
+#: ../../WPrefs.app/Menu.c:1402 |
31884 |
msgid "" |
31885 |
"Removing this item will destroy all items inside\n" |
31886 |
"the submenu. Do you really want to do that?" |
31887 |
msgstr "" |
31888 |
"Das Entfernen dieses Eintrages löscht alle Einträge\n" |
31889 |
-"innerhalb des Untermenüs. Wollen Sie das wirklich?" |
31890 |
+"im Untermenü. Wollen Sie das wirklich tun?" |
31891 |
|
31892 |
-#: ../../WPrefs.app/Menu.c:1406 |
31893 |
+#: ../../WPrefs.app/Menu.c:1404 |
31894 |
msgid "Yes" |
31895 |
msgstr "Ja" |
31896 |
|
31897 |
-#: ../../WPrefs.app/Menu.c:1406 |
31898 |
+#: ../../WPrefs.app/Menu.c:1404 |
31899 |
msgid "No" |
31900 |
msgstr "Nein" |
31901 |
|
31902 |
-#: ../../WPrefs.app/Menu.c:1407 |
31903 |
+#: ../../WPrefs.app/Menu.c:1405 |
31904 |
msgid "Yes, don't ask again." |
31905 |
-msgstr "Ja, nicht mehr nachfragen" |
31906 |
- |
31907 |
-#. if there is a localized plmenu for the tongue put it's filename here |
31908 |
-#: ../../WPrefs.app/Menu.c:1575 ../../WPrefs.app/Menu.c:1582 |
31909 |
-#, c-format |
31910 |
-msgid "%s/Library/WindowMaker/plmenu" |
31911 |
-msgstr "%s/Library/WindowMaker/plmenu.de" |
31912 |
+msgstr "Ja, alle" |
31913 |
|
31914 |
-#: ../../WPrefs.app/Menu.c:1591 |
31915 |
+#: ../../WPrefs.app/Menu.c:1579 |
31916 |
#, c-format |
31917 |
msgid "Could not open default menu from '%s'" |
31918 |
-msgstr "Standardmenü '%s' konnte nicht geöffnet werden" |
31919 |
+msgstr "Standardmenü aus '%s' konnte nicht geöffnet werden" |
31920 |
+ |
31921 |
+#: ../../WPrefs.app/Menu.c:1583 ../../WPrefs.app/MouseSettings.c:140 |
31922 |
+#: ../../WPrefs.app/MouseSettings.c:160 ../../WPrefs.app/TexturePanel.c:615 |
31923 |
+#: ../../WPrefs.app/TexturePanel.c:695 ../../WPrefs.app/Themes.c:96 |
31924 |
+#: ../../WPrefs.app/WPrefs.c:740 ../../WPrefs.app/WPrefs.c:745 |
31925 |
+#: ../../WPrefs.app/WPrefs.c:762 ../../WPrefs.app/WPrefs.c:772 |
31926 |
+#: ../../WPrefs.app/WPrefs.c:782 ../../WPrefs.app/WPrefs.c:820 |
31927 |
+#: ../../WPrefs.app/WPrefs.c:825 |
31928 |
+msgid "Error" |
31929 |
+msgstr "Fehler" |
31930 |
|
31931 |
-#: ../../WPrefs.app/Menu.c:1629 ../../WPrefs.app/WPrefs.c:808 |
31932 |
+#: ../../WPrefs.app/Menu.c:1583 ../../WPrefs.app/MouseSettings.c:142 |
31933 |
+#: ../../WPrefs.app/MouseSettings.c:162 ../../WPrefs.app/TexturePanel.c:616 |
31934 |
+#: ../../WPrefs.app/TexturePanel.c:697 ../../WPrefs.app/TexturePanel.c:1529 |
31935 |
+#: ../../WPrefs.app/Themes.c:98 ../../WPrefs.app/WPrefs.c:740 |
31936 |
+#: ../../WPrefs.app/WPrefs.c:745 ../../WPrefs.app/WPrefs.c:764 |
31937 |
+#: ../../WPrefs.app/WPrefs.c:776 ../../WPrefs.app/WPrefs.c:782 |
31938 |
+#: ../../WPrefs.app/WPrefs.c:789 ../../WPrefs.app/WPrefs.c:820 |
31939 |
+#: ../../WPrefs.app/WPrefs.c:825 ../../WPrefs.app/imagebrowser.c:105 |
31940 |
+msgid "OK" |
31941 |
+msgstr "OK" |
31942 |
+ |
31943 |
+#: ../../WPrefs.app/Menu.c:1612 ../../WPrefs.app/WPrefs.c:789 |
31944 |
msgid "Warning" |
31945 |
msgstr "Warnung" |
31946 |
|
31947 |
-#: ../../WPrefs.app/Menu.c:1630 |
31948 |
+#: ../../WPrefs.app/Menu.c:1613 |
31949 |
msgid "" |
31950 |
"The menu file format currently in use is not supported\n" |
31951 |
"by this tool. Do you want to discard the current menu\n" |
31952 |
"to use this tool?" |
31953 |
msgstr "" |
31954 |
-"Das momentan verwendete Menüdateiformat wird vom\n" |
31955 |
-"Programm nicht unterstützt. Wollen Sie das aktuelle Menü\n" |
31956 |
-"verwerfen, um dieses Programm verwenden zu können?" |
31957 |
+"Das momentan verwendete Menüdateiformat wird von\n" |
31958 |
+"diesem Programm nicht unterstützt. Wollen Sie das aktuelle\n" |
31959 |
+"Menü verwerfen, um dieses Programm verwenden zu können?" |
31960 |
|
31961 |
-#: ../../WPrefs.app/Menu.c:1633 |
31962 |
+#: ../../WPrefs.app/Menu.c:1616 |
31963 |
msgid "Yes, Discard and Update" |
31964 |
msgstr "Ja, Verwerfen und Erneuern" |
31965 |
|
31966 |
-#: ../../WPrefs.app/Menu.c:1634 |
31967 |
+#: ../../WPrefs.app/Menu.c:1617 |
31968 |
msgid "No, Keep Current Menu" |
31969 |
msgstr "Nein, aktuelles Menü behalten" |
31970 |
|
31971 |
-#: ../../WPrefs.app/Menu.c:1897 |
31972 |
+#: ../../WPrefs.app/Menu.c:1880 |
31973 |
msgid "Applications Menu Definition" |
31974 |
msgstr "Anwendungsmenü-Definition" |
31975 |
|
31976 |
-#: ../../WPrefs.app/Menu.c:1899 |
31977 |
+#: ../../WPrefs.app/Menu.c:1882 |
31978 |
msgid "Edit the menu for launching applications." |
31979 |
msgstr "Editieren des Menüs zum Starten von Anwendungen" |
31980 |
|
31981 |
@@ -1286,16 +1290,16 @@ |
31982 |
"Always open submenus inside the screen, instead of scrolling.\n" |
31983 |
"Note: this is annoying." |
31984 |
msgstr "" |
31985 |
-"Untermenüs immer innerhalb des Bildschirms anzeigen, statt zu scrollen.\n" |
31986 |
-"Anmerkung: Nicht empfehlenswert." |
31987 |
+"Untermenüs immer im Bildschirm öffnen anstatt zu Scrollen.\n" |
31988 |
+"Anmerkung: kann störend sein." |
31989 |
|
31990 |
#: ../../WPrefs.app/MenuPreferences.c:209 |
31991 |
msgid "Scroll off-screen menus when pointer is moved over them." |
31992 |
-msgstr "AuÃenliegende Menüs hereinbewegen, wenn der Mauszeiger darüber ist." |
31993 |
+msgstr "Menüs auÃerhalb des Bildschirms scrollen, wenn der Mauszeiger über ihnen ist." |
31994 |
|
31995 |
#: ../../WPrefs.app/MenuPreferences.c:229 |
31996 |
msgid "Menu Preferences" |
31997 |
-msgstr "Menü-Einstellungen" |
31998 |
+msgstr "Menüeinstellungen" |
31999 |
|
32000 |
#: ../../WPrefs.app/MenuPreferences.c:231 |
32001 |
msgid "" |
32002 |
@@ -1307,15 +1311,15 @@ |
32003 |
|
32004 |
#: ../../WPrefs.app/MouseSettings.c:141 |
32005 |
msgid "Invalid mouse acceleration value. Must be a positive real value." |
32006 |
-msgstr "Ungültiger Wert für Mausbeschleunigung: Positiver Wert erwartet." |
32007 |
+msgstr "Ungültiger Wert für Mausy^: positive Kommazahl erwartet." |
32008 |
|
32009 |
#: ../../WPrefs.app/MouseSettings.c:161 |
32010 |
msgid "" |
32011 |
"Invalid mouse acceleration threshold value. Must be the number of pixels to " |
32012 |
"travel before accelerating." |
32013 |
msgstr "" |
32014 |
-"Ungültiger Schwellwert für Mausbeschleunigung: Anzahl der zurückgelegten " |
32015 |
-"Pixel erwartet" |
32016 |
+"Ungültiger Schwellenwert für Mausbeuschleunigung: Anzahl der zurückgelegten " |
32017 |
+"Pixel erwartet." |
32018 |
|
32019 |
#: ../../WPrefs.app/MouseSettings.c:262 ../../WPrefs.app/MouseSettings.c:274 |
32020 |
#: ../../WPrefs.app/MouseSettings.c:286 ../../WPrefs.app/MouseSettings.c:298 |
32021 |
@@ -1329,36 +1333,36 @@ |
32022 |
"modifier key %s for option ModifierKey was not recognized. Using %s as " |
32023 |
"default" |
32024 |
msgstr "" |
32025 |
-"Umschalttaste %s für die Option \"ModifierKey\" wurde nicht erkannt. Standard %s " |
32026 |
+"Tastenmodifikator %s für die Option ModifierKey wurde nicht erkannt. Standardwert %s " |
32027 |
"wird benutzt" |
32028 |
|
32029 |
#: ../../WPrefs.app/MouseSettings.c:382 |
32030 |
msgid "could not retrieve keyboard modifier mapping" |
32031 |
-msgstr "Tastaturmodifikator-Belegung konnte nicht zurückverfolgt werden" |
32032 |
+msgstr "Tastenmodifikator-Zuordnung konnte nicht zurückverfolgt werden" |
32033 |
|
32034 |
#: ../../WPrefs.app/MouseSettings.c:477 |
32035 |
msgid "Mouse Speed" |
32036 |
-msgstr " Mausgeschwindigkeit " |
32037 |
+msgstr "Mausgeschwindigkeit" |
32038 |
|
32039 |
#: ../../WPrefs.app/MouseSettings.c:507 |
32040 |
msgid "Acceler.:" |
32041 |
-msgstr "Beschl." |
32042 |
+msgstr "Beschl.:" |
32043 |
|
32044 |
#: ../../WPrefs.app/MouseSettings.c:520 |
32045 |
msgid "Threshold:" |
32046 |
-msgstr "Schwellwert" |
32047 |
+msgstr "Schwelle:" |
32048 |
|
32049 |
#: ../../WPrefs.app/MouseSettings.c:535 |
32050 |
msgid "Double-Click Delay" |
32051 |
-msgstr " Doppelklickverzögerung " |
32052 |
+msgstr "Doppelklickverzögerung" |
32053 |
|
32054 |
#: ../../WPrefs.app/MouseSettings.c:579 |
32055 |
msgid "Test" |
32056 |
-msgstr "Test" |
32057 |
+msgstr "" |
32058 |
|
32059 |
#: ../../WPrefs.app/MouseSettings.c:609 |
32060 |
msgid "Workspace Mouse Actions" |
32061 |
-msgstr " Arbeitsflächen-Mausklicks " |
32062 |
+msgstr "Arbeitsflächen-Mausaktionen" |
32063 |
|
32064 |
#: ../../WPrefs.app/MouseSettings.c:614 |
32065 |
msgid "Disable mouse actions" |
32066 |
@@ -1366,15 +1370,15 @@ |
32067 |
|
32068 |
#: ../../WPrefs.app/MouseSettings.c:620 |
32069 |
msgid "Left Button" |
32070 |
-msgstr "Linke Taste" |
32071 |
+msgstr "Links" |
32072 |
|
32073 |
#: ../../WPrefs.app/MouseSettings.c:630 |
32074 |
msgid "Middle Button" |
32075 |
-msgstr "Mittlere Taste" |
32076 |
+msgstr "Mitte" |
32077 |
|
32078 |
#: ../../WPrefs.app/MouseSettings.c:640 |
32079 |
msgid "Right Button" |
32080 |
-msgstr "Rechte Taste" |
32081 |
+msgstr "Rechts" |
32082 |
|
32083 |
#: ../../WPrefs.app/MouseSettings.c:650 |
32084 |
msgid "Mouse Wheel" |
32085 |
@@ -1382,7 +1386,7 @@ |
32086 |
|
32087 |
#: ../../WPrefs.app/MouseSettings.c:672 |
32088 |
msgid "Mouse Grab Modifier" |
32089 |
-msgstr " Taste zum Aufnehmen " |
32090 |
+msgstr "Taste zum Aufnehmen" |
32091 |
|
32092 |
#: ../../WPrefs.app/MouseSettings.c:674 |
32093 |
msgid "" |
32094 |
@@ -1390,19 +1394,19 @@ |
32095 |
"involve dragging windows with the mouse,\n" |
32096 |
"clicking inside the window." |
32097 |
msgstr "" |
32098 |
-"Taste zum Verschieben eines Fensters,\n" |
32099 |
-"wenn in dessen Client-Bereich geklickt\n" |
32100 |
-"wurde." |
32101 |
+"Die Modifikatortaste, die den Verschiebe- oder\n" |
32102 |
+"GröÃenänderungsmodus aktiviert, wenn auf\n" |
32103 |
+"das Fenster geklickt wurde." |
32104 |
|
32105 |
#: ../../WPrefs.app/MouseSettings.c:708 |
32106 |
#, c-format |
32107 |
msgid "could not create %s" |
32108 |
-msgstr "%s konnte nicht erzeugt werden" |
32109 |
+msgstr "%s konnte nicht erstellt werden" |
32110 |
|
32111 |
#: ../../WPrefs.app/MouseSettings.c:724 |
32112 |
#, c-format |
32113 |
msgid "could not create temporary file %s" |
32114 |
-msgstr "temporäre Datei %s konnte nicht erzeugt werden" |
32115 |
+msgstr "temporäre Datei %s konnte nicht erstellt werden" |
32116 |
|
32117 |
#: ../../WPrefs.app/MouseSettings.c:756 |
32118 |
#, c-format |
32119 |
@@ -1411,35 +1415,35 @@ |
32120 |
|
32121 |
#: ../../WPrefs.app/MouseSettings.c:829 |
32122 |
msgid "Shift" |
32123 |
-msgstr "Shift" |
32124 |
+msgstr "" |
32125 |
|
32126 |
#: ../../WPrefs.app/MouseSettings.c:830 |
32127 |
msgid "Lock" |
32128 |
-msgstr "Untbr" |
32129 |
+msgstr "" |
32130 |
|
32131 |
#: ../../WPrefs.app/MouseSettings.c:831 |
32132 |
msgid "Control" |
32133 |
-msgstr "Strg" |
32134 |
+msgstr "" |
32135 |
|
32136 |
#: ../../WPrefs.app/MouseSettings.c:832 |
32137 |
msgid "Mod1" |
32138 |
-msgstr "Mod1" |
32139 |
+msgstr "" |
32140 |
|
32141 |
#: ../../WPrefs.app/MouseSettings.c:833 |
32142 |
msgid "Mod2" |
32143 |
-msgstr "Mod2" |
32144 |
+msgstr "" |
32145 |
|
32146 |
#: ../../WPrefs.app/MouseSettings.c:834 |
32147 |
msgid "Mod3" |
32148 |
-msgstr "Mod3" |
32149 |
+msgstr "" |
32150 |
|
32151 |
#: ../../WPrefs.app/MouseSettings.c:835 |
32152 |
msgid "Mod4" |
32153 |
-msgstr "Mod4" |
32154 |
+msgstr "" |
32155 |
|
32156 |
#: ../../WPrefs.app/MouseSettings.c:836 |
32157 |
msgid "Mod5" |
32158 |
-msgstr "Mod5" |
32159 |
+msgstr "" |
32160 |
|
32161 |
#: ../../WPrefs.app/MouseSettings.c:839 |
32162 |
msgid "Applications Menu" |
32163 |
@@ -1455,7 +1459,7 @@ |
32164 |
|
32165 |
#: ../../WPrefs.app/MouseSettings.c:849 |
32166 |
msgid "Mouse Preferences" |
32167 |
-msgstr "Maus-Einstellungen" |
32168 |
+msgstr "Mauseinstellungen" |
32169 |
|
32170 |
#: ../../WPrefs.app/MouseSettings.c:851 |
32171 |
msgid "" |
32172 |
@@ -1463,36 +1467,40 @@ |
32173 |
"mouse button bindings etc." |
32174 |
msgstr "" |
32175 |
"Mausgeschwindigkeit/-beschleunigung, Doppelklickverzögerung,\n" |
32176 |
-"Maustastenbelegung usw." |
32177 |
+"Maustastenaktionen" |
32178 |
|
32179 |
#: ../../WPrefs.app/Paths.c:85 |
32180 |
msgid "bad value in option IconPath. Using default path list" |
32181 |
-msgstr "ungültiger Wert in Eigenschaft \"IconPath\". Standard Pfadliste wird verwendet." |
32182 |
+msgstr "ungültiger Wert in Eigenschaft IconPath. Standardliste wird verwendet." |
32183 |
|
32184 |
#: ../../WPrefs.app/Paths.c:102 |
32185 |
msgid "bad value in option PixmapPath. Using default path list" |
32186 |
-msgstr "ungültiger Wert in Eigenschaft \"PixmapPath\". Standard Pfadliste wird verwendet." |
32187 |
+msgstr "ungültiger Wert in Eigenschaft PixmapPath. Standardliste wird verwendet." |
32188 |
|
32189 |
#: ../../WPrefs.app/Paths.c:150 |
32190 |
msgid "Select directory" |
32191 |
-msgstr "Verzeichnis wählen" |
32192 |
+msgstr "Verzeichnis auswählen" |
32193 |
|
32194 |
#: ../../WPrefs.app/Paths.c:266 |
32195 |
msgid "Icon Search Paths" |
32196 |
-msgstr "Symbol-Verzeichnisse" |
32197 |
+msgstr "Symbol-Suchpfade" |
32198 |
|
32199 |
#: ../../WPrefs.app/Paths.c:277 ../../WPrefs.app/Paths.c:308 |
32200 |
#: ../../WPrefs.app/TexturePanel.c:1312 |
32201 |
msgid "Add" |
32202 |
msgstr "Hinzufügen" |
32203 |
|
32204 |
+#: ../../WPrefs.app/Paths.c:284 ../../WPrefs.app/Paths.c:315 |
32205 |
+msgid "Remove" |
32206 |
+msgstr "Entfernen" |
32207 |
+ |
32208 |
#: ../../WPrefs.app/Paths.c:297 |
32209 |
msgid "Pixmap Search Paths" |
32210 |
-msgstr "Pixmap-Verzeichnisse" |
32211 |
+msgstr "Pixmap-Suchpfade" |
32212 |
|
32213 |
#: ../../WPrefs.app/Paths.c:337 |
32214 |
msgid "Search Path Configuration" |
32215 |
-msgstr "Suchpfad-Einstellungen" |
32216 |
+msgstr "Suchpfadeinstellungen" |
32217 |
|
32218 |
#: ../../WPrefs.app/Paths.c:339 |
32219 |
msgid "" |
32220 |
@@ -1501,10 +1509,12 @@ |
32221 |
msgstr "Suchpfade für Pixmaps und Symbole" |
32222 |
|
32223 |
#: ../../WPrefs.app/Preferences.c:75 |
32224 |
+#, c-format |
32225 |
msgid "OFF" |
32226 |
-msgstr "Aus" |
32227 |
+msgstr "AUS" |
32228 |
|
32229 |
#: ../../WPrefs.app/Preferences.c:77 |
32230 |
+#, c-format |
32231 |
msgid "1 pixel" |
32232 |
msgstr "1 Pixel" |
32233 |
|
32234 |
@@ -1529,8 +1539,8 @@ |
32235 |
"The position or style of the window size\n" |
32236 |
"display that's shown when a window is resized." |
32237 |
msgstr "" |
32238 |
-"Die Position oder Stil der GröÃenanzeige,\n" |
32239 |
-"die beim Verändern eines Fensters erscheint." |
32240 |
+"Die Position und Art der Anzeige die bei der\n" |
32241 |
+"GröÃenänderung der Fensters benutzt wird." |
32242 |
|
32243 |
#: ../../WPrefs.app/Preferences.c:238 ../../WPrefs.app/Preferences.c:259 |
32244 |
msgid "Corner of screen" |
32245 |
@@ -1546,11 +1556,11 @@ |
32246 |
|
32247 |
#: ../../WPrefs.app/Preferences.c:241 |
32248 |
msgid "Technical drawing-like" |
32249 |
-msgstr "Wie technische Zeichnung" |
32250 |
+msgstr "wie technische Zeichnung" |
32251 |
|
32252 |
#: ../../WPrefs.app/Preferences.c:242 ../../WPrefs.app/Preferences.c:262 |
32253 |
msgid "Disabled" |
32254 |
-msgstr "Deaktiviert" |
32255 |
+msgstr "Keine" |
32256 |
|
32257 |
#: ../../WPrefs.app/Preferences.c:250 |
32258 |
msgid "Position Display" |
32259 |
@@ -1561,8 +1571,8 @@ |
32260 |
"The position or style of the window position\n" |
32261 |
"display that's shown when a window is moved." |
32262 |
msgstr "" |
32263 |
-"Ausrichtung oder Stil der Positionsanzeige, die\n" |
32264 |
-"beim Verschieben eines Fensters sichtbar ist." |
32265 |
+"Die Position und Art der Anzeige\n" |
32266 |
+"beim Verschieben eines Fensters" |
32267 |
|
32268 |
#: ../../WPrefs.app/Preferences.c:270 |
32269 |
msgid "Show balloon text for..." |
32270 |
@@ -1578,7 +1588,7 @@ |
32271 |
|
32272 |
#: ../../WPrefs.app/Preferences.c:279 |
32273 |
msgid "application/dock icons" |
32274 |
-msgstr "Anwendungs-/ Docksymbole" |
32275 |
+msgstr "Anwendungs-/Docksymbole" |
32276 |
|
32277 |
#: ../../WPrefs.app/Preferences.c:280 |
32278 |
msgid "internal help" |
32279 |
@@ -1589,8 +1599,8 @@ |
32280 |
"Raise window when switching\n" |
32281 |
"focus with keyboard." |
32282 |
msgstr "" |
32283 |
-"Fenster nach vorne bei Fokus-\n" |
32284 |
-"wechsel mit Tastatur." |
32285 |
+"Aktives Fenster nach Tastatur-\n" |
32286 |
+"Fokuswechsel oben." |
32287 |
|
32288 |
#: ../../WPrefs.app/Preferences.c:298 |
32289 |
msgid "" |
32290 |
@@ -1614,7 +1624,7 @@ |
32291 |
|
32292 |
#: ../../WPrefs.app/Preferences.c:349 |
32293 |
msgid "Miscellaneous Ergonomic Preferences" |
32294 |
-msgstr "Diverse Ergonomie-Einstellungen" |
32295 |
+msgstr "Verschiedene Einstellungen zur Ergonomie" |
32296 |
|
32297 |
#: ../../WPrefs.app/Preferences.c:350 |
32298 |
msgid "" |
32299 |
@@ -1656,15 +1666,15 @@ |
32300 |
#: ../../WPrefs.app/TexturePanel.c:1066 |
32301 |
#, c-format |
32302 |
msgid "error creating texture %s" |
32303 |
-msgstr "Fehler beim Erzeugen der Textur %s" |
32304 |
+msgstr "Fehler beim Erstellen der Textur %s" |
32305 |
|
32306 |
#: ../../WPrefs.app/TexturePanel.c:1256 |
32307 |
msgid "Texture Panel" |
32308 |
-msgstr "Textur bearbeiten" |
32309 |
+msgstr "Texturanzeige" |
32310 |
|
32311 |
#: ../../WPrefs.app/TexturePanel.c:1264 |
32312 |
msgid "Texture Name" |
32313 |
-msgstr "Textur-Name" |
32314 |
+msgstr "Texturname" |
32315 |
|
32316 |
#: ../../WPrefs.app/TexturePanel.c:1276 |
32317 |
msgid "Solid Color" |
32318 |
@@ -1684,27 +1694,27 @@ |
32319 |
|
32320 |
#: ../../WPrefs.app/TexturePanel.c:1280 |
32321 |
msgid "Image Texture" |
32322 |
-msgstr "Grafik-Textur" |
32323 |
+msgstr "Bildtextur" |
32324 |
|
32325 |
#: ../../WPrefs.app/TexturePanel.c:1288 |
32326 |
msgid "Default Color" |
32327 |
-msgstr " Standardfarbe " |
32328 |
+msgstr "Standardfarbe" |
32329 |
|
32330 |
#: ../../WPrefs.app/TexturePanel.c:1300 |
32331 |
msgid "Gradient Colors" |
32332 |
-msgstr " Verlaufsfarben " |
32333 |
+msgstr "Verlaufsfarben" |
32334 |
|
32335 |
#: ../../WPrefs.app/TexturePanel.c:1396 |
32336 |
msgid "Direction" |
32337 |
-msgstr " Richtung " |
32338 |
+msgstr "Richtung" |
32339 |
|
32340 |
#: ../../WPrefs.app/TexturePanel.c:1424 |
32341 |
msgid "Gradient" |
32342 |
-msgstr " Verlauf " |
32343 |
+msgstr "Farbverlauf" |
32344 |
|
32345 |
#: ../../WPrefs.app/TexturePanel.c:1442 |
32346 |
msgid "Gradient Opacity" |
32347 |
-msgstr "Transparenz" |
32348 |
+msgstr "Farbverlaufsdeckung" |
32349 |
|
32350 |
#: ../../WPrefs.app/TexturePanel.c:1484 |
32351 |
msgid "Image" |
32352 |
@@ -1720,7 +1730,7 @@ |
32353 |
|
32354 |
#: ../../WPrefs.app/TexturePanel.c:1519 |
32355 |
msgid "Maximize" |
32356 |
-msgstr "Maximiert" |
32357 |
+msgstr "Maximieren" |
32358 |
|
32359 |
#: ../../WPrefs.app/Themes.c:71 ../../WPrefs.app/Themes.c:82 |
32360 |
msgid "Set" |
32361 |
@@ -1728,12 +1738,12 @@ |
32362 |
|
32363 |
#: ../../WPrefs.app/Themes.c:132 |
32364 |
msgid "Stop" |
32365 |
-msgstr "Stop" |
32366 |
+msgstr "" |
32367 |
|
32368 |
#: ../../WPrefs.app/Themes.c:143 ../../WPrefs.app/Themes.c:203 |
32369 |
#: ../../WPrefs.app/Themes.c:223 |
32370 |
msgid "Download" |
32371 |
-msgstr "Herunterladen" |
32372 |
+msgstr "" |
32373 |
|
32374 |
#: ../../WPrefs.app/Themes.c:171 |
32375 |
msgid "Save Current Theme" |
32376 |
@@ -1749,119 +1759,96 @@ |
32377 |
|
32378 |
#: ../../WPrefs.app/Themes.c:193 |
32379 |
msgid "Tile of The Day" |
32380 |
-msgstr "Tageskachel" |
32381 |
+msgstr "Kachel des Tages" |
32382 |
|
32383 |
#: ../../WPrefs.app/Themes.c:213 |
32384 |
msgid "Bar of The Day" |
32385 |
-msgstr "Tagesleiste" |
32386 |
+msgstr "Leiste des Tages" |
32387 |
|
32388 |
-#: ../../WPrefs.app/WPrefs.c:260 |
32389 |
+#: ../../WPrefs.app/WPrefs.c:260 ../../WPrefs.app/WPrefs.c:331 |
32390 |
msgid "Window Maker Preferences" |
32391 |
-msgstr "Window Maker-Einstellungen" |
32392 |
+msgstr "Window Maker Einstellungen" |
32393 |
|
32394 |
-#: ../../WPrefs.app/WPrefs.c:284 |
32395 |
+#: ../../WPrefs.app/WPrefs.c:283 |
32396 |
msgid "Revert Page" |
32397 |
msgstr "Seite zurücknehmen" |
32398 |
|
32399 |
-#: ../../WPrefs.app/WPrefs.c:290 |
32400 |
+#: ../../WPrefs.app/WPrefs.c:289 |
32401 |
msgid "Revert All" |
32402 |
-msgstr "Alle zurücknehmen" |
32403 |
+msgstr "Alles zurücknehmen" |
32404 |
|
32405 |
-#: ../../WPrefs.app/WPrefs.c:296 |
32406 |
+#: ../../WPrefs.app/WPrefs.c:295 |
32407 |
msgid "Save" |
32408 |
msgstr "Speichern" |
32409 |
|
32410 |
-#: ../../WPrefs.app/WPrefs.c:309 |
32411 |
+#: ../../WPrefs.app/WPrefs.c:308 |
32412 |
msgid "Balloon Help" |
32413 |
msgstr "Ballon-Hilfe" |
32414 |
|
32415 |
-#: ../../WPrefs.app/WPrefs.c:334 |
32416 |
-msgid "Window Maker Preferences Utility" |
32417 |
-msgstr "Window Maker Einstellungen" |
32418 |
- |
32419 |
-#: ../../WPrefs.app/WPrefs.c:341 |
32420 |
+#: ../../WPrefs.app/WPrefs.c:338 |
32421 |
#, c-format |
32422 |
-msgid "Version %s for Window Maker %s or newer" |
32423 |
-msgstr "Version %s für Window Maker %s oder neuer" |
32424 |
+msgid "Version %s" |
32425 |
+msgstr "" |
32426 |
|
32427 |
-#: ../../WPrefs.app/WPrefs.c:349 |
32428 |
+#: ../../WPrefs.app/WPrefs.c:345 |
32429 |
msgid "Starting..." |
32430 |
msgstr "Starte..." |
32431 |
|
32432 |
-#: ../../WPrefs.app/WPrefs.c:355 |
32433 |
-msgid "" |
32434 |
-"Programming/Design: Alfredo K. Kojima\n" |
32435 |
-"Artwork: Marco van Hylckama Vlieg, Largo et al\n" |
32436 |
-"More Programming: James Thompson et al" |
32437 |
-msgstr "" |
32438 |
-"Programmierung/Design: Alfredo K. Kojima\n" |
32439 |
-"Künstlerische Gestaltung: Marco van Hylckama Vlieg, Largo et al\n" |
32440 |
-"Weitere Programmierung: James Thompson et al" |
32441 |
- |
32442 |
-#: ../../WPrefs.app/WPrefs.c:455 |
32443 |
+#: ../../WPrefs.app/WPrefs.c:443 |
32444 |
#, c-format |
32445 |
msgid "could not locate image file %s\n" |
32446 |
msgstr "Bilddatei %s konnte nicht gefunden werden\n" |
32447 |
|
32448 |
-#: ../../WPrefs.app/WPrefs.c:670 |
32449 |
+#: ../../WPrefs.app/WPrefs.c:656 |
32450 |
#, c-format |
32451 |
msgid "could not load image file %s:%s" |
32452 |
msgstr "Bilddatei %s konnte nicht geladen werden: %s" |
32453 |
|
32454 |
-#: ../../WPrefs.app/WPrefs.c:689 |
32455 |
+#: ../../WPrefs.app/WPrefs.c:674 |
32456 |
msgid "Loading Window Maker configuration files..." |
32457 |
msgstr "Window Maker-Konfigurationsdateien werden geladen..." |
32458 |
|
32459 |
-#: ../../WPrefs.app/WPrefs.c:693 |
32460 |
+#: ../../WPrefs.app/WPrefs.c:678 |
32461 |
msgid "Initializing configuration panels..." |
32462 |
-msgstr "Einstellungsdialoge werden vorbereitet..." |
32463 |
- |
32464 |
-#: ../../WPrefs.app/WPrefs.c:728 |
32465 |
-msgid "" |
32466 |
-"WPrefs is free software and is distributed WITHOUT ANY\n" |
32467 |
-"WARRANTY under the terms of the GNU General Public License." |
32468 |
-msgstr "" |
32469 |
-"WPrefs ist freie Software und wird OHNE JEDE GEWÃHRLEISTUNG\n" |
32470 |
-"unter den Bedingungen der GNU General Public License vertrieben." |
32471 |
+msgstr "Einstellungsseiten werden vorbereitet..." |
32472 |
|
32473 |
-#: ../../WPrefs.app/WPrefs.c:758 ../../WPrefs.app/WPrefs.c:838 |
32474 |
+#: ../../WPrefs.app/WPrefs.c:739 ../../WPrefs.app/WPrefs.c:819 |
32475 |
#, c-format |
32476 |
msgid "Window Maker domain (%s) is corrupted!" |
32477 |
msgstr "Window Maker-Domäne (%s) ist fehlerhaft!" |
32478 |
|
32479 |
-#: ../../WPrefs.app/WPrefs.c:762 |
32480 |
+#: ../../WPrefs.app/WPrefs.c:743 |
32481 |
#, c-format |
32482 |
msgid "Could not load Window Maker domain (%s) from defaults database." |
32483 |
msgstr "Window Maker-Domäne (%s) konnte nicht aus Standarddatenbank geladen werden." |
32484 |
|
32485 |
-#: ../../WPrefs.app/WPrefs.c:778 |
32486 |
+#: ../../WPrefs.app/WPrefs.c:759 |
32487 |
msgid "could not extract version information from Window Maker" |
32488 |
msgstr "Window Maker-Versionsinformationen konnten nicht festgestellt werden" |
32489 |
|
32490 |
-#: ../../WPrefs.app/WPrefs.c:779 |
32491 |
+#: ../../WPrefs.app/WPrefs.c:760 |
32492 |
msgid "Make sure wmaker is in your search path." |
32493 |
-msgstr "Stellen Sie sicher, das \"wmaker\" im Suchfpad enthalten ist." |
32494 |
+msgstr "Stellen Sie sicher, das \"wmaker\" in Ihrem Suchpfad enhalten ist." |
32495 |
|
32496 |
-#: ../../WPrefs.app/WPrefs.c:782 |
32497 |
+#: ../../WPrefs.app/WPrefs.c:763 |
32498 |
msgid "" |
32499 |
"Could not extract version from Window Maker. Make sure it is correctly " |
32500 |
"installed and is in your PATH environment variable." |
32501 |
msgstr "" |
32502 |
"Window Maker-Versionsinformationen konnten nicht festgestellt werden. " |
32503 |
-"Stellen Sie sicher, das Window Maker korrekt installiert ist und in der PATH-" |
32504 |
-"Variable enthalten ist." |
32505 |
+"Stellen Sie sicher, dass Window Maker korrekt installiert und in der PATH-" |
32506 |
+"Umgebungsvariable enthalten ist." |
32507 |
|
32508 |
-#: ../../WPrefs.app/WPrefs.c:792 |
32509 |
+#: ../../WPrefs.app/WPrefs.c:773 |
32510 |
msgid "" |
32511 |
"Could not extract version from Window Maker. Make sure it is correctly " |
32512 |
"installed and the path where it installed is in the PATH environment " |
32513 |
"variable." |
32514 |
msgstr "" |
32515 |
"Window Maker-Versionsinformationen konnten nicht festgestellt werden. " |
32516 |
-"Stellen Sie sicher, das Window Maker korrekt installiert ist und in der PATH-" |
32517 |
-"Variable enthalten ist." |
32518 |
+"Stellen Sie sicher, dass Window Maker korrekt installiert und der Installationspfad in der PATH-Umgebungsvariable enthalten ist." |
32519 |
|
32520 |
-#: ../../WPrefs.app/WPrefs.c:799 |
32521 |
+#: ../../WPrefs.app/WPrefs.c:780 |
32522 |
#, c-format |
32523 |
msgid "" |
32524 |
"WPrefs only supports Window Maker 0.18.0 or newer.\n" |
32525 |
@@ -1870,44 +1857,42 @@ |
32526 |
"WPrefs unterstützt nur Window Maker 0.18.0 oder neuer.\n" |
32527 |
"Die installierte Version ist %i.%i.%i\n" |
32528 |
|
32529 |
-#: ../../WPrefs.app/WPrefs.c:806 |
32530 |
+#: ../../WPrefs.app/WPrefs.c:787 |
32531 |
#, c-format |
32532 |
msgid "" |
32533 |
"Window Maker %i.%i.%i, which is installed in your system, is not fully " |
32534 |
"supported by this version of WPrefs." |
32535 |
msgstr "" |
32536 |
"Der auf Ihrem System installierte Window Maker %i.%i.%i wird von dieser " |
32537 |
-"WPrefs-Version nicht voll unterstützt." |
32538 |
+"WPrefs-Version nicht komplett unterstützt." |
32539 |
|
32540 |
-#: ../../WPrefs.app/WPrefs.c:819 |
32541 |
+#: ../../WPrefs.app/WPrefs.c:800 |
32542 |
#, c-format |
32543 |
msgid "could not run \"%s --global_defaults_path\"." |
32544 |
msgstr "\"%s --global_defaults_path\" konnte nicht ausgeführt werden." |
32545 |
|
32546 |
-#: ../../WPrefs.app/WPrefs.c:842 |
32547 |
+#: ../../WPrefs.app/WPrefs.c:823 |
32548 |
#, c-format |
32549 |
msgid "Could not load global Window Maker domain (%s)." |
32550 |
msgstr "Globale Window Maker-Domäne (%s) konnte nicht geladen werden." |
32551 |
|
32552 |
-#: ../../WPrefs.app/WPrefs.c:1091 |
32553 |
+#: ../../WPrefs.app/WPrefs.c:1072 |
32554 |
#, c-format |
32555 |
msgid "" |
32556 |
"bad speed value for option %s\n" |
32557 |
". Using default Medium" |
32558 |
msgstr "" |
32559 |
"Falscher Geschwindigkeitswert für Eigenschaft %s.\n" |
32560 |
-"Standard \"Mittel\" wird benutzt." |
32561 |
+"Standardwert 'Mittel' wird benutzt." |
32562 |
|
32563 |
#: ../../WPrefs.app/WindowHandling.c:141 |
32564 |
#, c-format |
32565 |
msgid "bad option value %s in WindowPlacement. Using default value" |
32566 |
-msgstr "Ungültiger Wert %s für \"WindowPlacement\". Standardwert wird benutzt." |
32567 |
+msgstr "Ungültiger Wert %s in Fensterplatzierung. Standardwert wird benutzt." |
32568 |
|
32569 |
#: ../../WPrefs.app/WindowHandling.c:163 |
32570 |
msgid "invalid data in option WindowPlaceOrigin. Using default (0,0)" |
32571 |
-msgstr "" |
32572 |
-"Ungültige Daten in Option \"WindowPlaceOrigin\". Benutze Standardeinstellung " |
32573 |
-"(0,0)" |
32574 |
+msgstr "Ungültige Daten in Option WindowPlaceOrigin. Standardwert (0,0) wird benutzt." |
32575 |
|
32576 |
#: ../../WPrefs.app/WindowHandling.c:243 |
32577 |
msgid "Window Placement" |
32578 |
@@ -1917,7 +1902,7 @@ |
32579 |
msgid "" |
32580 |
"How to place windows when they are first put\n" |
32581 |
"on screen." |
32582 |
-msgstr "Wie Fenster beim ersten Anzeigen platziert werden sollen." |
32583 |
+msgstr "Wahl der Fensterplatzierung beim ersten Anzeigen." |
32584 |
|
32585 |
#: ../../WPrefs.app/WindowHandling.c:250 |
32586 |
msgid "Automatic" |
32587 |
@@ -1937,15 +1922,15 @@ |
32588 |
|
32589 |
#: ../../WPrefs.app/WindowHandling.c:254 |
32590 |
msgid "Smart" |
32591 |
-msgstr "Passend" |
32592 |
+msgstr "Schlau" |
32593 |
|
32594 |
#: ../../WPrefs.app/WindowHandling.c:260 |
32595 |
msgid "Placement Origin" |
32596 |
-msgstr "Platzierungsursprung" |
32597 |
+msgstr "Startplatzierung" |
32598 |
|
32599 |
#: ../../WPrefs.app/WindowHandling.c:321 |
32600 |
msgid "Opaque Move" |
32601 |
-msgstr "Mit Inhalt versch." |
32602 |
+msgstr "Verschiebeart" |
32603 |
|
32604 |
#: ../../WPrefs.app/WindowHandling.c:322 |
32605 |
msgid "" |
32606 |
@@ -1953,13 +1938,13 @@ |
32607 |
"when dragging windows aroung or if only a\n" |
32608 |
"frame should be displayed.\n" |
32609 |
msgstr "" |
32610 |
-"Legt fest, ob beim Verschieben die Fensterinhalte\n" |
32611 |
+"Legt fest, ob beim Verschieben der Fensterinhalt\n" |
32612 |
"oder nur ein Rechteck in FenstergröÃe angezeigt \n" |
32613 |
"werden soll.\n" |
32614 |
|
32615 |
#: ../../WPrefs.app/WindowHandling.c:361 |
32616 |
msgid "When maximizing..." |
32617 |
-msgstr " Beim Maximieren... " |
32618 |
+msgstr "Beim Maximieren..." |
32619 |
|
32620 |
#: ../../WPrefs.app/WindowHandling.c:366 |
32621 |
msgid "...do not cover icons" |
32622 |
@@ -1971,7 +1956,7 @@ |
32623 |
|
32624 |
#: ../../WPrefs.app/WindowHandling.c:381 |
32625 |
msgid "Edge Resistance" |
32626 |
-msgstr " Kantenwiderstand " |
32627 |
+msgstr "Kantenwiderstand" |
32628 |
|
32629 |
#: ../../WPrefs.app/WindowHandling.c:383 |
32630 |
msgid "" |
32631 |
@@ -1980,10 +1965,10 @@ |
32632 |
"when moved against other windows or the edges\n" |
32633 |
"of the screen." |
32634 |
msgstr "" |
32635 |
-"Kantenwiderstand bewirkt, dass Fenster bis\n" |
32636 |
-"zur eingestellten Schwelle weiterer Bewegung\n" |
32637 |
-"widerstehen, wenn sie auf anderen Fenster oder\n" |
32638 |
-"die Bildschirmkante treffen." |
32639 |
+"Der Kantenwiderstand bewirkt, dass Fenster\n" |
32640 |
+"bis zur eingestellten Schwelle weiterer Bewegung\n" |
32641 |
+"widerstehen, wenn sie auf andere Fenster oder die\n" |
32642 |
+"Bildschirmkante treffen." |
32643 |
|
32644 |
#: ../../WPrefs.app/WindowHandling.c:402 |
32645 |
msgid "Resist" |
32646 |
@@ -1993,57 +1978,55 @@ |
32647 |
msgid "Attract" |
32648 |
msgstr "Zug" |
32649 |
|
32650 |
-#: ../../WPrefs.app/WindowHandling.c:423 |
32651 |
+#: ../../WPrefs.app/WindowHandling.c:421 |
32652 |
msgid "" |
32653 |
-"Open dialogs in same workspace\n" |
32654 |
+"Open dialogs in the same workspace\n" |
32655 |
"as their owners" |
32656 |
msgstr "" |
32657 |
-"Dialogfenster auf Arbeitsfläche des\n" |
32658 |
+"Dialoge auf Arbeitsfläche des\n" |
32659 |
"Eigentümers öffnen" |
32660 |
|
32661 |
-#: ../../WPrefs.app/WindowHandling.c:450 |
32662 |
+#: ../../WPrefs.app/WindowHandling.c:448 |
32663 |
msgid "Window Handling Preferences" |
32664 |
-msgstr "Fensterhandhabungs-Einstellungen" |
32665 |
+msgstr "Einstellungen zum Fensterverhalten" |
32666 |
|
32667 |
-#: ../../WPrefs.app/WindowHandling.c:452 |
32668 |
+#: ../../WPrefs.app/WindowHandling.c:450 |
32669 |
msgid "" |
32670 |
"Window handling options. Initial placement style\n" |
32671 |
"edge resistance, opaque move etc." |
32672 |
msgstr "" |
32673 |
-"Einstellungen zur Fensterhandhabung: Anfangsplatzierung,\n" |
32674 |
-"Kantenwiderstand, mit Inhalt verschieben usw." |
32675 |
+"Einstellungen zum Fensterverhalten: Anfangsplatzierung,\n" |
32676 |
+"Kantenwiderstand, Verschiebeart usw." |
32677 |
|
32678 |
#: ../../WPrefs.app/Workspace.c:176 |
32679 |
msgid "Workspace Navigation" |
32680 |
-msgstr " Arbeitsflächennavigation " |
32681 |
+msgstr "Arbeitsflächennavigation" |
32682 |
|
32683 |
#: ../../WPrefs.app/Workspace.c:183 |
32684 |
-msgid "" |
32685 |
-"wrap to the first workspace after the\n" |
32686 |
-"last workspace." |
32687 |
+msgid "Wrap to the first workspace from the last workspace." |
32688 |
msgstr "" |
32689 |
-"Auf letzte Arbeitsfläche folgt wieder\n" |
32690 |
-"die erste" |
32691 |
+"Auf die letzte Arbeitsfläche folgt wieder\n" |
32692 |
+"die erste." |
32693 |
|
32694 |
#: ../../WPrefs.app/Workspace.c:205 |
32695 |
-msgid "switch workspaces while dragging windows." |
32696 |
-msgstr "Beim Bewegen von Fenstern Arbeitsfläche wechseln" |
32697 |
+msgid "Switch workspaces while dragging windows." |
32698 |
+msgstr "Beim Bewegen von Fenstern Arbeitsfläche wechseln." |
32699 |
|
32700 |
#: ../../WPrefs.app/Workspace.c:227 |
32701 |
-msgid "automatically create new workspaces." |
32702 |
-msgstr "Automatisch neue Arbeitsflächen erzeugen" |
32703 |
+msgid "Automatically create new workspaces." |
32704 |
+msgstr "Automatisch neue Arbeitsflächen erstellen." |
32705 |
|
32706 |
#: ../../WPrefs.app/Workspace.c:250 |
32707 |
msgid "" |
32708 |
"Position of workspace\n" |
32709 |
"name display" |
32710 |
msgstr "" |
32711 |
-"Position des\n" |
32712 |
-"Arbeitsflächennamens" |
32713 |
+"Position des Namens\n" |
32714 |
+"der Arbeitsfläche" |
32715 |
|
32716 |
#: ../../WPrefs.app/Workspace.c:269 |
32717 |
msgid "Disable" |
32718 |
-msgstr "Deaktiviert" |
32719 |
+msgstr "Keiner" |
32720 |
|
32721 |
#: ../../WPrefs.app/Workspace.c:271 |
32722 |
msgid "Top" |
32723 |
@@ -2071,35 +2054,35 @@ |
32724 |
|
32725 |
#: ../../WPrefs.app/Workspace.c:284 |
32726 |
msgid "Dock/Clip" |
32727 |
-msgstr " Dock/Clip " |
32728 |
+msgstr "Dock/Clip" |
32729 |
|
32730 |
#: ../../WPrefs.app/Workspace.c:303 |
32731 |
msgid "" |
32732 |
"Disable/enable the application Dock (the\n" |
32733 |
"vertical icon bar in the side of the screen)." |
32734 |
msgstr "" |
32735 |
-"Anwendungsdock ein-/ausschalten (die vertikale\n" |
32736 |
-"Symbolleiste am Rande des Bildschirmes)." |
32737 |
+"Anwendungsdock ein-/ausschalten (die\n" |
32738 |
+"vertikale Symbolleiste am Rande des Bildschirmes)." |
32739 |
|
32740 |
#: ../../WPrefs.app/Workspace.c:324 |
32741 |
msgid "" |
32742 |
"Disable/enable the Clip (that thing with\n" |
32743 |
"a paper clip icon)." |
32744 |
msgstr "" |
32745 |
-"Clip ein-/ausschalten (das Ding mit\n" |
32746 |
-"dem Büroklammersymbol)." |
32747 |
+"Clip ein-/ausschalten (das Ding mit der\n" |
32748 |
+"Büroklammer)." |
32749 |
|
32750 |
#: ../../WPrefs.app/Workspace.c:364 |
32751 |
msgid "Workspace Preferences" |
32752 |
-msgstr "Arbeitsflächen-Einstellungen" |
32753 |
+msgstr "Arbeitsflächeneinstellungen" |
32754 |
|
32755 |
#: ../../WPrefs.app/Workspace.c:366 |
32756 |
msgid "" |
32757 |
"Workspace navigation features.\n" |
32758 |
"You can also enable/disable the Dock and Clip here." |
32759 |
msgstr "" |
32760 |
-"Einstellungen zur Arbeitsflächennavigation. Auch Dock\n" |
32761 |
-"und Clip können hier ein-/ausgeschaltet werden." |
32762 |
+"Einstellungen zur Arbeitsflächennavigation.\n" |
32763 |
+"Auch Dock und Clip können hier ein-/ausgeschaltet werden." |
32764 |
|
32765 |
#: ../../WPrefs.app/imagebrowser.c:95 |
32766 |
msgid "View" |
32767 |
@@ -2131,20 +2114,20 @@ |
32768 |
msgid "too few arguments for %s" |
32769 |
msgstr "zu wenig Argumente für %s" |
32770 |
|
32771 |
-#: ../../WPrefs.app/main.c:144 |
32772 |
+#: ../../WPrefs.app/main.c:145 |
32773 |
msgid "X server does not support locale" |
32774 |
-msgstr "X-Server unterstützt keine Lokalisierung" |
32775 |
+msgstr "X-Server unterstützt keine Lokalisierungen" |
32776 |
|
32777 |
-#: ../../WPrefs.app/main.c:147 |
32778 |
+#: ../../WPrefs.app/main.c:148 |
32779 |
msgid "cannot set locale modifiers" |
32780 |
msgstr "Lokalisierung kann nicht gesetzt werden" |
32781 |
|
32782 |
-#: ../../WPrefs.app/main.c:153 |
32783 |
+#: ../../WPrefs.app/main.c:154 |
32784 |
#, c-format |
32785 |
msgid "could not open display %s" |
32786 |
-msgstr "Display %s konnte nicht geöffnet werden" |
32787 |
+msgstr "Display %s kann nicht geöffnet werden" |
32788 |
|
32789 |
-#: ../../WPrefs.app/main.c:161 |
32790 |
+#: ../../WPrefs.app/main.c:162 |
32791 |
msgid "could not initialize application" |
32792 |
msgstr "Anwendung konnte nicht initialisiert werden" |
32793 |
|
32794 |
diff -uhrN WindowMaker-0.92.0/wrlib/convert.c WindowMaker-CVS-20060123/wrlib/convert.c |
32795 |
--- WindowMaker-0.92.0/wrlib/convert.c 2004-10-12 20:20:30.000000000 +0200 |
32796 |
+++ WindowMaker-CVS-20060123/wrlib/convert.c 2005-08-23 00:30:35.000000000 +0200 |
32797 |
@@ -68,8 +68,9 @@ |
32798 |
extern void x86_mmx_TrueColor_32_to_16(unsigned char *image, |
32799 |
unsigned short *ximage, |
32800 |
short *err, short *nerr, |
32801 |
- short *rtable, short *gtable, |
32802 |
- short *btable, |
32803 |
+ const unsigned short *rtable, |
32804 |
+ const unsigned short *gtable, |
32805 |
+ const unsigned short *btable, |
32806 |
int dr, int dg, int db, |
32807 |
unsigned int roffs, |
32808 |
unsigned int goffs, |
32809 |
@@ -175,9 +176,9 @@ |
32810 |
static void |
32811 |
convertTrueColor_generic(RXImage *ximg, RImage *image, |
32812 |
signed char *err, signed char *nerr, |
32813 |
- const short *rtable, |
32814 |
- const short *gtable, |
32815 |
- const short *btable, |
32816 |
+ const unsigned short *rtable, |
32817 |
+ const unsigned short *gtable, |
32818 |
+ const unsigned short *btable, |
32819 |
const int dr, const int dg, const int db, |
32820 |
const unsigned short roffs, |
32821 |
const unsigned short goffs, |
32822 |
@@ -408,8 +409,8 @@ |
32823 |
} else |
32824 |
#endif /* ASM_X86_MMX */ |
32825 |
{ |
32826 |
- char *err; |
32827 |
- char *nerr; |
32828 |
+ signed char *err; |
32829 |
+ signed char *nerr; |
32830 |
int ch = (HAS_ALPHA(image) ? 4 : 3); |
32831 |
|
32832 |
err = malloc(ch*(image->width+2)); |
32833 |
@@ -447,9 +448,9 @@ |
32834 |
static void |
32835 |
convertPseudoColor_to_8(RXImage *ximg, RImage *image, |
32836 |
signed char *err, signed char *nerr, |
32837 |
- const short *rtable, |
32838 |
- const short *gtable, |
32839 |
- const short *btable, |
32840 |
+ const unsigned short *rtable, |
32841 |
+ const unsigned short *gtable, |
32842 |
+ const unsigned short *btable, |
32843 |
const int dr, const int dg, const int db, |
32844 |
unsigned long *pixels, |
32845 |
int cpc) |
32846 |
@@ -459,7 +460,7 @@ |
32847 |
int pixel; |
32848 |
int rer, ger, ber; |
32849 |
unsigned char *ptr = image->data; |
32850 |
- unsigned char *optr = ximg->image->data; |
32851 |
+ unsigned char *optr = (unsigned char*)ximg->image->data; |
32852 |
int channels = (HAS_ALPHA(image) ? 4 : 3); |
32853 |
int cpcpc = cpc*cpc; |
32854 |
|
32855 |
@@ -573,8 +574,8 @@ |
32856 |
} |
32857 |
} else { |
32858 |
/* dither */ |
32859 |
- char *err; |
32860 |
- char *nerr; |
32861 |
+ signed char *err; |
32862 |
+ signed char *nerr; |
32863 |
const int dr=0xff/rmask; |
32864 |
const int dg=0xff/gmask; |
32865 |
const int db=0xff/bmask; |
32866 |
diff -uhrN WindowMaker-0.92.0/wrlib/gradient.c WindowMaker-CVS-20060123/wrlib/gradient.c |
32867 |
--- WindowMaker-0.92.0/wrlib/gradient.c 2004-10-12 20:21:11.000000000 +0200 |
32868 |
+++ WindowMaker-CVS-20060123/wrlib/gradient.c 2005-08-23 00:04:37.000000000 +0200 |
32869 |
@@ -242,7 +242,7 @@ |
32870 |
RImage *image, *tmp; |
32871 |
int j; |
32872 |
float a, offset; |
32873 |
- char *ptr; |
32874 |
+ unsigned char *ptr; |
32875 |
|
32876 |
if (width == 1) |
32877 |
return renderVGradient(width, height, r0, g0, b0, rf, gf, bf); |
32878 |
diff -uhrN WindowMaker-0.92.0/wrlib/ppm.c WindowMaker-CVS-20060123/wrlib/ppm.c |
32879 |
--- WindowMaker-0.92.0/wrlib/ppm.c 2004-10-12 20:22:13.000000000 +0200 |
32880 |
+++ WindowMaker-CVS-20060123/wrlib/ppm.c 2005-08-23 00:09:41.000000000 +0200 |
32881 |
@@ -43,8 +43,9 @@ |
32882 |
|
32883 |
} else { |
32884 |
if (max<256) { |
32885 |
+ unsigned char *ptr; |
32886 |
+ char *buf; |
32887 |
int x, y; |
32888 |
- char *buf, *ptr; |
32889 |
|
32890 |
buf = malloc(w+1); |
32891 |
if (!buf) { |
32892 |
@@ -83,7 +84,7 @@ |
32893 |
RImage *image; |
32894 |
int i; |
32895 |
char buf[3]; |
32896 |
- char *ptr; |
32897 |
+ unsigned char *ptr; |
32898 |
|
32899 |
image = RCreateImage(w, h, 0); |
32900 |
if (!image) { |
32901 |
diff -uhrN WindowMaker-0.92.0/wrlib/raster.c WindowMaker-CVS-20060123/wrlib/raster.c |
32902 |
--- WindowMaker-0.92.0/wrlib/raster.c 2004-10-25 03:48:39.000000000 +0200 |
32903 |
+++ WindowMaker-CVS-20060123/wrlib/raster.c 2005-08-23 00:35:27.000000000 +0200 |
32904 |
@@ -283,31 +283,37 @@ |
32905 |
|
32906 |
int |
32907 |
calculateCombineArea(RImage *des, RImage *src, int *sx, int *sy, |
32908 |
- int *swidth, int *sheight, int *dx, int *dy) |
32909 |
+ unsigned int *swidth, unsigned int *sheight, int *dx, int *dy) |
32910 |
{ |
32911 |
+ int width = (int)*swidth, height = (int)*sheight; |
32912 |
+ |
32913 |
if (*dx < 0) { |
32914 |
*sx = -*dx; |
32915 |
- *swidth = *swidth + *dx; |
32916 |
+ width = width + *dx; |
32917 |
*dx = 0; |
32918 |
} |
32919 |
|
32920 |
- if (*dx + *swidth > des->width) { |
32921 |
- *swidth = des->width - *dx; |
32922 |
+ if (*dx + width > des->width) { |
32923 |
+ width = des->width - *dx; |
32924 |
} |
32925 |
|
32926 |
if (*dy < 0) { |
32927 |
*sy = -*dy; |
32928 |
- *sheight = *sheight + *dy; |
32929 |
+ height = height + *dy; |
32930 |
*dy = 0; |
32931 |
} |
32932 |
|
32933 |
- if (*dy + *sheight > des->height) { |
32934 |
- *sheight = des->height - *dy; |
32935 |
+ if (*dy + height > des->height) { |
32936 |
+ height = des->height - *dy; |
32937 |
} |
32938 |
|
32939 |
- if (*sheight > 0 && *swidth > 0) { |
32940 |
+ if (height>0 && width>0) { |
32941 |
+ *swidth = width; |
32942 |
+ *sheight = height; |
32943 |
return True; |
32944 |
- } else return False; |
32945 |
+ } |
32946 |
+ |
32947 |
+ return False; |
32948 |
} |
32949 |
|
32950 |
void |
32951 |
diff -uhrN WindowMaker-0.92.0/wrlib/tests/Makefile.am WindowMaker-CVS-20060123/wrlib/tests/Makefile.am |
32952 |
--- WindowMaker-0.92.0/wrlib/tests/Makefile.am 2005-03-02 11:09:45.000000000 +0100 |
32953 |
+++ WindowMaker-CVS-20060123/wrlib/tests/Makefile.am 2006-01-22 16:47:25.000000000 +0100 |
32954 |
@@ -6,7 +6,7 @@ |
32955 |
|
32956 |
EXTRA_DIST = test.png tile.xpm ballot_box.xpm |
32957 |
|
32958 |
-INCLUDES = -I.. $(DFLAGS) @HEADER_SEARCH_PATH@ |
32959 |
+INCLUDES = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@ |
32960 |
|
32961 |
LIBLIST = $(top_builddir)/wrlib/libwraster.la |
32962 |
|
32963 |
diff -uhrN WindowMaker-0.92.0/wrlib/tests/Makefile.in WindowMaker-CVS-20060123/wrlib/tests/Makefile.in |
32964 |
--- WindowMaker-0.92.0/wrlib/tests/Makefile.in 2005-06-19 05:23:01.000000000 +0200 |
32965 |
+++ WindowMaker-CVS-20060123/wrlib/tests/Makefile.in 2006-01-22 21:33:54.000000000 +0100 |
32966 |
@@ -118,7 +118,7 @@ |
32967 |
|
32968 |
EXTRA_DIST = test.png tile.xpm ballot_box.xpm |
32969 |
|
32970 |
-INCLUDES = -I.. $(DFLAGS) @HEADER_SEARCH_PATH@ |
32971 |
+INCLUDES = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@ |
32972 |
|
32973 |
LIBLIST = $(top_builddir)/wrlib/libwraster.la |
32974 |
|
32975 |
diff -uhrN WindowMaker-0.92.0/wrlib/x86_specific.c WindowMaker-CVS-20060123/wrlib/x86_specific.c |
32976 |
--- WindowMaker-0.92.0/wrlib/x86_specific.c 2004-10-31 02:44:01.000000000 +0100 |
32977 |
+++ WindowMaker-CVS-20060123/wrlib/x86_specific.c 2005-08-23 00:05:43.000000000 +0200 |
32978 |
@@ -85,9 +85,9 @@ |
32979 |
unsigned short *ximage, |
32980 |
short *err, |
32981 |
short *nerr, |
32982 |
- short *rtable, |
32983 |
- short *gtable, |
32984 |
- short *btable, |
32985 |
+ unsigned short *rtable, |
32986 |
+ unsigned short *gtable, |
32987 |
+ unsigned short *btable, |
32988 |
int dr, |
32989 |
int dg, |
32990 |
int db, |
32991 |
@@ -98,15 +98,27 @@ |
32992 |
int height, |
32993 |
int line_offset) |
32994 |
{ |
32995 |
- long long rrggbbaa; |
32996 |
- long long pixel; |
32997 |
+ union { |
32998 |
+ long long rrggbbaa; |
32999 |
+ struct { |
33000 |
+ short int rr, gg, bb, aa; |
33001 |
+ } words; |
33002 |
+ } rrggbbaa; |
33003 |
+ |
33004 |
+ union { |
33005 |
+ long long pixel; |
33006 |
+ struct { |
33007 |
+ short int rr, gg, bb, aa; |
33008 |
+ } words; |
33009 |
+ } pixel; |
33010 |
+ |
33011 |
short *tmp_err; |
33012 |
short *tmp_nerr; |
33013 |
int x; |
33014 |
|
33015 |
asm volatile |
33016 |
( |
33017 |
- "pushal \n\t" |
33018 |
+ "pushl %%ebx \n\t" |
33019 |
|
33020 |
// pack dr, dg and db into mm6 |
33021 |
"movl %7, %%eax \n\t" |
33022 |
@@ -219,7 +231,7 @@ |
33023 |
"movq %%mm0, %%mm1 \n\t" |
33024 |
"pmullw %%mm5, %%mm1 \n\t" // mm1 = mm1*7 |
33025 |
"psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16 |
33026 |
- "paddw 8(%%ebx), %%mm1 \n\t" |
33027 |
+ "paddw 8(%%ebx), %%mm1 \n\t" |
33028 |
"movq %%mm1, 8(%%ebx) \n\t" // err[x+1,y] = rer*7/16 |
33029 |
|
33030 |
|
33031 |
@@ -228,7 +240,7 @@ |
33032 |
"movq %%mm0, %%mm1 \n\t" |
33033 |
"pmullw %%mm4, %%mm1 \n\t" // mm1 = mm1*5 |
33034 |
"psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16 |
33035 |
- "paddw -8(%%ebx), %%mm1 \n\t" |
33036 |
+ "paddw -8(%%ebx), %%mm1 \n\t" |
33037 |
"movq %%mm1, -8(%%ebx) \n\t" // err[x-1,y+1] += rer*3/16 |
33038 |
|
33039 |
"movq %%mm0, %%mm1 \n\t" |
33040 |
@@ -274,7 +286,7 @@ |
33041 |
// because, punpcklbw is used (which reads 8 bytes) and the last |
33042 |
// pixel is only 4 bytes. This is no problem because the image data |
33043 |
// was allocated with extra 4 bytes when created. |
33044 |
- "addl $4, %%esi \n\t" // image->data += 4 |
33045 |
+ "addl $4, %%esi \n\t" // image->data += 4 |
33046 |
|
33047 |
|
33048 |
"decl %26 \n\t" // x-- |
33049 |
@@ -290,7 +302,7 @@ |
33050 |
|
33051 |
".Enda: \n\t" // THE END |
33052 |
"emms \n\t" |
33053 |
- "popal \n\t" |
33054 |
+ "popl %%ebx \n\t" |
33055 |
: |
33056 |
: |
33057 |
"m" (image), // %0 |
33058 |
@@ -309,17 +321,18 @@ |
33059 |
"m" (width), // %13 |
33060 |
"m" (height), // %14 |
33061 |
"m" (line_offset), // %15 |
33062 |
- "m" (rrggbbaa), // %16 (access to rr) |
33063 |
- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg) |
33064 |
- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb) |
33065 |
- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa) |
33066 |
- "m" (pixel), // %20 (access to pixel.r) |
33067 |
- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g) |
33068 |
- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b) |
33069 |
- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a) |
33070 |
+ "m" (rrggbbaa.words.rr), // %16 (access to rr) |
33071 |
+ "m" (rrggbbaa.words.gg), // %17 (access to gg) |
33072 |
+ "m" (rrggbbaa.words.bb), // %18 (access to bb) |
33073 |
+ "m" (rrggbbaa.words.aa), // %19 (access to aa) |
33074 |
+ "m" (pixel.words.rr), // %20 (access to pixel.r) |
33075 |
+ "m" (pixel.words.gg), // %21 (access to pixel.g) |
33076 |
+ "m" (pixel.words.bb), // %22 (access to pixel.b) |
33077 |
+ "m" (pixel.words.aa), // %23 (access to pixel.a) |
33078 |
"m" (tmp_err), // %24 |
33079 |
"m" (tmp_nerr), // %25 |
33080 |
"m" (x) // %26 |
33081 |
+ : "eax", "ecx", "edx", "esi", "edi" |
33082 |
); |
33083 |
} |
33084 |
|
33085 |
@@ -342,8 +355,19 @@ |
33086 |
int height, |
33087 |
int line_offset) |
33088 |
{ |
33089 |
- long long rrggbbaa; |
33090 |
- long long pixel; |
33091 |
+ union { |
33092 |
+ long long rrggbbaa; |
33093 |
+ struct { |
33094 |
+ short int rr, gg, bb, aa; |
33095 |
+ } words; |
33096 |
+ } rrggbbaa; |
33097 |
+ |
33098 |
+ union { |
33099 |
+ long long pixel; |
33100 |
+ struct { |
33101 |
+ short int rr, gg, bb, aa; |
33102 |
+ } words; |
33103 |
+ } pixel; |
33104 |
|
33105 |
short *tmp_err; |
33106 |
short *tmp_nerr; |
33107 |
@@ -354,7 +378,7 @@ |
33108 |
|
33109 |
asm volatile |
33110 |
( |
33111 |
- "pushal \n\t" |
33112 |
+ "pushl %%ebx \n\t" |
33113 |
|
33114 |
"movl %13, %%eax \n\t" // eax = width |
33115 |
"movl %%eax, %%ebx \n\t" |
33116 |
@@ -424,7 +448,7 @@ |
33117 |
|
33118 |
".Endc: \n\t" // THE END |
33119 |
"emms \n\t" |
33120 |
- "popal \n\t" |
33121 |
+ "popl %%ebx \n\t" |
33122 |
: |
33123 |
: |
33124 |
"m" (image), // %0 |
33125 |
@@ -443,19 +467,20 @@ |
33126 |
"m" (width), // %13 |
33127 |
"m" (height), // %14 |
33128 |
"m" (line_offset), // %15 |
33129 |
- "m" (rrggbbaa), // %16 (access to rr) |
33130 |
- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg) |
33131 |
- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb) |
33132 |
- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa) |
33133 |
- "m" (pixel), // %20 (access to pixel.r) |
33134 |
- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g) |
33135 |
- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b) |
33136 |
- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a) |
33137 |
+ "m" (rrggbbaa.words.rr), // %16 (access to rr) |
33138 |
+ "m" (rrggbbaa.words.gg), // %17 (access to gg) |
33139 |
+ "m" (rrggbbaa.words.bb), // %18 (access to bb) |
33140 |
+ "m" (rrggbbaa.words.aa), // %19 (access to aa) |
33141 |
+ "m" (pixel.words.rr), // %20 (access to pixel.r) |
33142 |
+ "m" (pixel.words.gg), // %21 (access to pixel.g) |
33143 |
+ "m" (pixel.words.bb), // %22 (access to pixel.b) |
33144 |
+ "m" (pixel.words.aa), // %23 (access to pixel.a) |
33145 |
"m" (tmp_err), // %24 |
33146 |
"m" (tmp_nerr), // %25 |
33147 |
"m" (x), // %26 |
33148 |
"m" (w1), // %27 |
33149 |
"m" (w2) // %28 |
33150 |
+ : "eax", "ecx", "edx", "esi", "edi" |
33151 |
); |
33152 |
} |
33153 |
|
33154 |
@@ -653,7 +678,7 @@ |
33155 |
"movw $0xff, %%dx \n\t" // pixel.blu > 255 |
33156 |
"jmp .OKBb \n" |
33157 |
".NEGBb: \n\t" |
33158 |
- "xorw %%dx, %%dx \n" |
33159 |
+ "xorw %%dx, %%dx \n" |
33160 |
".OKBb: \n\t" |
33161 |
//partial reg |
33162 |
"leal (%%edi, %%edx, 2), %%ecx \n\t" // ecx = &ctable[pixel.blu] |
33163 |
|
33164 |
|
33165 |
|
33166 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-newbuttons.nextstyle.tiff |
33167 |
|
33168 |
<<Binary file>> |
33169 |
|
33170 |
|
33171 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-newbuttons.nextstyle.xpm |
33172 |
|
33173 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-newbuttons.nextstyle.xpm?rev=1.1&view=markup |
33174 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-newbuttons.nextstyle.xpm?rev=1.1&content-type=text/plain |
33175 |
|
33176 |
Index: WindowMaker-newbuttons.nextstyle.xpm |
33177 |
=================================================================== |
33178 |
/* XPM */ |
33179 |
static char * nextstyle_xpm[] = { |
33180 |
"37 33 84 1", |
33181 |
" c None", |
33182 |
". c #747474", |
33183 |
"+ c #757575", |
33184 |
"@ c #000000", |
33185 |
"# c #222222", |
33186 |
"$ c #262626", |
33187 |
"% c #282828", |
33188 |
"& c #080808", |
33189 |
"* c #FFFFFF", |
33190 |
"= c #FFFAFF", |
33191 |
"- c #FFFFF6", |
33192 |
"; c #F6F6F6", |
33193 |
"> c #F6F2F6", |
33194 |
", c #EEEEEE", |
33195 |
"' c #B4B6B4", |
33196 |
") c #8B8D94", |
33197 |
"! c #DEE6E6", |
33198 |
"~ c #E6E6EE", |
33199 |
"{ c #CDD2CD", |
33200 |
"] c #A4A1A4", |
33201 |
"^ c #313431", |
33202 |
"/ c #94918B", |
33203 |
"( c #EEF6F6", |
33204 |
"_ c #292829", |
33205 |
": c #C5CACD", |
33206 |
"< c #E6E6E6", |
33207 |
"[ c #A4A5AC", |
33208 |
"} c #414039", |
33209 |
"| c #948D8B", |
33210 |
"1 c #8B8D8B", |
33211 |
"2 c #292C29", |
33212 |
"3 c #D5D6D5", |
33213 |
"4 c #B4BAB4", |
33214 |
"5 c #313029", |
33215 |
"6 c #DEDADE", |
33216 |
"7 c #A4A5A4", |
33217 |
"8 c #8B898B", |
33218 |
"9 c #F6FAFF", |
33219 |
"0 c #F6FFFF", |
33220 |
"a c #DEDEDE", |
33221 |
"b c #181818", |
33222 |
"c c #E6EAE6", |
33223 |
"d c #C5C6C5", |
33224 |
"e c #8B8983", |
33225 |
"f c #EEF2F6", |
33226 |
"g c #EEEEF6", |
33227 |
"h c #101010", |
33228 |
"i c #201818", |
33229 |
"j c #838183", |
33230 |
"k c #838983", |
33231 |
"l c #949594", |
33232 |
"m c #202420", |
33233 |
"n c #CDCECD", |
33234 |
"o c #BDBABD", |
33235 |
"p c #202018", |
33236 |
"q c #736D73", |
33237 |
"r c #6A7573", |
33238 |
"s c #83817B", |
33239 |
"t c #B4B2B4", |
33240 |
"u c #202829", |
33241 |
"v c #C5C2C5", |
33242 |
"w c #201C18", |
33243 |
"x c #5A5552", |
33244 |
"y c #7B757B", |
33245 |
"z c #393C41", |
33246 |
"A c #CDD2D5", |
33247 |
"B c #D5D2D5", |
33248 |
"C c #9CA1A4", |
33249 |
"D c #BDBAB4", |
33250 |
"E c #8B8583", |
33251 |
"F c #6A6D6A", |
33252 |
"G c #949994", |
33253 |
"H c #A4AAAC", |
33254 |
"I c #94999C", |
33255 |
"J c #94958B", |
33256 |
"K c #94898B", |
33257 |
"L c #83818B", |
33258 |
"M c #73756A", |
33259 |
"N c #837D83", |
33260 |
"O c #060606", |
33261 |
"P c #070707", |
33262 |
"Q c #030303", |
33263 |
"R c #ABABAB", |
33264 |
"S c #535353", |
33265 |
"..................+++++++...........@", |
33266 |
"##################$$$$$$$%$%$$$$$$$$@", |
33267 |
"##################$$$$$$$$%%%%%%%%%%@", |
33268 |
"###################################%@", |
33269 |
"###################################%&", |
33270 |
"####################@@@@@@@@@@@@*%%%&", |
33271 |
"####################@=****-;>,'@*%%%&", |
33272 |
"####################@*)!=;~{]^/@*%%%&", |
33273 |
"####################@*(_:><[}|1@*%%%&", |
33274 |
"####################@**:2345678@*%%%&", |
33275 |
"####################@*90ab_cd/e@*%%%&", |
33276 |
"####################@9fg3hid7jk@*%%%&", |
33277 |
"####################@;almnopqrs@*%%%&", |
33278 |
"####################@>tuva67wxy@*%%%&", |
33279 |
"####################@,zABClDEbF@*%%%&", |
33280 |
"####################@'GHIJKeLMN@*%%%&", |
33281 |
"####################@@@@@@@@@@@@*%%%&", |
33282 |
"####################*************%%%&", |
33283 |
"##################$$$$$$$$$%%%%%%%%%&", |
33284 |
"##################$$$$$$$%$%%%%%%%%%&", |
33285 |
"OOOOOOOOOOOOOOOOOOPPPPPPPPPPPPP&&&&&Q", |
33286 |
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", |
33287 |
"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@", |
33288 |
"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@", |
33289 |
"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@", |
33290 |
"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@", |
33291 |
"SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS*RR@", |
33292 |
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@R*RR@", |
33293 |
"********************************R*RR@", |
33294 |
"********************************R*RR@", |
33295 |
"********************************R*RR@", |
33296 |
"********************************R*RR@", |
33297 |
"********************************R*RR@"}; |
33298 |
|
33299 |
|
33300 |
|
33301 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-newbuttons.oldstyle.tiff |
33302 |
|
33303 |
<<Binary file>> |
33304 |
|
33305 |
|
33306 |
1.1 src/patchsets/windowmaker/0.92.0/WindowMaker-uk.po |
33307 |
|
33308 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-uk.po?rev=1.1&view=markup |
33309 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/WindowMaker-uk.po?rev=1.1&content-type=text/plain |
33310 |
|
33311 |
Index: WindowMaker-uk.po |
33312 |
=================================================================== |
33313 |
msgid "" |
33314 |
msgstr "" |
33315 |
"Project-Id-Version: WindowMaker 0.80.1\n" |
33316 |
"POT-Creation-Date: 2002-02-15 15:50+0200\n" |
33317 |
"PO-Revision-Date: 2005-09-06 08:56+0300\n" |
33318 |
"Last-Translator: Victor Forsyuk <victor@×××××××××.com>\n" |
33319 |
"Language-Team: KSI Linux Ukrainian <uk@×××××××××.com>\n" |
33320 |
"MIME-Version: 1.0\n" |
33321 |
"Content-Type: text/plain; charset=koi8-u\n" |
33322 |
"Content-Transfer-Encoding: 8bit\n" |
33323 |
|
33324 |
#: ../src/appicon.c:426 ../src/dialog.c:282 ../src/dock.c:3325 |
33325 |
#: ../src/dockedapp.c:230 ../src/main.c:273 ../src/rootmenu.c:1853 |
33326 |
#: ../src/winspector.c:389 ../src/winspector.c:406 |
33327 |
msgid "Error" |
33328 |
msgstr "ðÏÍÉÌËÁ" |
33329 |
|
33330 |
#: ../src/appicon.c:427 |
33331 |
msgid "Could not open specified icon file" |
33332 |
msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ×ËÁÚÁÎÉÊ ÆÁÊÌ ¦ËÏÎËÉ" |
33333 |
|
33334 |
#: ../src/appicon.c:428 ../src/dialog.c:179 ../src/dialog.c:282 |
33335 |
#: ../src/dialog.c:729 ../src/dialog.c:1818 ../src/dock.c:526 |
33336 |
#: ../src/dock.c:534 ../src/dock.c:558 ../src/dock.c:3326 |
33337 |
#: ../src/dockedapp.c:231 ../src/dockedapp.c:426 ../src/main.c:273 |
33338 |
#: ../src/rootmenu.c:1857 ../src/winspector.c:390 ../src/winspector.c:407 |
33339 |
msgid "OK" |
33340 |
msgstr "OK" |
33341 |
|
33342 |
#: ../src/appicon.c:456 ../src/dock.c:264 |
33343 |
msgid "" |
33344 |
" will be forcibly closed.\n" |
33345 |
"Any unsaved changes will be lost.\n" |
33346 |
"Please confirm." |
33347 |
msgstr "" |
33348 |
" ÐÒÉÍÕÓÏ×Ï ÚÁ×ÅÒÛÉÔØÓÑ.\n" |
33349 |
"÷Ó¦ ÎÅÚÂÅÒÅÖÅΦ ÚͦÎÉ ÂÕÄÕÔØ ×ÔÒÁÞÅΦ.\n" |
33350 |
"âÕÄØ ÌÁÓËÁ, ЦÄÔ×ÅÒĦÔØ." |
33351 |
|
33352 |
# |
33353 |
#: ../src/appicon.c:464 ../src/dock.c:283 ../src/winmenu.c:125 |
33354 |
msgid "Kill Application" |
33355 |
msgstr "ðÒÉÍÕÓÏ×Å ÚÁ×ÅÒÛÅÎÎÑ" |
33356 |
|
33357 |
#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:127 |
33358 |
msgid "Yes" |
33359 |
msgstr "ôÁË" |
33360 |
|
33361 |
#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:127 |
33362 |
msgid "No" |
33363 |
msgstr "î¦" |
33364 |
|
33365 |
#: ../src/appicon.c:495 ../src/dock.c:1177 ../src/dock.c:3491 |
33366 |
msgid "Unhide Here" |
33367 |
msgstr "òÏÚËÒÉÔÉ ÔÕÔ" |
33368 |
|
33369 |
#: ../src/appicon.c:496 ../src/appicon.c:521 ../src/dock.c:1179 |
33370 |
#: ../src/dock.c:1181 ../src/dock.c:3503 ../src/winmenu.c:465 |
33371 |
msgid "Hide" |
33372 |
msgstr "ðÒÉÈÏ×ÁÔÉ" |
33373 |
|
33374 |
#: ../src/appicon.c:497 |
33375 |
msgid "Set Icon..." |
33376 |
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ¦ËÏÎËÕ..." |
33377 |
|
33378 |
#: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248 |
33379 |
#: ../src/rootmenu.c:264 ../src/winmenu.c:520 |
33380 |
msgid "Kill" |
33381 |
msgstr "õÂÉÔÉ" |
33382 |
|
33383 |
#: ../src/appicon.c:519 ../src/dock.c:3501 |
33384 |
msgid "Unhide" |
33385 |
msgstr "òÏÚËÒÉÔÉ" |
33386 |
|
33387 |
#: ../src/application.c:398 |
33388 |
#, c-format |
33389 |
msgid "recreating missing icon '%s'" |
33390 |
msgstr "" |
33391 |
|
33392 |
#: ../src/defaults.c:922 ../src/defaults.c:1011 |
33393 |
#, c-format |
33394 |
msgid "Domain %s (%s) of global defaults database is corrupted!" |
33395 |
msgstr "äÏÍÅÎ %s (%s) × ÇÌÏÂÁÌØÎ¦Ê ÂÁÚ¦ ÕÍÏ×ÞÁÎØ ÐÏÛËÏÄÖÅÎÉÊ!" |
33396 |
|
33397 |
#: ../src/defaults.c:927 |
33398 |
#, c-format |
33399 |
msgid "could not load domain %s from global defaults database" |
33400 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÁ×ÁÎÔÁÖÉÔÉ ÄÏÍÅÎ %s Ú ÇÌÏÂÁÌØÎϧ ÂÁÚÉ ÕÍÏ×ÞÁÎØ" |
33401 |
|
33402 |
#: ../src/defaults.c:949 ../src/startup.c:884 ../src/startup.c:902 |
33403 |
#: ../src/startup.c:908 |
33404 |
#, c-format |
33405 |
msgid "could not read domain \"%s\" from defaults database" |
33406 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÐÒÏÞÉÔÁÔÉ ÄÏÍÅÎ \"%s\" Ú ÂÁÚÉ ÄÁÎÉÈ ÕÍÏ×ÞÁÎØ" |
33407 |
|
33408 |
#: ../src/defaults.c:995 ../src/defaults.c:1099 ../src/defaults.c:1140 |
33409 |
#: ../src/defaults.c:1196 |
33410 |
#, c-format |
33411 |
msgid "Domain %s (%s) of defaults database is corrupted!" |
33412 |
msgstr "äÏÍÅÎ %s (%s) × ÂÁÚ¦ ÄÁÎÉÈ ÕÍÏ×ÞÁÎØ ÐÏÛËÏÄÖÅÎÉÊ!" |
33413 |
|
33414 |
#: ../src/defaults.c:1000 ../src/defaults.c:1119 ../src/defaults.c:1176 |
33415 |
#: ../src/defaults.c:1205 ../src/menureader.c:397 |
33416 |
#, c-format |
33417 |
msgid "could not load domain %s from user defaults database" |
33418 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÁ×ÁÎÔÁÖÉÔÉ ÄÏÍÅÎ \"%s\" Ú ÂÁÚÉ ÕÍÏ×ÞÁÎØ ËÏÒÉÓÔÕ×ÁÞÁ" |
33419 |
|
33420 |
#: ../src/defaults.c:1030 |
33421 |
#, c-format |
33422 |
msgid "could not load domain %s from global defaults database (%s)" |
33423 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÁ×ÁÎÔÁÖÉÔÉ ÄÏÍÅÎ %s Ú ÇÌÏÂÁÌØÎϧ ÂÁÚÉ ÕÍÏ×ÞÁÎØ (%s)" |
33424 |
|
33425 |
#: ../src/defaults.c:1166 ../src/screen.c:458 |
33426 |
#, c-format |
33427 |
msgid "could not load logo image for panels: %s" |
33428 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÁ×ÁÎÔÁÖÉÔÉ ÚÁÓÔÁ×ËÕ ÄÌÑ ÐÁÎÅÌÅÊ: %s" |
33429 |
|
33430 |
#: ../src/defaults.c:1447 |
33431 |
#, c-format |
33432 |
msgid "wrong option value for key \"%s\". Should be one of %s" |
33433 |
msgstr "ÎÅÐÒÁ×ÉÌØÎÅ ÚÎÁÞÅÎÎÑ ÄÌÑ ËÌÀÞÁ \"%s\". íÁ¤ ÂÕÔÉ ÏÄÎÅ Ú %s." |
33434 |
|
33435 |
#: ../src/defaults.c:1492 |
33436 |
#, c-format |
33437 |
msgid "can't convert \"%s\" to boolean for key \"%s\"" |
33438 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÐÅÒÅÔ×ÏÒÉÔÉ \"%s\" × ÂÕ̦×ÓØËÅ ÚÎÁÞÅÎÎÑ ÄÌÑ ËÌÀÞÁ \"%s\"" |
33439 |
|
33440 |
#: ../src/defaults.c:1497 ../src/defaults.c:1529 ../src/defaults.c:1561 |
33441 |
#: ../src/defaults.c:1574 ../src/defaults.c:1589 ../src/defaults.c:1603 |
33442 |
#: ../src/defaults.c:1673 ../src/defaults.c:1685 ../src/defaults.c:2152 |
33443 |
#: ../src/defaults.c:2169 ../src/defaults.c:2182 ../src/defaults.c:2214 |
33444 |
#: ../src/defaults.c:2230 ../src/defaults.c:2261 ../src/defaults.c:2348 |
33445 |
#: ../src/defaults.c:2734 ../src/defaults.c:2745 |
33446 |
#, c-format |
33447 |
msgid "using default \"%s\" instead" |
33448 |
msgstr "×ÉËÏÒÉÓÔÏ×Õ¤ÍÏ ÚÎÁÞÅÎÎÑ ÚÁ ÕÍÏ×ÞÁÎÎÑÍ (%s)" |
33449 |
|
33450 |
#: ../src/defaults.c:1526 |
33451 |
#, c-format |
33452 |
msgid "can't convert \"%s\" to integer for key \"%s\"" |
33453 |
msgstr "ÎÅÍÏÖÌÉ×Ï ÐÅÒÅÔ×ÏÒÉÔÉ \"%s\" × Ã¦ÌÅ ÚÎÁÞÅÎÎÑ ÄÌÑ ËÌÀÞÁ \"%s\"" |
33454 |
|
33455 |
#: ../src/defaults.c:1556 ../src/defaults.c:1668 ../src/defaults.c:2147 |
33456 |
#: ../src/defaults.c:2164 ../src/defaults.c:2209 ../src/defaults.c:2256 |
33457 |
#: ../src/defaults.c:2729 ../src/wdefaults.c:571 ../src/wdefaults.c:607 |
33458 |
#, c-format |
33459 |
msgid "Wrong option format for key \"%s\". Should be %s." |
33460 |
msgstr "îÅÐÒÁ×ÉÌØÎÉÊ ÆÏÒÍÁÔ ÐÁÒÁÍÅÔÒÁ ÄÌÑ ËÌÀÞÁ \"%s\". íÁ¤ ÂÕÔÉ %s." |
33461 |
|
33462 |
#: ../src/defaults.c:1569 |
33463 |
#, c-format |
33464 |
msgid "Incorrect number of elements in array for key \"%s\"." |
33465 |
msgstr "îÅËÏÒÅËÔÎÁ ˦ÌØ˦ÓÔØ ÅÌÅÍÅÎÔ¦× × ÍÁÓÉצ ÄÌÑ ËÌÀÞÁ \"%s\"." |
33466 |
|
33467 |
#: ../src/defaults.c:1584 |
33468 |
#, c-format |
33469 |
msgid "Wrong value for key \"%s\". Should be Coordinate." |
33470 |
msgstr "îÅÐÒÁ×ÉÌØÎÅ ÚÎÁÞÅÎÎÑ ÐÁÒÁÍÅÔÒÁ ÄÌÑ ËÌÀÞÁ \"%s\". íÁ¤ ÂÕÔÉ Coordinate." |
33471 |
|
33472 |
#: ../src/defaults.c:1599 |
33473 |
#, c-format |
33474 |
msgid "can't convert array to integers for \"%s\"." |
33475 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÐÅÒÅÔ×ÏÒÉÔÉ ÍÁÓÉ× × Ã¦Ì¦ ÚÎÁÞÅÎÎÑ ÄÌÑ \"%s\"." |
33476 |
|
33477 |
#: ../src/defaults.c:1797 ../src/defaults.c:1829 ../src/defaults.c:1845 |
33478 |
#: ../src/defaults.c:1874 ../src/defaults.c:1897 ../src/defaults.c:1950 |
33479 |
#: ../src/defaults.c:1990 ../src/defaults.c:2028 ../src/defaults.c:2044 |
33480 |
#, c-format |
33481 |
msgid "\"%s\" is not a valid color name" |
33482 |
msgstr "\"%s\" ÎÅ ¤ צÄÏÍÏÀ ÎÁÚ×ÏÀ ËÏÌØÏÒÕ" |
33483 |
|
33484 |
#: ../src/defaults.c:1810 ../src/defaults.c:1862 |
33485 |
msgid "bad number of arguments in gradient specification" |
33486 |
msgstr "ÎÅÐÒÁ×ÉÌØÎÁ ˦ÌØ˦ÓÔØ ÁÒÇÕÍÅÎÔ¦× Õ ×ÉÚÎÁÞÅÎΦ ÇÒÁĦ¤ÎÔÁ" |
33487 |
|
33488 |
#: ../src/defaults.c:1923 |
33489 |
msgid "too few arguments in multicolor gradient specification" |
33490 |
msgstr "ÎÁÄÔÏ ÍÁÌÏ ÁÒÇÕÍÅÎÔ¦× Õ ×ÉÚÎÁÞÅÎΦ ÂÁÇÁÔÏËÏ̦ÒÎÏÇÏ ÇÒÁĦ¤ÎÔÁ" |
33491 |
|
33492 |
#: ../src/defaults.c:2017 |
33493 |
msgid "bad number of arguments in textured gradient specification" |
33494 |
msgstr "ÎÅÐÒÁ×ÉÌØÎÁ ˦ÌØ˦ÓÔØ ÁÒÇÕÍÅÎÔ¦× Õ ×ÉÚÎÁÞÅÎΦ ÇÒÁĦ¤ÎÔÁ Ú ÔÅËÓÔÕÒÏÀ" |
33495 |
|
33496 |
#: ../src/defaults.c:2060 |
33497 |
#, c-format |
33498 |
msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]" |
33499 |
msgstr "" |
33500 |
"ÎÅÐÒÁ×ÉÌØÎÅ ÚÎÁÞÅÎÎÑ ÐÒÏÚÏÒÏÓÔ¦ ÄÌÑ t-ÇÒÁĦ¤ÎÔÁ Ú ÔÅËÓÔÕÒÏÀ \"%s\"; ÍÁ¤ ÂÕÔÉ " |
33501 |
"[0..255]" |
33502 |
|
33503 |
#: ../src/defaults.c:2120 |
33504 |
#, c-format |
33505 |
msgid "could not initialize library %s" |
33506 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ Â¦Â̦ÏÔÅËÕ %s" |
33507 |
|
33508 |
#: ../src/defaults.c:2123 |
33509 |
#, c-format |
33510 |
msgid "could not find function %s::%s" |
33511 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÎÁÊÔÉ ÆÕÎËæÀ %s::%s" |
33512 |
|
33513 |
#: ../src/defaults.c:2130 |
33514 |
#, c-format |
33515 |
msgid "invalid texture type %s" |
33516 |
msgstr "ÎÅÐÒÁ×ÉÌØÎÉÊ ÔÉÐ ÔÅËÓÔÕÒÉ (%s)" |
33517 |
|
33518 |
#: ../src/defaults.c:2177 |
33519 |
#, c-format |
33520 |
msgid "Error in texture specification for key \"%s\"" |
33521 |
msgstr "ðÏÍÉÌËÁ Õ ×ÉÚÎÁÞÅÎΦ ÔÅËÓÔÕÒÉ ÄÌÑ ËÌÀÞÁ \"%s\"" |
33522 |
|
33523 |
#: ../src/defaults.c:2226 |
33524 |
msgid "Wrong type for workspace background. Should be a texture type." |
33525 |
msgstr "" |
33526 |
"îÅÐÒÁ×ÉÌØÎÉÊ ÔÉÐ ÄÌÑ ÆÏÎÕ òÏÂÏÞÏÇÏ ÓÔÏÌÕ; ÍÁ¤ ÂÕÔÉ ÚÎÁÞÅÎÎÑ ÔÉÐÕ " |
33527 |
"\"ÔÅËÓÔÕÒÁ\"." |
33528 |
|
33529 |
#: ../src/defaults.c:2274 |
33530 |
#, c-format |
33531 |
msgid "Wrong type for background of workspace %i. Should be a texture." |
33532 |
msgstr "" |
33533 |
"îÅÐÒÁ×ÉÌØÎÉÊ ÔÉÐ ÄÌÑ ÆÏÎÕ òÁÂÏÞÏÇÏ ÓÔÏÌÕ %i; ÍÁ¤ ÂÕÔÉ ÚÎÁÞÅÎÎÑ ÔÉÐÕ " |
33534 |
"\"ÔÅËÓÔÕÒÁ\"." |
33535 |
|
33536 |
#: ../src/defaults.c:2316 |
33537 |
msgid "could not load any usable font!!!" |
33538 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÁ×ÁÎÔÁÖÉÔÉ ÛÒÉÆÔ!!!" |
33539 |
|
33540 |
#: ../src/defaults.c:2343 |
33541 |
#, c-format |
33542 |
msgid "could not get color for key \"%s\"" |
33543 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ×ÉÚÎÁÞÉÔÉ ËÏÌ¦Ò ÄÌÑ ËÌÀÞÁ \"%s\"" |
33544 |
|
33545 |
#: ../src/defaults.c:2401 ../src/rootmenu.c:526 |
33546 |
#, c-format |
33547 |
msgid "%s:invalid key modifier \"%s\"" |
33548 |
msgstr "%s:ÎÅÐÒÁ×ÉÌØÎÉÊ ÍÏÄÉƦËÁÔÏÒ ËÌÁצۦ \"%s\"" |
33549 |
|
33550 |
# |
33551 |
#: ../src/defaults.c:2413 |
33552 |
#, c-format |
33553 |
msgid "%s:invalid kbd shortcut specification \"%s\"" |
33554 |
msgstr "%s:ÎÅÐÒÁ×ÉÌØÎÅ ×ÉÚÎÁÞÅÎÎÑ ËÏͦÎÁæ§ ËÌÁ×¦Û \"%s\"" |
33555 |
|
33556 |
# |
33557 |
#: ../src/defaults.c:2420 |
33558 |
#, c-format |
33559 |
msgid "%s:invalid key in shortcut \"%s\"" |
33560 |
msgstr "%s:ÎÅÐÒÁ×ÉÌØÎÁ ËÌÁצÛÁ × ËÏͦÎÁæ§ \"%s\"" |
33561 |
|
33562 |
#: ../src/defaults.c:2445 |
33563 |
#, c-format |
33564 |
msgid "%s: modifier key %s is not valid" |
33565 |
msgstr "%s: ÍÏÄÉƦËÁÔÏÒ %s ÎÅÐÒÁ×ÉÌØÎÉÊ" |
33566 |
|
33567 |
#: ../src/defaults.c:2477 |
33568 |
#, c-format |
33569 |
msgid "could not load image in option %s: %s" |
33570 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÁ×ÁÎÔÁÖÉÔÉ ÚÏÂÒÁÖÅÎÎÑ ÄÌÑ ÐÁÒÁÍÅÔÒÁ %s: %s" |
33571 |
|
33572 |
# |
33573 |
#: ../src/defaults.c:2594 |
33574 |
#, c-format |
33575 |
msgid "failed to open bitmap file \"%s\"" |
33576 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ×¦ÄËÒÉÔÉ ÒÁÓÔÒÏ×ÉÊ ÆÁÊÌ \"%s\"" |
33577 |
|
33578 |
#: ../src/defaults.c:2597 |
33579 |
#, c-format |
33580 |
msgid "\"%s\" is not a valid bitmap file" |
33581 |
msgstr "\"%s\" ÎÅ ¤ ÎÁÓÐÒÁ×Ħ ÒÁÓÔÒÏ×ÉÍ ÆÁÊÌÏÍ" |
33582 |
|
33583 |
#: ../src/defaults.c:2600 |
33584 |
#, c-format |
33585 |
msgid "out of memory reading bitmap file \"%s\"" |
33586 |
msgstr "×ÉÞÅÒÐÁÎÁ ÐÁÍ'ÑÔØ Ð¦Ä ÞÁÓ ÞÉÔÁÎÎÑ ÒÁÓÔÒÏ×ÏÇÏ ÆÁÊÌÕ \"%s\"" |
33587 |
|
33588 |
#: ../src/defaults.c:2639 ../src/defaults.c:2672 |
33589 |
msgid "bad number of arguments in cursor specification" |
33590 |
msgstr "ÎÅÐÒÁ×ÉÌØÎÁ ˦ÌØ˦ÓÔØ ÁÒÇÕÍÅÎÔ¦× Õ ×ÉÚÎÁÞÅÎΦ ËÕÒÓÏÒÁ" |
33591 |
|
33592 |
#: ../src/defaults.c:2655 |
33593 |
#, c-format |
33594 |
msgid "unknown builtin cursor name \"%s\"" |
33595 |
msgstr "" |
33596 |
|
33597 |
#: ../src/defaults.c:2682 ../src/defaults.c:2694 |
33598 |
#, c-format |
33599 |
msgid "could not find cursor bitmap file \"%s\"" |
33600 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÎÁÊÔÉ ÒÁÓÔÒÏ×ÉÊ ÆÁÊÌ ËÕÒÓÏÒÁ \"%s\"" |
33601 |
|
33602 |
#: ../src/defaults.c:2741 |
33603 |
#, c-format |
33604 |
msgid "Error in cursor specification for key \"%s\"" |
33605 |
msgstr "ðÏÍÉÌËÁ Õ ×ÉÚÎÁÞÅÎΦ ËÕÒÓÏÒÁ ÄÌÑ ËÌÀÞÁ \"%s\"" |
33606 |
|
33607 |
#: ../src/defaults.c:2826 |
33608 |
msgid "could not render texture for icon background" |
33609 |
msgstr "ÎÅ ×ÄÁÌÏÓØ Ð¦ÄÇÏÔÕ×ÁÔÉ ÔÅËÓÔÕÒÕ ÄÌÑ ÆÏÎÕ ¦ËÏÎËÉ" |
33610 |
|
33611 |
# |
33612 |
#: ../src/dialog.c:135 |
33613 |
msgid "Save workspace state" |
33614 |
msgstr "úÂÅÒÅÇÔÉ ÓÔÁÎ òÏÂÏÞÏÇÏ ÓÔÏÌÕ" |
33615 |
|
33616 |
#: ../src/dialog.c:179 ../src/dialog.c:736 ../src/dock.c:558 |
33617 |
#: ../src/dockedapp.c:431 ../src/rootmenu.c:198 ../src/rootmenu.c:248 |
33618 |
#: ../src/rootmenu.c:264 |
33619 |
msgid "Cancel" |
33620 |
msgstr "÷¦ÄͦÎÁ" |
33621 |
|
33622 |
# |
33623 |
#: ../src/dialog.c:277 |
33624 |
msgid "Could not open directory " |
33625 |
msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ËÁÔÁÌÏÇ " |
33626 |
|
33627 |
#: ../src/dialog.c:332 |
33628 |
msgid "Could not load image file " |
33629 |
msgstr "îÅÍÏÖÌÉ×Ï ÚÁ×ÁÎÔÁÖÉÔÉ ÆÁÊÌ ÚÏÂÒÁÖÅÎÎÑ " |
33630 |
|
33631 |
#: ../src/dialog.c:663 |
33632 |
msgid "Directories" |
33633 |
msgstr "ëÁÔÁÌÏÇÉ" |
33634 |
|
33635 |
#: ../src/dialog.c:672 |
33636 |
msgid "Icons" |
33637 |
msgstr "¶ËÏÎËÉ" |
33638 |
|
33639 |
#: ../src/dialog.c:705 |
33640 |
msgid "Preview" |
33641 |
msgstr "" |
33642 |
|
33643 |
# |
33644 |
#: ../src/dialog.c:718 |
33645 |
msgid "File Name:" |
33646 |
msgstr "¶Í'Ñ ÆÁÊÌÕ:" |
33647 |
|
33648 |
#: ../src/dialog.c:742 |
33649 |
msgid "Choose File" |
33650 |
msgstr "÷ÉÂÅÒ¦ÔØ ÆÁÊÌ" |
33651 |
|
33652 |
#: ../src/dialog.c:760 ../src/dialog.c:762 |
33653 |
msgid "Icon Chooser" |
33654 |
msgstr "÷ÉÂ¦Ò ¦ËÏÎËÉ" |
33655 |
|
33656 |
#: ../src/dialog.c:1241 ../src/dialog.c:1351 |
33657 |
#, c-format |
33658 |
msgid "Version %s" |
33659 |
msgstr "÷ÅÒÓ¦Ñ %s" |
33660 |
|
33661 |
#: ../src/dialog.c:1348 |
33662 |
msgid "Window Manager for X" |
33663 |
msgstr "íÅÎÅÄÖÅÒ ×¦ËÏÎ ÄÌÑ X" |
33664 |
|
33665 |
#: ../src/dialog.c:1373 |
33666 |
#, c-format |
33667 |
msgid "Using visual 0x%x: %s %ibpp " |
33668 |
msgstr "" |
33669 |
|
33670 |
#: ../src/dialog.c:1381 |
33671 |
msgid "(32 thousand colors)\n" |
33672 |
msgstr "(32 ÔÉÓÑÞ¦ ËÏÌØÏÒ¦×)\n" |
33673 |
|
33674 |
#: ../src/dialog.c:1384 |
33675 |
msgid "(64 thousand colors)\n" |
33676 |
msgstr "(64 ÔÉÓÑÞ¦ ËÏÌØÏÒ¦×)\n" |
33677 |
|
33678 |
#: ../src/dialog.c:1388 |
33679 |
msgid "(16 million colors)\n" |
33680 |
msgstr "(16 ͦÌØÊÏÎ¦× ËÏÌØÏÒ¦×)\n" |
33681 |
|
33682 |
#: ../src/dialog.c:1391 |
33683 |
#, c-format |
33684 |
msgid "(%d colors)\n" |
33685 |
msgstr "(%d ËÏÌØÏÒ¦×)\n" |
33686 |
|
33687 |
#: ../src/dialog.c:1401 |
33688 |
#, c-format |
33689 |
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n" |
33690 |
msgstr "÷ÓØÏÇÏ ×ÉĦÌÅÎÏ ÐÁÍ'ÑÔ¦: %i kB. ÷ÓØÏÇÏ ×ÉËÏÒÉÓÔÁÎÏ ÐÁÍ'ÑÔ¦: %i kB.\n" |
33691 |
|
33692 |
#: ../src/dialog.c:1408 |
33693 |
msgid "Supported image formats: " |
33694 |
msgstr "ð¦ÄÔÒÉÍÕÀÔØÓÑ ÆÏÒÍÁÔÉ ÚÏÂÒÁÖÅÎØ: " |
33695 |
|
33696 |
#: ../src/dialog.c:1415 |
33697 |
msgid "" |
33698 |
"\n" |
33699 |
"Additional support for: " |
33700 |
msgstr "" |
33701 |
"\n" |
33702 |
"äÏÄÁÔËÏ×Á ЦÄÔÒÉÍËÁ ÄÌÑ: " |
33703 |
|
33704 |
#: ../src/dialog.c:1438 |
33705 |
msgid " and " |
33706 |
msgstr " ÔÁ " |
33707 |
|
33708 |
#: ../src/dialog.c:1448 |
33709 |
msgid "" |
33710 |
"\n" |
33711 |
"Sound disabled" |
33712 |
msgstr "" |
33713 |
"\n" |
33714 |
"ð¦ÄÔÒÉÍËÕ Ú×ÕËÕ ×ÉÍËÎÅÎÏ" |
33715 |
|
33716 |
#: ../src/dialog.c:1450 |
33717 |
msgid "" |
33718 |
"\n" |
33719 |
"Sound enabled" |
33720 |
msgstr "" |
33721 |
"\n" |
33722 |
"ð¦ÄÔÒÉÍËÕ Ú×ÕËÕ ÕצÍËÎÅÎÏ" |
33723 |
|
33724 |
#: ../src/dialog.c:1476 |
33725 |
msgid "Info" |
33726 |
msgstr "¶ÎÆÏÒÍÁæÑ" |
33727 |
|
33728 |
#: ../src/dialog.c:1499 |
33729 |
msgid "Merry Christmas!" |
33730 |
msgstr "ýÁÓÌÉ×ÏÇÏ ò¦ÚÄ×Á!" |
33731 |
|
33732 |
#: ../src/dialog.c:1569 |
33733 |
msgid "" |
33734 |
" Window Maker is free software; you can redistribute it and/or\n" |
33735 |
"modify it under the terms of the GNU General Public License as\n" |
33736 |
"published by the Free Software Foundation; either version 2 of the\n" |
33737 |
"License, or (at your option) any later version.\n" |
33738 |
"\n" |
33739 |
" Window Maker is distributed in the hope that it will be useful,\n" |
33740 |
"but WITHOUT ANY WARRANTY; without even the implied warranty\n" |
33741 |
"of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
33742 |
"See the GNU General Public License for more details.\n" |
33743 |
"\n" |
33744 |
" You should have received a copy of the GNU General Public\n" |
33745 |
"License along with this program; if not, write to the Free Software\n" |
33746 |
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" |
33747 |
"02111-1307, USA." |
33748 |
msgstr "" |
33749 |
" Window Maker ¤ צÌØÎÉÍ ÐÒÏÇÒÁÍÎÉÍ ÚÁÂÅÚÐÅÞÅÎÎÑÍ; ÷É ÍÏÖÅÔÅ\n" |
33750 |
"ÒÏÚÐÏ×ÓÀÄÖÕ×ÁÔÉ ÔÁ/ÁÂÏ ÍÏÄÉƦËÕ×ÁÔÉ ÊÏÇÏ Õ ×¦ÄÐÏצÄÎÏÓÔ¦ Ú ÕÍÏ×ÁÍÉ\n" |
33751 |
"̦ÃÅÎÚ¦§ GNU General Public License (GPL) ÏÐÕÂ̦ËÏ×ÁÎϧ ÏÒÇÁΦÚÁæ¤À\n" |
33752 |
"Free Software Foundation; ×ÅÒÓ¦§ 2 椧 ì¦ÃÅÎÚ¦§, ÞÉ (ÎÁ ÷ÁÛ ×ɦÒ)\n" |
33753 |
"ÂÕÄØ-ÑËϧ ÎÁÓÔÕÐÎϧ ×ÅÒÓ¦§.\n" |
33754 |
"\n" |
33755 |
" Window Maker ÒÏÚÐÏ×ÓÀÄÖÕ¤ÔØÓÑ Ú ÎÁĦ¤À ÎÁ ÔÅ, ÝÏ ×¦Î ÂÕÄÅ\n" |
33756 |
"ËÏÒÉÓÎÉÍ, ÁÌÅ âåú âõäø-ñëï· çáòáîô¶·; ÎÁצÔØ ÂÅÚ ÎÅÑ×Îϧ ÇÁÒÁÎÔ¦§\n" |
33757 |
"ëïíåòã¶êîï· ã¶îîïóô¶ ÞÉ ðòéäáôîïóô¶ äìñ ðå÷îïçï ÷éëïòéóôáîîñ.\n" |
33758 |
"äÉצÔØÓÑ GNU General Public License ÚÁ ÐÏÄÁÌØÛÉÍÉ ÐÏÄÒÏÂÉÃÑÍÉ.\n" |
33759 |
"\n" |
33760 |
" ÷É ÍÁÌÉ ÏÔÒÉÍÁÔÉ ËÏЦÀ GNU General Public License ÒÁÚÏÍ Ú Ã¦¤À\n" |
33761 |
"ÐÒÏÇÒÁÍÏÀ; ÑËÝÏ Î¦ - ÎÁÐÉÛ¦ÔØ ÄÏ Free Software Foundation, Inc.,\n" |
33762 |
"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." |
33763 |
|
33764 |
#: ../src/dialog.c:1590 |
33765 |
msgid "Legal" |
33766 |
msgstr "ðÒÁ×Ï×Á ¦ÎÆÏÒÍÁæÑ" |
33767 |
|
33768 |
#: ../src/dialog.c:1741 ../src/startup.c:394 |
33769 |
msgid "cannot open connection for crashing dialog panel. Aborting." |
33770 |
msgstr "" |
33771 |
"ÎÅ ×ÄÁÌÏÓØ ×¦ÄËÒÉÔÉ Ú'¤ÄÎÁÎÎÑ ÄÌÑ ÐÁÎÅ̦ Á×ÁÒ¦ÊÎÏÇÏ Ä¦ÁÌÏÇÕ. úÁ×ÅÒÛÅÎÎÑ " |
33772 |
"ÒÏÂÏÔÉ." |
33773 |
|
33774 |
#: ../src/dialog.c:1767 |
33775 |
msgid "Fatal error" |
33776 |
msgstr "ëÒÉÔÉÞÎÁ ÐÏÍÉÌËÁ" |
33777 |
|
33778 |
#: ../src/dialog.c:1778 |
33779 |
#, c-format |
33780 |
msgid "" |
33781 |
"Window Maker received signal %i\n" |
33782 |
"(%s)." |
33783 |
msgstr "" |
33784 |
"Window Maker: ÏÔÒÉÍÁÎÏ ÓÉÇÎÁÌ %i\n" |
33785 |
"(%s)." |
33786 |
|
33787 |
#: ../src/dialog.c:1781 |
33788 |
#, c-format |
33789 |
msgid "Window Maker received signal %i." |
33790 |
msgstr "Window Maker: ÏÔÒÉÍÁÎÏ ÓÉÇÎÁÌ %i." |
33791 |
|
33792 |
#: ../src/dialog.c:1790 |
33793 |
msgid "" |
33794 |
" This fatal error occured probably due to a bug. Please fill the included " |
33795 |
"BUGFORM and report it to bugs@×××××××××××.org." |
33796 |
msgstr "" |
33797 |
" ãÑ ËÒÉÔÉÞÎÁ ÐÏÍÉÌËÁ, ÍÏÖÌÉ×Ï, ¤ ÒÅÚÕÌØÔÁÔÏÍ ÐÏÍÉÌËÉ × ÐÒÏÇÒÁͦ. âÕÄØ ÌÁÓËÁ, " |
33798 |
"ÚÁÐÏ×ΦÔØ ÆÏÒÍÕ BUGFORM ¦ צÄÐÒÁ×ÔÅ §§ ÚÁ ÁÄÒÅÓÏÀ bugs@×××××××××××.org." |
33799 |
|
33800 |
#: ../src/dialog.c:1799 |
33801 |
msgid "What do you want to do now?" |
33802 |
msgstr "ýÏ ÒÏÂÉÔÉ?" |
33803 |
|
33804 |
#: ../src/dialog.c:1805 |
33805 |
msgid "Select action" |
33806 |
msgstr "÷ÉÂÅÒ¦ÔØ Ä¦À" |
33807 |
|
33808 |
#: ../src/dialog.c:1806 |
33809 |
msgid "Abort and leave a core file" |
33810 |
msgstr "úÁ×ÅÒÛÉÔÉ ÒÏÂÏÔÕ, ÚÁÌÉÛÉ×ÛÉ ÆÁÊÌ core" |
33811 |
|
33812 |
#: ../src/dialog.c:1807 |
33813 |
msgid "Restart Window Maker" |
33814 |
msgstr "ðÅÒÅÚÁÐÕÓÔÉÔÉ Window Maker" |
33815 |
|
33816 |
#: ../src/dialog.c:1808 |
33817 |
msgid "Start alternate window manager" |
33818 |
msgstr "úÁÐÕÓÔÉÔÉ ÁÌØÔÅÒÎÁÔÉ×ÎÉÊ ÍÅÎÅÄÖÅÒ ×¦ËÏÎ" |
33819 |
|
33820 |
#: ../src/dialog.c:1986 |
33821 |
msgid "" |
33822 |
"Window Maker is part of the GNUstep project.\n" |
33823 |
"The GNUstep project aims to create a free\n" |
33824 |
"implementation of the OpenStep(tm) specification\n" |
33825 |
"which is a object-oriented framework for\n" |
33826 |
"creating advanced graphical, multi-platform\n" |
33827 |
"applications. Additionally, a development and\n" |
33828 |
"user desktop enviroment will be created on top\n" |
33829 |
"of the framework. For more information about\n" |
33830 |
"GNUstep, please visit: www.gnustep.org" |
33831 |
msgstr "" |
33832 |
"Window Maker - ÃÅ ÞÁÓÔÉÎÁ ÐÒÏÅËÔÕ GNUstep.\n" |
33833 |
"ðÒÏÅËÔ GNUstep ÍÁ¤ ÎÁ ÍÅÔ¦ ÓÔ×ÏÒÉÔÉ ×¦ÌØÎÕ\n" |
33834 |
"ÒÅÁ̦ÚÁæÀ ÓÐÅÃÉƦËÁæ§ OpenStep(tm), ÑËÁ ¤\n" |
33835 |
"ÏÂ'¤ËÔÎÏ-ÏÒ¦¤ÎÔÏ×ÁÎÏÀ ÏÓÎÏ×ÏÀ ÄÌÑ ÓÔ×ÏÒÅÎÎÑ\n" |
33836 |
"×ÄÏÓËÏÎÁÌÅÎÉÈ ÇÒÁƦÞÎÉÈ ÎÅÚÁÌÅÖÎÉÈ ×¦Ä ÐÌÁÔÆÏÒÍÉ\n" |
33837 |
"ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ. îÁ Ã¦Ê ÏÓÎÏצ ÂÕÄÅ ÓÔ×ÏÒÅÎÏ\n" |
33838 |
"ÓÅÒÅÄÏ×ÉÝÅ ÒÏÚÒÏÂËÉ ÔÁ ÓÅÒÅÄÏ×ÉÝÅ ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ\n" |
33839 |
"ËÏÒÉÓÔÕ×ÁÞÁ. úÁ ÄÏÄÁÔËÏ×ÉÍÉ ÐÏÄÒÏÂÉÃÑÍÉ ÝÏÄÏ\n" |
33840 |
"GNUstep, ÂÕÄØ ÌÁÓËÁ, צÄצÄÁÊÔÅ: www.gnustep.org" |
33841 |
|
33842 |
#: ../src/dialog.c:2006 |
33843 |
msgid "About GNUstep" |
33844 |
msgstr "ðÒÏ GNUstep" |
33845 |
|
33846 |
#: ../src/dock.c:213 |
33847 |
#, c-format |
33848 |
msgid "Type the name for workspace %i:" |
33849 |
msgstr "÷×ÅĦÔØ ¦Í'Ñ ÄÌÑ %i-ÇÏ ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ:" |
33850 |
|
33851 |
# |
33852 |
#: ../src/dock.c:214 ../src/dock.c:1141 ../src/dock.c:1144 ../src/dock.c:3409 |
33853 |
msgid "Rename Workspace" |
33854 |
msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ ÓÔ¦Ì" |
33855 |
|
33856 |
#: ../src/dock.c:520 ../src/dock.c:528 |
33857 |
msgid "Warning" |
33858 |
msgstr "ðÏÐÅÒÅÄÖÅÎÎÑ" |
33859 |
|
33860 |
#: ../src/dock.c:521 |
33861 |
msgid "" |
33862 |
"Some icons cannot be made omnipresent. Please make sure that no other icon " |
33863 |
"is docked in the same positions on the other workspaces and the Clip is not " |
33864 |
"full in some workspace." |
33865 |
msgstr "" |
33866 |
"äÅÑ˦ ¦ËÏÎËÉ ÎÅÍÏÖÌÉ×Ï ÚÒÏÂÉÔÉ ÐÒÉÓÕÔΦÍÉ ÎÁ ×Ó¦È ÒÏÂÏÞÉÈ ÓÔÏÌÁÈ. " |
33867 |
"÷ÐÅ×ΦÔØÓÑ, ÝÏ ÎÁ Ã¦Ê ÖÅ ÐÏÚÉæ§ ÎÁ ¦ÎÛÉÈ ÒÏÂÏÞÉÈ ÓÔÏÌÁÈ ÎÅ ÐÒÉËÒ¦ÐÌÅÎÁ ¦ÎÛÁ " |
33868 |
"¦ËÏÎËÁ ¦ ÝÏ × óËÒ¦Ðæ ¤ ͦÓÃÅ ÄÌÑ ÎÏ×ÉÈ ¦ËÏÎÏË ÎÁ ×Ó¦È ÒÏÂÏÞÉÈ ÓÔÏÌÁÈ." |
33869 |
|
33870 |
#: ../src/dock.c:529 |
33871 |
msgid "" |
33872 |
"Icon cannot be made omnipresent. Please make sure that no other icon is " |
33873 |
"docked in the same position on the other workspaces and the Clip is not full " |
33874 |
"in some workspace." |
33875 |
msgstr "" |
33876 |
"¶ËÏÎËÕ ÎÅÍÏÖÌÉ×Ï ÚÒÏÂÉÔÉ ÐÒÉÓÕÔÎØÏÀ ÎÁ ×Ó¦È ÒÏÂÏÞÉÈ ÓÔÏÌÁÈ. ÷ÐÅ×ΦÔØÓÑ, ÝÏ " |
33877 |
"ÎÁ Ã¦Ê ÖÅ ÐÏÚÉæ§ ÎÁ ¦ÎÛÉÈ ÒÏÂÏÞÉÈ ÓÔÏÌÁÈ ÎÅ ÐÒÉËÒ¦ÐÌÅÎÁ ¦ÎÛÁ ¦ËÏÎËÁ ¦ ÝÏ × " |
33878 |
"óËÒ¦Ðæ ¤ ͦÓÃÅ ÄÌÑ ÎÏ×ÉÈ ¦ËÏÎÏË ÎÁ ×Ó¦È ÒÏÂÏÞÉÈ ÓÔÏÌÁÈ." |
33879 |
|
33880 |
#: ../src/dock.c:556 |
33881 |
msgid "Workspace Clip" |
33882 |
msgstr "óËÒ¦ÐËÁ òÏÂÏÞÏÇÏ ÓÔÏÌÕ" |
33883 |
|
33884 |
#: ../src/dock.c:557 |
33885 |
msgid "All selected icons will be removed!" |
33886 |
msgstr "÷Ó¦ ×ÉÂÒÁΦ ¦ËÏÎËÉ ÂÕÄÕÔØ ×ÉÄÁÌÅΦ!" |
33887 |
|
33888 |
#: ../src/dock.c:608 ../src/dock.c:1156 ../src/dock.c:1158 ../src/dock.c:3445 |
33889 |
msgid "Keep Icon" |
33890 |
msgstr "õÔÒÉÍÕ×ÁÔÉ ¦ËÏÎËÕ" |
33891 |
|
33892 |
# |
33893 |
#: ../src/dock.c:609 ../src/dock.c:2137 ../src/dock.c:2278 |
33894 |
msgid "Type the command used to launch the application" |
33895 |
msgstr "÷×ÅĦÔØ ËÏÍÁÎÄÕ, ÝÏ ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÄÌÑ ÚÁÐÕÓËÕ ÐÒÏÇÒÁÍÉ" |
33896 |
|
33897 |
# |
33898 |
#: ../src/dock.c:965 |
33899 |
#, c-format |
33900 |
msgid "could not launch application %s\n" |
33901 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÁÐÕÓÔÉÔÉ ÐÒÏÇÒÁÍÕ %s\n" |
33902 |
|
33903 |
#: ../src/dock.c:1020 |
33904 |
msgid "could not create workspace submenu for Clip menu" |
33905 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÓÔ×ÏÒÉÔÉ Ð¦ÄÍÅÎÀ ÒÏÂÏÞÉÈ Í¦ÓÃØ ÄÌÑ ÍÅÎÀ óËÒ¦ÐËÉ" |
33906 |
|
33907 |
#: ../src/dock.c:1078 |
33908 |
msgid "could not create options submenu for Clip menu" |
33909 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÓÔ×ÏÒÉÔÉ Ð¦ÄÍÅÎÀ ÐÁÒÁÍÅÔÒ¦× ÄÌÑ ÍÅÎÀ óËÒ¦ÐËÉ" |
33910 |
|
33911 |
#: ../src/dock.c:1082 ../src/dock.c:1130 |
33912 |
msgid "Keep on Top" |
33913 |
msgstr "úÁ×ÖÄÉ ÎÁ ÐÌÁ×Õ" |
33914 |
|
33915 |
#: ../src/dock.c:1088 |
33916 |
msgid "Collapsed" |
33917 |
msgstr "ú×ÅÒÎÕÔÏ" |
33918 |
|
33919 |
#: ../src/dock.c:1094 |
33920 |
msgid "Autocollapse" |
33921 |
msgstr "á×ÔÏÚ×ÅÒÔÁÔÉ" |
33922 |
|
33923 |
#: ../src/dock.c:1100 |
33924 |
msgid "Autoraise" |
33925 |
msgstr "á×ÔÏЦÄΦÍÁÔÉ" |
33926 |
|
33927 |
#: ../src/dock.c:1106 |
33928 |
msgid "Autoattract Icons" |
33929 |
msgstr "á×ÔÏÐÒÉÔÑÇÁÔÉ ¦ËÏÎËÉ" |
33930 |
|
33931 |
#: ../src/dock.c:1136 |
33932 |
msgid "Clip Options" |
33933 |
msgstr "ðÁÒÁÍÅÔÒÉ óËÒ¦ÐËÉ" |
33934 |
|
33935 |
#: ../src/dock.c:1146 |
33936 |
msgid "Selected" |
33937 |
msgstr "÷ÉÂÒÁÎÅ" |
33938 |
|
33939 |
#: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3436 |
33940 |
msgid "Select All Icons" |
33941 |
msgstr "÷ÉÂ¦Ò ×Ó¦È ¦ËÏÎÏË" |
33942 |
|
33943 |
#: ../src/dock.c:1160 ../src/dock.c:1162 ../src/dock.c:3453 |
33944 |
msgid "Move Icon To" |
33945 |
msgstr "ðÅÒÅͦÓÔÉÔÉ ¦ËÏÎËÕ ÎÁ..." |
33946 |
|
33947 |
#: ../src/dock.c:1167 ../src/dock.c:1170 ../src/dock.c:3464 |
33948 |
msgid "Remove Icon" |
33949 |
msgstr "÷ÉÄÁÌÉÔÉ ¦ËÏÎËÕ" |
33950 |
|
33951 |
#: ../src/dock.c:1172 |
33952 |
msgid "Attract Icons" |
33953 |
msgstr "ðÒÉÔÑÇÁÔÉ ¦ËÏÎËÉ" |
33954 |
|
33955 |
#: ../src/dock.c:1175 |
33956 |
msgid "Launch" |
33957 |
msgstr "úÁÐÕÓË" |
33958 |
|
33959 |
#: ../src/dock.c:1183 |
33960 |
msgid "Settings..." |
33961 |
msgstr "õÓÔÁÎÏ×ËÉ..." |
33962 |
|
33963 |
#: ../src/dock.c:1548 ../src/dock.c:1655 |
33964 |
#, c-format |
33965 |
msgid "bad value in docked icon state info %s" |
33966 |
msgstr "ÐÏÍÉÌËÏ×Å ÚÎÁÞÅÎÎÑ × ÓÔÁΦ ÐÒÉËÒ¦ÐÌÅÎϧ ¦ËÏÎËÉ -- %s" |
33967 |
|
33968 |
#: ../src/dock.c:1663 |
33969 |
#, c-format |
33970 |
msgid "bad value in docked icon position %i,%i" |
33971 |
msgstr "ÐÏÍÉÌËÏ×Å ÚÎÁÞÅÎÎÑ × ÐÏÚÉæ§ ÐÒÉËÒ¦ÐÌÅÎϧ ¦ËÏÎËÉ %i,%i" |
33972 |
|
33973 |
#: ../src/dock.c:1919 |
33974 |
msgid "there are too many icons stored in dock. Ignoring what doesn't fit" |
33975 |
msgstr "ÐÒÉËÒ¦ÐÌÅÎÏ ÎÁÄÔÏ ÂÁÇÁÔÏ ¦ËÏÎÏË. úÁÊצ ÂÕÄÕÔØ ÐÒϦÇÎÏÒÏ×ÁΦ" |
33976 |
|
33977 |
#. icon->forced_dock = 1; |
33978 |
#: ../src/dock.c:2136 ../src/dock.c:2277 |
33979 |
msgid "Dock Icon" |
33980 |
msgstr "¶ËÏÎËÁ äÏËÕ" |
33981 |
|
33982 |
#: ../src/dock.c:3323 |
33983 |
#, c-format |
33984 |
msgid "Could not execute command \"%s\"" |
33985 |
msgstr "îÅÍÏÖÌÉ×Ï ×ÉËÏÎÁÔÉ ËÏÍÁÎÄÕ \"%s\"" |
33986 |
|
33987 |
#: ../src/dock.c:3415 |
33988 |
msgid "Toggle Omnipresent" |
33989 |
msgstr "ðÒÉÓÕÔΦÓÔØ ÎÁ ×Ó¦È ÓÔÏÌÁÈ" |
33990 |
|
33991 |
#: ../src/dock.c:3420 ../src/kwm.c:637 ../src/winmenu.c:418 |
33992 |
#: ../src/winspector.c:1377 |
33993 |
msgid "Omnipresent" |
33994 |
msgstr "îÁ ×Ó¦È ÓÔÏÌÁÈ" |
33995 |
|
33996 |
#: ../src/dock.c:3434 |
33997 |
msgid "Unselect All Icons" |
33998 |
msgstr "úÎÑÔÔÑ ×ÉÂÏÒÕ ×Ó¦È ¦ËÏÎÏË" |
33999 |
|
34000 |
#: ../src/dock.c:3443 |
34001 |
msgid "Keep Icons" |
34002 |
msgstr "õÔÒÉÍÕ×ÁÔÉ ¦ËÏÎËÉ" |
34003 |
|
34004 |
#: ../src/dock.c:3451 |
34005 |
msgid "Move Icons To" |
34006 |
msgstr "ðÅÒÅͦÓÔÉÔÉ ¦ËÏÎËÉ ÎÁ..." |
34007 |
|
34008 |
#: ../src/dock.c:3462 |
34009 |
msgid "Remove Icons" |
34010 |
msgstr "÷ÉÄÁÌÉÔÉ ¦ËÏÎËÉ" |
34011 |
|
34012 |
#: ../src/dock.c:3493 ../src/kwm.c:643 |
34013 |
msgid "Bring Here" |
34014 |
msgstr "ðÒÉÎÅÓÔÉ ÓÀÄÉ" |
34015 |
|
34016 |
#: ../src/dockedapp.c:149 |
34017 |
#, c-format |
34018 |
msgid "could not find icon %s, used in a docked application" |
34019 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÎÁÊÔÉ ¦ËÏÎËÕ %s, ×ÉËÏÒÉÓÔÁÎÕ × ÐÒÉÛ×ÁÒÔÏ×ÁÎ¦Ê ÐÒÏÇÒÁͦ" |
34020 |
|
34021 |
# |
34022 |
#: ../src/dockedapp.c:229 |
34023 |
#, c-format |
34024 |
msgid "Could not open specified icon file: %s" |
34025 |
msgstr "îÅ ×ÄÁÌÏÓØ ×¦ÄËÒÉÔÉ ×ËÁÚÁÎÉÊ ÆÁÊÌ ¦ËÏÎËÉ: %s" |
34026 |
|
34027 |
#: ../src/dockedapp.c:231 |
34028 |
msgid "Ignore" |
34029 |
msgstr "¶ÇÎÏÒÕ×ÁÔÉ" |
34030 |
|
34031 |
#: ../src/dockedapp.c:333 |
34032 |
msgid "Start when Window Maker is started" |
34033 |
msgstr "úÁÐÕÓÔÉÔÉ ÐÒÉ ÚÁÐÕÓËÕ WindowMaker'Á" |
34034 |
|
34035 |
#: ../src/dockedapp.c:340 |
34036 |
msgid "Lock (prevent accidental removal)" |
34037 |
msgstr "úÁƦËÓÕ×ÁÔÉ (ÐÅÒÅÛËÏÄÉÔÉ ×ÉÐÁÄËÏ×ÏÍÕ ×ÉÄÁÌÅÎÎÀ)" |
34038 |
|
34039 |
# |
34040 |
#: ../src/dockedapp.c:344 |
34041 |
msgid "Application path and arguments" |
34042 |
msgstr "ûÌÑÈ ÄÏ ÐÒÏÇÒÁÍÉ ¦ ÁÒÇÕÍÅÎÔÉ" |
34043 |
|
34044 |
#: ../src/dockedapp.c:357 |
34045 |
msgid "Command for middle-click launch" |
34046 |
msgstr "ëÏÍÁÎÄÁ ÄÌÑ ÚÁÐÕÓËÕ ÐÏ ÓÅÒÅÄÎ¦Ê ËÎÏÐæ ÍÉÛ¦" |
34047 |
|
34048 |
#: ../src/dockedapp.c:371 |
34049 |
#, c-format |
34050 |
msgid "%s will be replaced with current selection" |
34051 |
msgstr "%s ÂÕÄÅ ÚÁͦÎÅÎÏ ÎÁ ÐÏÔÏÞÎÅ ×ÉĦÌÅÎÎÑ" |
34052 |
|
34053 |
#: ../src/dockedapp.c:376 |
34054 |
msgid "Command for files dropped with DND" |
34055 |
msgstr "ëÏÍÁÎÄÁ ÄÌÑ \"ÐÅÒÅÔÑÇÎÕÔÉÈ\" ÆÁÊ̦×" |
34056 |
|
34057 |
#: ../src/dockedapp.c:390 |
34058 |
#, c-format |
34059 |
msgid "%d will be replaced with the file name" |
34060 |
msgstr "%d ÂÕÄÅ ÚÁͦÎÅÎÏ ÎÁ ¦Í'Ñ ÆÁÊÌÁ" |
34061 |
|
34062 |
#: ../src/dockedapp.c:394 |
34063 |
msgid "DND support was not compiled in" |
34064 |
msgstr "ð¦ÄÔÒÉÍËÁ ÐÅÒÅÔÑÇÕ×ÁÎÎÑ ÄÁÎÉÈ ÎÅ ÂÕÌÁ ×ËÌÀÞÅÎÁ ÐÒÉ ËÏÍЦÌÑæ§" |
34065 |
|
34066 |
#: ../src/dockedapp.c:399 |
34067 |
msgid "Icon Image" |
34068 |
msgstr "úÏÂÒÁÖÅÎÎÑ ¦ËÏÎËÉ" |
34069 |
|
34070 |
#: ../src/dockedapp.c:413 ../src/winspector.c:1515 |
34071 |
msgid "Browse..." |
34072 |
msgstr "÷ÉÂÒÁÔÉ..." |
34073 |
|
34074 |
# |
34075 |
#: ../src/dockedapp.c:466 |
34076 |
msgid "Docked Application Settings" |
34077 |
msgstr "ðÁÒÁÍÅÔÒÉ ÐÒÉÛ×ÁÒÔÏ×ÁÎϧ ÐÒÏÇÒÁÍÉ" |
34078 |
|
34079 |
#: ../src/framewin.c:649 ../src/framewin.c:744 ../src/menu.c:456 |
34080 |
#: ../src/texture.c:594 |
34081 |
#, c-format |
34082 |
msgid "could not render texture: %s" |
34083 |
msgstr "ÎÅ ×ÄÁÌÏÓØ Ð¦ÄÇÏÔÕ×ÁÔÉ ÔÅËÓÔÕÒÕ: %s" |
34084 |
|
34085 |
#: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699 |
34086 |
#: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724 |
34087 |
#: ../src/icon.c:350 ../src/menu.c:485 |
34088 |
#, c-format |
34089 |
msgid "error rendering image:%s" |
34090 |
msgstr "ÐÏÍÉÌËÁ ÐÒÉ Ð¦ÄÇÏÔÏ×æ ÚÏÂÒÁÖÅÎÎÑ:%s" |
34091 |
|
34092 |
#: ../src/framewin.c:777 |
34093 |
#, c-format |
34094 |
msgid "error rendering image: %s" |
34095 |
msgstr "ÐÏÍÉÌËÁ ÐÒÉ Ð¦ÄÇÏÔÏ×æ ÚÏÂÒÁÖÅÎÎÑ: %s" |
34096 |
|
34097 |
#: ../src/gnome.c:216 ../src/gnome.c:343 ../src/gnome.c:401 |
34098 |
msgid "out of memory while updating GNOME hints" |
34099 |
msgstr "×ÉÞÅÒÐÁÎÁ ÐÁÍ'ÑÔØ ÐÒÉ ÏÎÏ×ÌÅÎΦ GNOME hints" |
34100 |
|
34101 |
#: ../src/icon.c:229 ../src/wdefaults.c:443 |
34102 |
#, c-format |
34103 |
msgid "error loading image file \"%s\"" |
34104 |
msgstr "ÐÏÍÉÌËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÆÁÊÌÕ ÚÏÂÒÁÖÅÎÎÑ \"%s\"" |
34105 |
|
34106 |
# |
34107 |
#: ../src/icon.c:491 ../src/icon.c:500 |
34108 |
#, c-format |
34109 |
msgid "could not create directory %s" |
34110 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÓÔ×ÏÒÉÔÉ ËÁÔÁÌÏÇ %s" |
34111 |
|
34112 |
#: ../src/icon.c:767 |
34113 |
#, c-format |
34114 |
msgid "could not find default icon \"%s\"" |
34115 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÎÁÊÔÉ ¦ËÏÎËÕ ÚÁ ÕÍÏ×ÞÁÎÎÑÍ \"%s\"" |
34116 |
|
34117 |
#: ../src/icon.c:773 |
34118 |
#, c-format |
34119 |
msgid "could not load default icon \"%s\":%s" |
34120 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÁ×ÁÎÔÁÖÉÔÉ ¦ËÏÎËÕ ÚÁ ÕÍÏ×ÞÁÎÎÑÍ \"%s\":%s" |
34121 |
|
34122 |
#. |
34123 |
#. * Warning: If you make some change that affects the order of the |
34124 |
#. * entries, you must update the command #defines in the top of |
34125 |
#. * this file. |
34126 |
#. |
34127 |
#: ../src/kwm.c:633 ../src/winmenu.c:441 ../src/winmenu.c:583 |
34128 |
msgid "Maximize" |
34129 |
msgstr "íÁËÓÉͦÚÕ×ÁÔÉ" |
34130 |
|
34131 |
#: ../src/kwm.c:634 ../src/winmenu.c:578 |
34132 |
msgid "Unmaximize" |
34133 |
msgstr "äÅÍÁËÓÉͦÚÕ×ÁÔÉ" |
34134 |
|
34135 |
#: ../src/kwm.c:635 ../src/winmenu.c:449 ../src/winmenu.c:569 |
34136 |
msgid "Miniaturize" |
34137 |
msgstr "í¦Î¦Í¦ÚÕ×ÁÔÉ" |
34138 |
|
34139 |
#: ../src/kwm.c:636 ../src/winmenu.c:564 |
34140 |
msgid "Deminiaturize" |
34141 |
msgstr "äÅͦΦͦÚÕ×ÁÔÉ" |
34142 |
|
34143 |
#: ../src/kwm.c:638 |
34144 |
msgid "Not Omnipresent" |
34145 |
msgstr "îÅ ÎÁ ×Ó¦È ÓÔÏÌÁÈ" |
34146 |
|
34147 |
#: ../src/kwm.c:639 |
34148 |
msgid "Move" |
34149 |
msgstr "ðÅÒÅͦÓÔÉÔÉ" |
34150 |
|
34151 |
#: ../src/kwm.c:640 |
34152 |
msgid "Resize" |
34153 |
msgstr "úͦÎÉÔÉ ÒÏÚͦÒ" |
34154 |
|
34155 |
#. |
34156 |
#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); |
34157 |
#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); |
34158 |
#. |
34159 |
#: ../src/kwm.c:641 ../src/rootmenu.c:248 ../src/winmenu.c:513 |
34160 |
msgid "Close" |
34161 |
msgstr "úÁËÒÉÔÉ" |
34162 |
|
34163 |
#: ../src/kwm.c:642 ../src/winmenu.c:497 |
34164 |
msgid "Move To" |
34165 |
msgstr "ðÅÒÅͦÓÔÉÔÉ ÎÁ..." |
34166 |
|
34167 |
#: ../src/kwm.c:1096 |
34168 |
msgid "%a(Run Command,Type the command to run:)" |
34169 |
msgstr "%a(úÁÐÕÓÔÉÔÉ ËÏÍÁÎÄÕ,÷×ÅĦÔØ ËÏÍÁÎÄÕ:)" |
34170 |
|
34171 |
#: ../src/main.c:222 |
34172 |
msgid "failed to restart Window Maker." |
34173 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÐÅÒÅÚÁÐÕÓÔÉÔÉ Window Maker." |
34174 |
|
34175 |
#: ../src/main.c:225 |
34176 |
#, c-format |
34177 |
msgid "could not exec %s" |
34178 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ×ÉËÏÎÁÔÉ %s" |
34179 |
|
34180 |
#: ../src/main.c:271 |
34181 |
msgid "Could not execute command: " |
34182 |
msgstr "îÅÍÏÖÌÉ×Ï ×ÉËÏÎÁÔÉ ËÏÍÁÎÄÕ: " |
34183 |
|
34184 |
#: ../src/main.c:428 |
34185 |
#, c-format |
34186 |
msgid "%s aborted.\n" |
34187 |
msgstr "%s ÐÅÒÅÒ×ÁÎÏ.\n" |
34188 |
|
34189 |
#: ../src/main.c:439 |
34190 |
#, c-format |
34191 |
msgid "Usage: %s [options]\n" |
34192 |
msgstr "úÁÐÕÓË: %s [ÐÁÒÁÍÅÔÒÉ]\n" |
34193 |
|
34194 |
#: ../src/main.c:440 |
34195 |
msgid "The Window Maker window manager for the X window system" |
34196 |
msgstr "íÅÎÅÄÖÅÒ ×¦ËÏÎ Window Maker ÄÌÑ ×¦ËÏÎÎϧ ÓÉÓÔÅÍÉ X Window" |
34197 |
|
34198 |
#: ../src/main.c:442 |
34199 |
msgid " -display host:dpy\tdisplay to use" |
34200 |
msgstr " -display ÈÏÓÔ:ÄÉÓÐÌÅÊ\t×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ×ËÁÚÁÎÉÊ ÄÉÓÐÌÅÊ" |
34201 |
|
34202 |
#: ../src/main.c:444 |
34203 |
msgid " --no-cpp \t\tdisable preprocessing of configuration files" |
34204 |
msgstr " --no-cpp \t\tÚÁÂÏÒÏÎÉÔÉ ÐÏÐÅÒÅÄÎÀ ÏÂÒÏÂËÕ ÆÁÊÌ¦× ËÏÎƦÇÕÒÁæ§" |
34205 |
|
34206 |
#: ../src/main.c:446 |
34207 |
msgid " --no-dock\t\tdo not open the application Dock" |
34208 |
msgstr " --no-dock\t\tΊצÄËÒÉ×ÁÔÉ äÏË ÐÒÏÇÒÁÍ" |
34209 |
|
34210 |
#: ../src/main.c:447 |
34211 |
msgid " --no-clip\t\tdo not open the workspace Clip" |
34212 |
msgstr " --no-clip\t\tΊצÄËÒÉ×ÁÔÉ óËÒ¦ÐËÕ" |
34213 |
|
34214 |
# |
34215 |
#: ../src/main.c:448 |
34216 |
msgid " --no-autolaunch\tdo not autolaunch applications" |
34217 |
msgstr " --no-autolaunch\tÎÅ ×ÉËÏÎÕ×ÁÔÉ Á×ÔÏÚÁÐÕÓË ÐÒÏÇÒÁÍ" |
34218 |
|
34219 |
#: ../src/main.c:449 |
34220 |
msgid " --dont-restore\t\tdo not restore saved session" |
34221 |
msgstr " --dont-restore\t\tΊצÄÔ×ÏÒÀ×ÁÔÉ ÚÂÅÒÅÖÅΦ ÓÅÁÎÓÉ" |
34222 |
|
34223 |
#: ../src/main.c:451 |
34224 |
msgid " --locale locale\tlocale to use" |
34225 |
msgstr " --locale locale\t×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÌÏËÁÌØ locale" |
34226 |
|
34227 |
#: ../src/main.c:453 |
34228 |
msgid "" |
34229 |
" --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals" |
34230 |
msgstr "" |
34231 |
" --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals" |
34232 |
|
34233 |
#: ../src/main.c:454 |
34234 |
msgid " --visual-id visualid\tvisual id of visual to use" |
34235 |
msgstr "" |
34236 |
" --visual-id visualid\t×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ×ËÁÚÁÎÉÊ ËÏÌØÏÒÏ×ÉÊ ËÌÁÓ ×¦ÄÏÂÒÁÖÅÎÎÑ" |
34237 |
|
34238 |
#: ../src/main.c:455 |
34239 |
msgid " --static\t\tdo not update or save configurations" |
34240 |
msgstr " --static\t\tÎÅ ÐÒÏ×ÏÄÉÔÉ ÏÎÏ×ÌÅÎÎÑ ÞÉ ÚÂÅÒÅÖÅÎÎÑ ËÏÎƦÇÕÒÁæÊ" |
34241 |
|
34242 |
#: ../src/main.c:456 |
34243 |
msgid " --no-polling\t\tdo not periodically check for configuration updates" |
34244 |
msgstr " --no-polling\t\tÎÅ ÒÏÂÉÔÉ ÐÅÒ¦ÏÄÉÞÎÉÈ ÐÅÒÅצÒÏË ÚͦΠËÏÎƦÇÕÒÁæ§" |
34245 |
|
34246 |
#: ../src/main.c:458 |
34247 |
msgid " --synchronous\t\tturn on synchronous display mode" |
34248 |
msgstr " --synchronous\t\t×ËÌÀÞÉÔÉ ÓÉÎÈÒÏÎÎÉÊ ÒÅÖÉÍ ÐÏËÁÚÕ" |
34249 |
|
34250 |
#: ../src/main.c:460 |
34251 |
msgid " --version\t\tprint version and exit" |
34252 |
msgstr " --version\t\t×É×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓ¦§ ÔÁ ×ÉÊÔÉ" |
34253 |
|
34254 |
#: ../src/main.c:461 |
34255 |
msgid " --help\t\t\tshow this message" |
34256 |
msgstr " --help\t\t\t×É×ÅÓÔÉ ÃÅÊ ÔÅËÓÔ" |
34257 |
|
34258 |
#: ../src/main.c:474 |
34259 |
#, c-format |
34260 |
msgid "" |
34261 |
"could not find user GNUstep directory (%s).\n" |
34262 |
"Make sure you have installed Window Maker correctly and run wmaker.inst" |
34263 |
msgstr "" |
34264 |
"ÎÅ ×ÄÁÌÏÓØ ÚÎÁÊÔÉ ËÁÔÁÌÏÇ GNUstep ËÏÒÉÓÔÕ×ÁÞÁ (%s).\n" |
34265 |
"÷ÐÅ×ΦÔØÓÑ, ÝÏ WindowMaker ×ÓÔÁÎÏ×ÌÅÎÏ ÐÒÁ×ÉÌØÎÏ ¦ ÚÁÐÕÓÔ¦ÔØ wmaker.inst" |
34266 |
|
34267 |
# |
34268 |
#: ../src/main.c:479 |
34269 |
#, c-format |
34270 |
msgid "could not find user GNUstep directory (%s)." |
34271 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÎÁÊÔÉ ËÁÔÁÌÏÇ GNUstep ËÏÒÉÓÔÕ×ÁÞÁ (%s)." |
34272 |
|
34273 |
#: ../src/main.c:482 |
34274 |
msgid "" |
34275 |
"There was an error while creating GNUstep directory, please make sure you " |
34276 |
"have installed Window Maker correctly and run wmaker.inst" |
34277 |
msgstr "" |
34278 |
"îÅ×ÄÁÞÁ ÐÒÉ ÓÔ×ÏÒÅÎΦ ËÁÔÁÌÏÇÕ GNUstep, ×ÐÅ×ΦÔØÓÑ, ÝÏ WindowMaker " |
34279 |
"×ÓÔÁÎÏ×ÌÅÎÏ ÐÒÁ×ÉÌØÎÏ ¦ ÚÁÐÕÓÔ¦ÔØ wmaker.inst" |
34280 |
|
34281 |
#: ../src/main.c:485 |
34282 |
#, c-format |
34283 |
msgid "%s directory created with default configuration." |
34284 |
msgstr "ëÁÔÁÌÏÇ %s ÓÔ×ÏÒÅÎÏ Ú ËÏÎƦÇÕÒÁæ¤À ÚÁ ÕÍÏ×ÞÁÎÎÑÍ." |
34285 |
|
34286 |
#: ../src/main.c:505 ../src/main.c:510 |
34287 |
#, c-format |
34288 |
msgid "%s:could not execute initialization script" |
34289 |
msgstr "%s:ÎÅ ×ÄÁÌÏÓØ ×ÉËÏÎÁÔÉ ÓÃÅÎÁÒ¦Ê ¦Î¦Ã¦Á̦ÚÁæ§" |
34290 |
|
34291 |
#: ../src/main.c:530 ../src/main.c:535 |
34292 |
#, c-format |
34293 |
msgid "%s:could not execute exit script" |
34294 |
msgstr "%s:ÎÅ ×ÄÁÌÏÓØ ×ÉËÏÎÁÔÉ ÓÃÅÎÁÒ¦Ê ÚÁ×ÅÒÛÅÎÎÑ ÒÏÂÏÔÉ" |
34295 |
|
34296 |
#: ../src/main.c:663 ../src/main.c:671 ../src/main.c:679 ../src/main.c:699 |
34297 |
#, c-format |
34298 |
msgid "too few arguments for %s" |
34299 |
msgstr "ÎÁÄÔÏ ÍÁÌÏ ÁÒÇÕÍÅÎÔ¦× ÄÌÑ %s" |
34300 |
|
34301 |
#: ../src/main.c:683 |
34302 |
#, c-format |
34303 |
msgid "bad value for visualid: \"%s\"" |
34304 |
msgstr "ÐÏÍÉÌËÏ×Å ÚÎÁÞÅÎÎÑ ÄÌÑ visualid: \"%s\"" |
34305 |
|
34306 |
# |
34307 |
#: ../src/main.c:707 |
34308 |
#, c-format |
34309 |
msgid "%s: invalid argument '%s'\n" |
34310 |
msgstr "%s: ÎÅÐÒÁ×ÉÌØÎÉÊ ÁÒÇÕÍÅÎÔ '%s'\n" |
34311 |
|
34312 |
#: ../src/main.c:708 |
34313 |
#, c-format |
34314 |
msgid "Try '%s --help' for more information\n" |
34315 |
msgstr "óÐÒÏÂÕÊÔÅ '%s --help' ÄÌÑ ÏÔÒÉÍÁÎÎÑ ÄÏÄÁÔËÏ×ϧ ¦ÎÆÏÒÍÁæ§\n" |
34316 |
|
34317 |
#: ../src/main.c:736 |
34318 |
msgid "X server does not support locale" |
34319 |
msgstr "X ÓÅÒ×ÅÒ ÎŠЦÄÔÒÉÍÕ¤ ÌÏËÁ̦ÚÁæÀ" |
34320 |
|
34321 |
#: ../src/main.c:740 |
34322 |
msgid "cannot set locale modifiers" |
34323 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ×ÓÔÁÎÏ×ÉÔÉ ÐÁÒÁÍÅÔÒÉ ÌÏËÁ̦ÚÁæ§" |
34324 |
|
34325 |
#: ../src/main.c:756 |
34326 |
#, c-format |
34327 |
msgid "could not open display \"%s\"" |
34328 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ×¦ÄËÒÉÔÉ ÄÉÓÐÌÅÊ \"%s\"" |
34329 |
|
34330 |
# |
34331 |
#: ../src/menu.c:1255 |
34332 |
msgid "could not grab keyboard" |
34333 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÁÈÏÐÉÔÉ ËÌÁצÁÔÕÒÕ" |
34334 |
|
34335 |
#: ../src/menureader.c:264 ../src/rootmenu.c:733 |
34336 |
#, c-format |
34337 |
msgid "%s:could not stat menu" |
34338 |
msgstr "%s:ÎÅ ×ÄÁÌÏÓØ ÏÔÒÉÍÁÔÉ ÍÅÎÀ" |
34339 |
|
34340 |
#: ../src/menureader.c:341 ../src/menureader.c:380 |
34341 |
#, c-format |
34342 |
msgid "could not stat() menu file '%s'" |
34343 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÏÔÒÉÍÁÔÉ ÆÁÊÌ ÍÅÎÀ '%s'" |
34344 |
|
34345 |
#: ../src/menureader.c:416 |
34346 |
#, c-format |
34347 |
msgid "could not find menu file '%s' referenced in WMRootMenu" |
34348 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÎÁÊÔÉ ÆÁÊÌ ÍÅÎÀ '%s' ×ËÁÚÁÎÉÊ × WMRootMenu" |
34349 |
|
34350 |
#: ../src/menureader.c:423 |
34351 |
#, c-format |
34352 |
msgid "could not find any usable menu files. Please check '%s'" |
34353 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÎÁÊÔÉ ÆÁÊÌ¦× ÍÅÎÀ. âÕÄØ ÌÁÓËÁ, ÐÅÒÅצÒÔÅ '%s'" |
34354 |
|
34355 |
#: ../src/menureader.c:438 ../src/rootmenu.c:1667 |
34356 |
#, c-format |
34357 |
msgid "" |
34358 |
"using default menu file \"%s\" as the menu referenced in WMRootMenu could " |
34359 |
"not be found " |
34360 |
msgstr "" |
34361 |
"×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÍÅÎÀ ÚÁ ÕÍÏ×ÞÁÎÎÑÍ \"%s\", ÔÏÍÕ ÝÏ ÍÅÎÀ, ×ËÁÚÁÎÅ × ÆÁÊ̦ " |
34362 |
"WMRootMenu, ÎÅ ×ÄÁÌÏÓØ ÚÎÁÊÔÉ " |
34363 |
|
34364 |
#: ../src/menureader.c:457 |
34365 |
#, c-format |
34366 |
msgid "" |
34367 |
"invalid content in menu file '%s'.\n" |
34368 |
"It should either be a property list menu or the path to the file, enclosed " |
34369 |
"in \"." |
34370 |
msgstr "" |
34371 |
"ÎÅËÏÒÅËÔÎÁ ¦ÎÆÏÒÍÁÃ¦Ñ × ÆÁÊ̦ ÍÅÎÀ '%s'.\n" |
34372 |
"ãÅ ÍÁ¤ ÂÕÔÉ ÁÂÏ ÍÅÎÀ × ÆÏÒÍÁÔ¦ property list, ÁÂÏ ÛÌÑÈ ÄÏ ÆÁÊÌÕ, ×ÚÑÔÉÊ " |
34373 |
"× \"." |
34374 |
|
34375 |
#: ../src/misc.c:71 |
34376 |
#, c-format |
34377 |
msgid "could not define value for %s for cpp" |
34378 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ×ÉÚÎÁÞÉÔÉ ÚÎÁÞÅÎÎÑ ÄÌÑ %s ÄÌÑ cpp" |
34379 |
|
34380 |
#: ../src/misc.c:101 |
34381 |
#, c-format |
34382 |
msgid "could not get password entry for UID %i" |
34383 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÏÔÒÉÍÁÔÉ ¦ÎÆÏÒÍÁæÀ ÐÒÏ ËÏÒÉÓÔÕ×ÁÞÁ ÄÌÑ UID %i" |
34384 |
|
34385 |
#: ../src/misc.c:126 |
34386 |
#, c-format |
34387 |
msgid "your machine is misconfigured. HOSTNAME is set to %s" |
34388 |
msgstr "÷ÁÛÁ ÓÉÓÔÅÍÁ ÐÏÇÁÎÏ ÚËÏÎƦÇÕÒÏ×ÁÎÁ. úͦÎÎÁ HOSTNAME ×ÓÔÁÎÏ×ÌÅÎÁ × %s" |
34389 |
|
34390 |
#: ../src/misc.c:132 |
34391 |
#, c-format |
34392 |
msgid "your machine is misconfigured. HOST is set to %s" |
34393 |
msgstr "÷ÁÛÁ ÓÉÓÔÅÍÁ ÐÏÇÁÎÏ ÚËÏÎƦÇÕÒÏ×ÁÎÁ. úͦÎÎÁ HOST ×ÓÔÁÎÏ×ÌÅÎÁ × %s" |
34394 |
|
34395 |
#: ../src/misc.c:630 |
34396 |
msgid "Program Arguments" |
34397 |
msgstr "áÒÇÕÍÅÎÔÉ ÐÒÏÇÒÁÍÉ" |
34398 |
|
34399 |
#: ../src/misc.c:631 |
34400 |
msgid "Enter command arguments:" |
34401 |
msgstr "÷×ÅĦÔØ ÁÒÇÕÍÅÎÔÉ ËÏÍÁÎÄÉ:" |
34402 |
|
34403 |
#: ../src/misc.c:724 |
34404 |
msgid "unable to get dropped data from DND drop" |
34405 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÏÔÒÉÍÁÔÉ ×¦Ä DND drop ÐÅÒÅÔÑÇÎÕÔ¦ ÄÁΦ" |
34406 |
|
34407 |
#: ../src/misc.c:732 |
34408 |
msgid "error getting dropped data from DND drop" |
34409 |
msgstr "ÐÏÍÉÌËÁ ÐÒÉ ÏÔÒÉÍÁÎΦ ÄÁÎÉÈ ×¦Ä DND drop" |
34410 |
|
34411 |
#: ../src/misc.c:738 |
34412 |
msgid "out of memory while getting data from DND drop" |
34413 |
msgstr "×ÉÞÅÒÐÁÎÁ ÐÁÍ'ÑÔØ ÐÒÉ ÏÔÒÉÍÁÎΦ ÄÁÎÉÈ ×¦Ä DND drop" |
34414 |
|
34415 |
#: ../src/misc.c:783 ../src/misc.c:923 |
34416 |
#, c-format |
34417 |
msgid "out of memory during expansion of \"%s\"" |
34418 |
msgstr "×ÉÞÅÒÐÁÎÁ ÐÁÍ'ÑÔØ Ð¦Ä ÞÁÓ ÒÏÚÛÉÒÅÎÎÑ \"%s\"" |
34419 |
|
34420 |
#: ../src/misc.c:837 |
34421 |
msgid "out of memory during expansion of \"%w\"" |
34422 |
msgstr "×ÉÞÅÒÐÁÎÁ ÐÁÍ'ÑÔØ Ð¦Ä ÞÁÓ ÒÏÚÛÉÒÅÎÎÑ \"%w\"" |
34423 |
|
34424 |
#: ../src/misc.c:855 |
34425 |
msgid "out of memory during expansion of \"%W\"" |
34426 |
msgstr "×ÉÞÅÒÐÁÎÁ ÐÁÍ'ÑÔØ Ð¦Ä ÞÁÓ ÒÏÚÛÉÒÅÎÎÑ \"%W\"" |
34427 |
|
34428 |
#: ../src/misc.c:871 |
34429 |
msgid "out of memory during expansion of \"%a\"" |
34430 |
msgstr "×ÉÞÅÒÐÁÎÁ ÐÁÍ'ÑÔØ Ð¦Ä ÞÁÓ ÒÏÚÛÉÒÅÎÎÑ \"%a\"" |
34431 |
|
34432 |
#: ../src/misc.c:902 |
34433 |
#, c-format |
34434 |
msgid "out of memory during expansion of \"%d\"" |
34435 |
msgstr "×ÉÞÅÒÐÁÎÁ ÐÁÍ'ÑÔØ Ð¦Ä ÞÁÓ ÒÏÚÛÉÒÅÎÎÑ \"%d\"" |
34436 |
|
34437 |
#: ../src/misc.c:916 |
34438 |
msgid "selection not available" |
34439 |
msgstr "ÎÅÄÏÓÔÕÐÎÏ ×ÉĦÌÅÎÎÑ" |
34440 |
|
34441 |
#: ../src/misc.c:972 ../src/misc.c:978 |
34442 |
#, c-format |
34443 |
msgid "bad window name value in %s state info" |
34444 |
msgstr "ÐÏÍÉÌËÏ×Å ÚÎÁÞÅÎÎÑ ¦ÍÅΦ צËÎÁ × ¦ÎÆÏÒÍÁæ§ ÐÒÏ ÓÔÁÎ ÄÌÑ %s" |
34445 |
|
34446 |
#: ../src/misc.c:1235 |
34447 |
msgid "could not send message to background image helper" |
34448 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÐÏÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÐÒÏÇÒÁͦ ÆÏÎÏ×ÏÇÏ ÚÏÂÒÁÖÅÎÎÑ" |
34449 |
|
34450 |
#: ../src/pixmap.c:235 |
34451 |
#, c-format |
34452 |
msgid "could not load mask bitmap file \"%s\". Won't use mask" |
34453 |
msgstr "" |
34454 |
"ÎÅ ×ÄÁÌÏÓØ ÚÁ×ÁÎÔÁÖÉÔÉ ÒÁÓÔÒÏ×ÉÊ ÆÁÊÌ ÍÁÓËÉ \"%s\". íÁÓËÁ ÎÅ ÂÕÄÅ ×ÉËÏÒÉÓÔÁÎÁ." |
34455 |
|
34456 |
#: ../src/resources.c:44 |
34457 |
#, c-format |
34458 |
msgid "could not parse color \"%s\"" |
34459 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÒÏÚ¦ÂÒÁÔÉ ËÏÌ¦Ò \"%s\"" |
34460 |
|
34461 |
#: ../src/resources.c:48 |
34462 |
#, c-format |
34463 |
msgid "could not allocate color \"%s\"" |
34464 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÁÒÅÚÅÒ×Õ×ÁÔÉ ËÏÌ¦Ò \"%s\"" |
34465 |
|
34466 |
#: ../src/rootmenu.c:196 ../src/rootmenu.c:198 |
34467 |
msgid "Exit" |
34468 |
msgstr "÷ÉȦÄ" |
34469 |
|
34470 |
#: ../src/rootmenu.c:197 |
34471 |
msgid "Exit window manager?" |
34472 |
msgstr "÷ÉÊÔÉ Ú ÍÅÎÅÄÖÅÒÁ צËÏÎ?" |
34473 |
|
34474 |
#: ../src/rootmenu.c:245 |
34475 |
msgid "Close X session" |
34476 |
msgstr "úÁ×ÅÒÛÉÔÉ ÓÅÁÎÓ ÒÏÂÏÔÉ" |
34477 |
|
34478 |
#: ../src/rootmenu.c:246 |
34479 |
msgid "" |
34480 |
"Close Window System session?\n" |
34481 |
"Kill might close applications with unsaved data." |
34482 |
msgstr "" |
34483 |
"úÁËÒÉÔÉ ÓÅÁÎÓ ÷¦ËÏÎÎϧ óÉÓÔÅÍÉ?\n" |
34484 |
"ãÅ ÍÏÖÅ ÚÁ×ÅÒÛÉÔÉ ÐÒÏÇÒÁÍÉ Ú ÎÅÚÂÅÒÅÖÅÎÉÍÉ ÄÁÎÉÍÉ." |
34485 |
|
34486 |
#: ../src/rootmenu.c:261 |
34487 |
msgid "Kill X session" |
34488 |
msgstr "á×ÁÒ¦ÊÎÅ ÚÁ×ÅÒÛÅÎÎÑ ÓÅÁÎÓÕ ÒÏÂÏÔÉ" |
34489 |
|
34490 |
#: ../src/rootmenu.c:262 |
34491 |
msgid "" |
34492 |
"Kill Window System session?\n" |
34493 |
"(all applications will be closed)" |
34494 |
msgstr "" |
34495 |
"úÁËÒÉÔÉ ÓÅÁÎÓ ÷¦ËÏÎÎϧ óÉÓÔÅÍÉ?\n" |
34496 |
"(×Ó¦ ÐÒÏÇÒÁÍÉ ÂÕÄÕÔØ ÚÁ×ÅÒÛÅΦ)" |
34497 |
|
34498 |
#: ../src/rootmenu.c:539 |
34499 |
#, c-format |
34500 |
msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" |
34501 |
msgstr "%s:ÐÏÍÉÌËÏ×Å ÚÁÄÁÎÎÑ ËÏͦÎÁæ§ ËÌÁ×¦Û \"%s\" ÄÌÑ ÐÕÎËÔÕ %s" |
34502 |
|
34503 |
#: ../src/rootmenu.c:547 |
34504 |
#, c-format |
34505 |
msgid "%s:invalid key in shortcut \"%s\" for entry %s" |
34506 |
msgstr "%s:ÐÏÍÉÌËÏ×Á ËÌÁצÛÁ × ËÏͦÎÁæ§ \"%s\" ÄÌÑ ÐÕÎËÔÕ %s" |
34507 |
|
34508 |
#: ../src/rootmenu.c:600 |
34509 |
#, c-format |
34510 |
msgid "%s: unmatched '\"' in menu file" |
34511 |
msgstr "%s: ÎÅÐÁÒÎÁ '\"' × ÆÁÊ̦ ÍÅÎÀ" |
34512 |
|
34513 |
#: ../src/rootmenu.c:650 |
34514 |
#, c-format |
34515 |
msgid "%s: missing command" |
34516 |
msgstr "%s: צÄÓÕÔÎÑ ËÏÍÁÎÄÁ" |
34517 |
|
34518 |
#: ../src/rootmenu.c:682 |
34519 |
#, c-format |
34520 |
msgid "invalid OPEN_MENU specification: %s" |
34521 |
msgstr "ÐÏÍÉÌËÏ×Á ÓÐÅÃÉƦËÁÃ¦Ñ OPEN_MENU: %s" |
34522 |
|
34523 |
#: ../src/rootmenu.c:741 |
34524 |
#, c-format |
34525 |
msgid "%s:could not stat menu:%s" |
34526 |
msgstr "%s:ÎÅ ×ÄÁÌÏÓØ ÏÔÒÉÍÁÔÉ ÍÅÎÀ:%s" |
34527 |
|
34528 |
#: ../src/rootmenu.c:759 |
34529 |
#, c-format |
34530 |
msgid "too many parameters in OPEN_MENU: %s" |
34531 |
msgstr "ÎÁÄÔÏ ÂÁÇÁÔÏ ÐÁÒÁÍÅÔÒ¦× × OPEN_MENU: %s" |
34532 |
|
34533 |
#: ../src/rootmenu.c:803 |
34534 |
msgid "" |
34535 |
"There are more than one WORKSPACE_MENU commands in the applications menu. " |
34536 |
"Only one is allowed." |
34537 |
msgstr "" |
34538 |
"÷ ÇÏÌÏ×ÎÏÍÕ ÍÅÎÀ ×ËÁÚÁÎÏ Â¦ÌØÛÅ ÏÄΦ¤§ ËÏÍÁÎÄÉ WORKSPACE_MENU. äÏÚ×ÏÌÅÎÁ " |
34539 |
"ÌÉÛÅ ÏÄÎÁ" |
34540 |
|
34541 |
#: ../src/rootmenu.c:837 |
34542 |
msgid "" |
34543 |
"There are more than one WINDOWS_MENU commands in the applications menu. Only " |
34544 |
"one is allowed." |
34545 |
msgstr "" |
34546 |
"÷ ÇÏÌÏ×ÎÏÍÕ ÍÅÎÀ ×ËÁÚÁÎÏ Â¦ÌØÛÅ ÏÄΦ¤§ ËÏÍÁÎÄÉ WINDOWS_MENU. äÏÚ×ÏÌÅÎÁ " |
34547 |
"ÌÉÛÅ ÏÄÎÁ" |
34548 |
|
34549 |
#: ../src/rootmenu.c:842 |
34550 |
msgid "Window List" |
34551 |
msgstr "óÐÉÓÏË ×¦ËÏÎ" |
34552 |
|
34553 |
#: ../src/rootmenu.c:871 ../src/rootmenu.c:889 ../src/rootmenu.c:899 |
34554 |
#, c-format |
34555 |
msgid "%s:missing parameter for menu command \"%s\"" |
34556 |
msgstr "%s:צÄÓÕÔÎ¦Ê ÐÁÒÁÍÅÔÒ ÄÌÑ ËÏÍÁÎÄÉ ÍÅÎÀ \"%s\"" |
34557 |
|
34558 |
#: ../src/rootmenu.c:967 |
34559 |
#, c-format |
34560 |
msgid "%s:unknown command \"%s\" in menu config." |
34561 |
msgstr "%s:ÎÅצÄÏÍÁ ËÏÍÁÎÄÁ \"%s\" × ËÏÎƦÇÕÒÁæ§ ÍÅÎÀ" |
34562 |
|
34563 |
#: ../src/rootmenu.c:975 |
34564 |
#, c-format |
34565 |
msgid "%s:can't add shortcut for entry \"%s\"" |
34566 |
msgstr "%s:ÎÅ ×ÄÁÌÏÓØ ÄÏÄÁÔÉ ËÏͦÎÁæÀ ËÌÁ×¦Û ÄÌÑ ËÏÍÁÎÄÉ \"%s\"" |
34567 |
|
34568 |
#: ../src/rootmenu.c:1112 |
34569 |
#, c-format |
34570 |
msgid "%s:maximal line size exceeded in menu config: %s" |
34571 |
msgstr "%s:ÐÅÒÅ×ÉÝÅÎÏ ÍÁËÓÉÍÁÌØÎÙÊ ÒÏÚÍ¦Ò ÒÑÄËÁ × ËÏÎƦÇÕÒÁæ§ ÍÅÎÀ: %s" |
34572 |
|
34573 |
#: ../src/rootmenu.c:1134 ../src/rootmenu.c:1227 ../src/rootmenu.c:1329 |
34574 |
#, c-format |
34575 |
msgid "%s:missing command in menu config: %s" |
34576 |
msgstr "%s:צÄÓÕÔÎÑ ËÏÍÁÎÄÁ × ËÏÎƦÇÕÒÁæ§ ÍÅÎÀ: %s" |
34577 |
|
34578 |
#: ../src/rootmenu.c:1164 |
34579 |
#, c-format |
34580 |
msgid "%s:syntax error in menu file:END declaration missing" |
34581 |
msgstr "%s:ÓÉÎÔÁËÓÉÞÎÁ ÐÏÍÉÌËÁ × ÆÁÊ̦ ÍÅÎÀ: צÄÓÕÔÎÑ END" |
34582 |
|
34583 |
#: ../src/rootmenu.c:1193 ../src/rootmenu.c:1293 |
34584 |
msgid "could not make arguments for menu file preprocessor" |
34585 |
msgstr "ÎÅ ×ÄÁÌÏÓØ Ð¦ÄÓÔÁ×ÉÔÉ ÁÒÇÕÍÅÎÔÉ ÄÌÑ ÐÒÅÐÒÏÃÅÓÏÒÁ ÆÁÊÌÕ ÍÅÎÀ" |
34586 |
|
34587 |
#: ../src/rootmenu.c:1200 ../src/rootmenu.c:1301 |
34588 |
#, c-format |
34589 |
msgid "%s:could not open/preprocess menu file" |
34590 |
msgstr "%s:ÎÅ ×ÄÁÌÏÓØ ×¦ÄËÒÉÔÉ/ÏÂÒÏÂÉÔÉ ÆÁÊÌ ÍÅÎÀ" |
34591 |
|
34592 |
#: ../src/rootmenu.c:1212 ../src/rootmenu.c:1314 |
34593 |
#, c-format |
34594 |
msgid "%s:could not open menu file" |
34595 |
msgstr "%s:ÎÅ ×ÄÁÌÏÓØ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÍÅÎÀ" |
34596 |
|
34597 |
#: ../src/rootmenu.c:1239 |
34598 |
#, c-format |
34599 |
msgid "%s:invalid menu file. MENU command is missing" |
34600 |
msgstr "%s:ÆÁÊÌ ÍÅÎÀ ÐÏÍÉÌËÏ×ÉÊ. ÷¦ÄÓÕÔÎÑ ËÏÍÁÎÄÁ MENU" |
34601 |
|
34602 |
#: ../src/rootmenu.c:1248 |
34603 |
msgid "error reading preprocessed menu data" |
34604 |
msgstr "ÐÏÍÉÌËÁ ÞÉÔÁÎÎÑ ÏÂÒÏÂÌÅÎÉÈ ÄÁÎÉÈ ÍÅÎÀ" |
34605 |
|
34606 |
#: ../src/rootmenu.c:1341 |
34607 |
#, c-format |
34608 |
msgid "%s:no title given for the root menu" |
34609 |
msgstr "%s: ÎÅ ÚÁÄÁÎÉÊ ÚÁÇÏÌÏ×ÏË ËÏÒÅÎÅ×ÏÇÏ ÍÅÎÀ" |
34610 |
|
34611 |
#: ../src/rootmenu.c:1432 ../src/rootmenu.c:1505 ../src/rootmenu.c:1546 |
34612 |
#, c-format |
34613 |
msgid "out of memory while constructing directory menu %s" |
34614 |
msgstr "×ÉÞÅÒÐÁÎÁ ÐÁÍ'ÑÔØ ÐÒÉ ÐÏÂÕÄÏצ ÍÅÎÀ ËÁÔÁÌÏÇÁ %s" |
34615 |
|
34616 |
#: ../src/rootmenu.c:1442 |
34617 |
#, c-format |
34618 |
msgid "%s:could not stat file \"%s\" in menu directory" |
34619 |
msgstr "%s:ÎÅ ÏÔÒÉÍÕ¤ÔØÓÑ ÆÁÊÌ \"%s\" × ËÁÔÁÌÏÚ¦ ÍÅÎÀ" |
34620 |
|
34621 |
#: ../src/rootmenu.c:1600 |
34622 |
msgid "Commands" |
34623 |
msgstr "ëÏÍÁÎÄÉ" |
34624 |
|
34625 |
#: ../src/rootmenu.c:1603 |
34626 |
msgid "Restart" |
34627 |
msgstr "ðÅÒÅÚÁÐÕÓË" |
34628 |
|
34629 |
#: ../src/rootmenu.c:1604 |
34630 |
msgid "Exit..." |
34631 |
msgstr "÷ÉȦÄ..." |
34632 |
|
34633 |
#: ../src/rootmenu.c:1649 |
34634 |
#, c-format |
34635 |
msgid "could not find menu file \"%s\" referenced in WMRootMenu" |
34636 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÎÁÊÔÉ ÆÁÊÌ ÍÅÎÀ \"%s\", ×ËÁÚÁÎÉÊ × WMRootMenu" |
34637 |
|
34638 |
#: ../src/rootmenu.c:1656 |
34639 |
#, c-format |
34640 |
msgid "could not access menu \"%s\" referenced in WMRootMenu" |
34641 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÐÒÏÞÉÔÁÔÉ ÍÅÎÀ \"%s\", ×ËÁÚÁÎÅ × WMRootMenu" |
34642 |
|
34643 |
#: ../src/rootmenu.c:1690 ../src/rootmenu.c:1766 |
34644 |
#, c-format |
34645 |
msgid "%s:format error in root menu configuration \"%s\"" |
34646 |
msgstr "%s:ÐÏÍÉÌËÁ ÆÏÒÍÁÔÕ × ËÏÎƦÇÕÒÁæ§ ËÏÒÅÎÅ×ÏÇÏ ÍÅÎÀ \"%s\"" |
34647 |
|
34648 |
#: ../src/rootmenu.c:1854 |
34649 |
msgid "" |
34650 |
"The applications menu could not be loaded. Look at the console output for a " |
34651 |
"detailed description of the errors." |
34652 |
msgstr "" |
34653 |
"îÅ ×ÄÁÌÏÓØ ÚÁ×ÁÎÔÁÖÉÔÉ ÍÅÎÀ ÐÒÏÇÒÁÍ. ðÏצÄÏÍÌÅÎÎÑ ÎÁ ËÏÎÓÏ̦ ÓÉÓÔÅÍÉ Í¦ÓÔÑÔØ " |
34654 |
"ÄÅÔÁÌØÎÉÊ ÏÐÉÓ ÐÒÏÂÌÅÍÉ." |
34655 |
|
34656 |
#: ../src/screen.c:740 |
34657 |
#, c-format |
34658 |
msgid "could not initialize graphics library context: %s" |
34659 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÇÒÁƦÞÎÕ Â¦Â̦ÏÔÅËÕ: %s" |
34660 |
|
34661 |
#: ../src/screen.c:771 |
34662 |
msgid "could not do initialization of WINGs widget set" |
34663 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÎÁÂ¦Ò ×¦ÄÖÅÔ¦× WINGs" |
34664 |
|
34665 |
#: ../src/screen.c:1137 |
34666 |
#, c-format |
34667 |
msgid "could not save session state in %s" |
34668 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÂÅÒÅÇÔÉ ÓÔÁÎ ÓÅÁÎÓÕ × %s" |
34669 |
|
34670 |
#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:454 |
34671 |
#, c-format |
34672 |
msgid "can't convert \"%s\" to boolean" |
34673 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÐÅÒÅÔ×ÏÒÉÔÉ \"%s\" × ÂÕ̦×ÓØËÅ ÚÎÁÞÅÎÎÑ" |
34674 |
|
34675 |
#: ../src/session.c:1023 |
34676 |
msgid "out of memory while saving session state" |
34677 |
msgstr "×ÉÞÅÒÐÁÎÁ ÐÁÍ'ÑÔØ ÐÒÉ ÚÂÅÒÅÖÅÎΦ ÓÔÁÎÕ ÓÅÁÎÓÕ" |
34678 |
|
34679 |
#: ../src/session.c:1106 |
34680 |
msgid "end of memory while saving session state" |
34681 |
msgstr "×ÉÞÅÒÐÁÎÁ ÐÁÍ'ÑÔØ ÐÒÉ ÚÂÅÒÅÖÅÎΦ ÓÔÁÎÕ ÓÅÁÎÓÕ" |
34682 |
|
34683 |
#. This is not fatal but can mean the session manager exited. |
34684 |
#. * If the session manager exited normally we would get a |
34685 |
#. * Die message, so this probably means an abnormal exit. |
34686 |
#. * If the sm was the last client of session, then we'll die |
34687 |
#. * anyway, otherwise we can continue doing our stuff. |
34688 |
#. |
34689 |
#: ../src/session.c:1244 |
34690 |
msgid "connection to the session manager was lost" |
34691 |
msgstr "×ÔÒÁÞÅÎÏ Ú'¤ÄÎÁÎÎÑ Ú ÍÅÎÅÄÖÅÒÏÍ ÓÅÁÎÓ¦×" |
34692 |
|
34693 |
#: ../src/stacking.c:79 |
34694 |
msgid "could not get window list!!" |
34695 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÏÔÒÉÍÁÔÉ ÓÐÉÓÏË ×¦ËÏÎ!!" |
34696 |
|
34697 |
#: ../src/startup.c:202 |
34698 |
#, c-format |
34699 |
msgid "internal X error: %s\n" |
34700 |
msgstr "×ÎÕÔÒ¦ÛÎÑ ÐÏÍÉÌËÁ X ÓÅÒ×ÅÒÁ: %s\n" |
34701 |
|
34702 |
#: ../src/startup.c:260 |
34703 |
#, c-format |
34704 |
msgid "got signal %i (%s) - restarting\n" |
34705 |
msgstr "ÏÔÒÉÍÁÎÏ ÓÉÇÎÁÌ %i (%s) -- ÐÅÒÅÚÁÐÕÓË\n" |
34706 |
|
34707 |
#: ../src/startup.c:262 |
34708 |
#, c-format |
34709 |
msgid "got signal %i - restarting\n" |
34710 |
msgstr "ÏÔÒÉÍÁÎÏ ÓÉÇÎÁÌ %i - ÐÅÒÅÚÁÐÕÓË\n" |
34711 |
|
34712 |
#: ../src/startup.c:272 |
34713 |
#, c-format |
34714 |
msgid "got signal %i (%s) - rereading defaults\n" |
34715 |
msgstr "ÏÔÒÉÍÁÎÏ ÓÉÇÎÁÌ %i (%s) -- ÐÅÒÅÞÉÔÕ×ÁÎÎÑ ÕÍÏ×ÞÁÎØ\n" |
34716 |
|
34717 |
#: ../src/startup.c:274 |
34718 |
#, c-format |
34719 |
msgid "got signal %i - rereading defaults\n" |
34720 |
msgstr "ÏÔÒÉÍÁÎÏ ÓÉÇÎÁÌ %i - ÐÅÒÅÞÉÔÕ×ÁÎÎÑ ÕÍÏ×ÞÁÎØ\n" |
34721 |
|
34722 |
#: ../src/startup.c:284 |
34723 |
#, c-format |
34724 |
msgid "got signal %i (%s) - exiting...\n" |
34725 |
msgstr "ÏÔÒÉÍÁÎÏ ÓÉÇÎÁÌ %i (%s) -- ÚÁ×ÅÒÛÅÎÎÑ ÒÏÂÏÔÉ...\n" |
34726 |
|
34727 |
#: ../src/startup.c:286 |
34728 |
#, c-format |
34729 |
msgid "got signal %i - exiting...\n" |
34730 |
msgstr "ÏÔÒÉÍÁÎÏ ÓÉÇÎÁÌ %i -- ÚÁ×ÅÒÛÅÎÎÑ ÒÏÂÏÔÉ...\n" |
34731 |
|
34732 |
#: ../src/startup.c:329 |
34733 |
#, c-format |
34734 |
msgid "got signal %i (%s)\n" |
34735 |
msgstr "ÏÔÒÉÍÁÎÏ ÓÉÇÎÁÌ %i (%s)\n" |
34736 |
|
34737 |
#: ../src/startup.c:331 |
34738 |
#, c-format |
34739 |
msgid "got signal %i\n" |
34740 |
msgstr "ÏÔÒÉÍÁÎÏ ÓÉÇÎÁÌ %i\n" |
34741 |
|
34742 |
#: ../src/startup.c:342 |
34743 |
msgid "" |
34744 |
"crashed while trying to do some post-crash cleanup. Aborting immediatelly." |
34745 |
msgstr "" |
34746 |
"ËÒÉÔÉÞÎÁ ÐÏÍÉÌËÁ Ð¦Ä ÞÁÓ ×¦ÄÎÏ×ÌÅÎÎÑ Ð¦ÓÌÑ ÚÂÏÀ. îåçáêîå ÚÁ×ÅÒÛÅÎÎÑ ÒÏÂÏÔÉ." |
34747 |
|
34748 |
#. we try to restart Window Maker |
34749 |
#: ../src/startup.c:406 |
34750 |
msgid "trying to restart Window Maker..." |
34751 |
msgstr "ÓÐÒÏÂÁ ÐÅÒÅÚÁÐÕÓÔÉÔÉ Window Maker..." |
34752 |
|
34753 |
#: ../src/startup.c:411 |
34754 |
msgid "trying to start alternate window manager..." |
34755 |
msgstr "ÓÐÒÏÂÁ ÚÁÐÕÓËÕ ÁÌØÔÅÒÎÁÔÉ×ÎÏÇÏ ÍÅÎÅÄÖÅÒÁ צËÏÎ..." |
34756 |
|
34757 |
#: ../src/startup.c:417 |
34758 |
msgid "failed to start alternate window manager. Aborting." |
34759 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÁÐÕÓÔÉÔÉ ÁÌØÔÅÒÎÁÔÉ×ÎÉÊ ÍÅÎÅÄÖÅÒ ×¦ËÏÎ. úÁ×ÅÒÛÅÎÎÑ." |
34760 |
|
34761 |
#: ../src/startup.c:419 |
34762 |
msgid "" |
34763 |
"a fatal error has occured, probably due to a bug. Please fill the included " |
34764 |
"BUGFORM and report it." |
34765 |
msgstr "" |
34766 |
"×ÉÎÉËÌÁ ËÒÉÔÉÞÎÁ ÐÏÍÉÌËÁ. íÏÖÌÉ×Ï, ÃÅ ÒÅÚÕÌØÔÁÔ ÐÏÍÉÌËÉ × ÐÒÏÇÒÁͦ. âÕÄØ " |
34767 |
"ÌÁÓËÁ, ÚÁÐÏ×ΦÔØ ÆÏÒÍÕ BUGFORM ¦ צÄÐÒÁ×ÔÅ Á×ÔÏÒÕ." |
34768 |
|
34769 |
#: ../src/startup.c:894 |
34770 |
#, c-format |
34771 |
msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" |
34772 |
msgstr "ÒÏÚÍ¦Ò ¦ËÏÎËÉ ×ÓÔÁÎÏ×ÌÅÎÏ × %i, ÝÏ ÎÁÄÔÏ ÍÁÌÏ. ÷ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ 16.\n" |
34773 |
|
34774 |
#: ../src/startup.c:922 |
34775 |
msgid "XKB is not supported. KbdModeLock is automatically disabled." |
34776 |
msgstr "XKB ΊЦÄÔÒÉÍÕ¤ÔØÓÑ. KbdModeLock Á×ÔÏÍÁÔÉÞÎÏ ÚÁÂÏÒÏÎÅÎÏ." |
34777 |
|
34778 |
#: ../src/startup.c:941 |
34779 |
msgid "it seems that there is already a window manager running" |
34780 |
msgstr "ÓÈÏÖÅ, ÝÏ ×ÖÅ ÐÒÁÃÀ¤ ¦ÎÛÉÊ ÍÅÎÅÄÖÅÒ ×¦ËÏÎ" |
34781 |
|
34782 |
#: ../src/startup.c:947 |
34783 |
#, c-format |
34784 |
msgid "could not manage screen %i" |
34785 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ËÅÒÕ×ÁÔÉ ÅËÒÁÎÏÍ %i" |
34786 |
|
34787 |
#: ../src/startup.c:1015 |
34788 |
msgid "could not manage any screen" |
34789 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ËÅÒÕ×ÁÔÉ ÖÏÄÎÉÍ ÅËÒÁÎÏÍ" |
34790 |
|
34791 |
#: ../src/switchmenu.c:137 |
34792 |
msgid "Windows" |
34793 |
msgstr "÷¦ËÎÁ" |
34794 |
|
34795 |
#: ../src/texture.c:329 ../src/texture.c:371 |
34796 |
#, c-format |
34797 |
msgid "image file \"%s\" used as texture could not be found." |
34798 |
msgstr "ÆÁÊÌ ÚÏÂÒÁÖÅÎÎÑ ÔÅËÓÔÕÒÉ \"%s\" ÎÅ ÚÎÁÊÄÅÎÏ." |
34799 |
|
34800 |
#: ../src/texture.c:335 ../src/texture.c:377 |
34801 |
#, c-format |
34802 |
msgid "could not load texture pixmap \"%s\":%s" |
34803 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÁ×ÁÎÔÁÖÉÔÉ ÒÁÓÔÒÏ×Å ÚÏÂÒÁÖÅÎÎÑ Ú ÔÅËÓÔÕÒÏÀ \"%s\":%s" |
34804 |
|
34805 |
#: ../src/texture.c:437 |
34806 |
#, c-format |
34807 |
msgid "library \"%s\" cound not be opened." |
34808 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ×¦ÄËÒÉÔÉ Â¦Â̦ÏÔÅËÕ \"%s\"." |
34809 |
|
34810 |
#: ../src/texture.c:446 |
34811 |
#, c-format |
34812 |
msgid "function \"%s\" not found in library \"%s\"" |
34813 |
msgstr "ÆÕÎËÃ¦Ñ \"%s\" ÎÅ ÚÎÁÊÄÅÎÁ × Â¦Â̦ÏÔÅæ \"%s\"" |
34814 |
|
34815 |
#: ../src/texture.c:453 |
34816 |
msgid "function textures not supported on this system, sorry." |
34817 |
msgstr "ÆÕÎËæÏÎÁÌØΦ ÔÅËÓÔÕÒÉ ÎŠЦÄÔÒÉÍÕÀÔØÓÑ Ã¦¤À ÓÉÓÔÅÍÏÀ." |
34818 |
|
34819 |
#: ../src/texture.c:598 |
34820 |
msgid "could not allocate image buffer" |
34821 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ×ÉĦÌÉÔÉ ÂÕÆÅÒ ÄÌÑ ÚÏÂÒÁÖÅÎÎÑ " |
34822 |
|
34823 |
#: ../src/wdefaults.c:437 |
34824 |
#, c-format |
34825 |
msgid "could not find icon file \"%s\"" |
34826 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÚÎÁÊÔÉ ÆÁÊÌ ¦ËÏÎËÉ \"%s\"" |
34827 |
|
34828 |
#: ../src/window.c:2934 ../src/window.c:3073 |
34829 |
msgid "" |
34830 |
"the NumLock, ScrollLock or similar key seems to be turned on.\n" |
34831 |
"Turn it off or some mouse actions and keyboard shortcuts will not work." |
34832 |
msgstr "" |
34833 |
"óÈÏÖÅ, ÝÏ NumLock, ScrollLock ÞÉ ÁÎÁÌÏǦÞÎÁ ËÌÁצÛÁ ÕצÍËÎÅÎÁ.\n" |
34834 |
"äÅÁËÔÉ×ÕÊÔÅ §§ ÁÂÏ Ö ÄÅÑ˦ ÏÐÅÒÁæ§ ÍÉÛÏÀ ¦ ËÏͦÎÁæ§ ËÌÁ×¦Û ÎÅ ÂÕÄÕÔØ " |
34835 |
"ÐÒÁÃÀ×ÁÔÉ." |
34836 |
|
34837 |
#: ../src/winmenu.c:126 |
34838 |
msgid "" |
34839 |
"This will kill the application.\n" |
34840 |
"Any unsaved changes will be lost.\n" |
34841 |
"Please confirm." |
34842 |
msgstr "" |
34843 |
"ãÅ ÐÒÉÍÕÓÏ×Ï ÚÁ×ÅÒÛÉÔØ ÐÒÏÇÒÁÍÕ.\n" |
34844 |
"÷Ó¦ ÎÅÚÂÅÒÅÖÅΦ ÚͦÎÉ ÂÕÄÕÔØ ×ÔÒÁÞÅΦ.\n" |
34845 |
"âÕÄØ ÌÁÓËÁ, ЦÄÔ×ÅÒĦÔØ." |
34846 |
|
34847 |
#: ../src/winmenu.c:272 ../src/winmenu.c:281 |
34848 |
msgid "Set Shortcut" |
34849 |
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ËÏͦÎÁæÀ ËÌÁצÛ" |
34850 |
|
34851 |
#: ../src/winmenu.c:359 ../src/winmenu.c:404 |
34852 |
msgid "could not create submenu for window menu" |
34853 |
msgstr "ÎÅ ×ÄÁÌÏÓØ ÓÔ×ÏÒÉÔÉ Ð¦ÄÍÅÎÀ ÄÌÑ ÍÅÎÀ צËÎÁ" |
34854 |
|
34855 |
#: ../src/winmenu.c:408 |
34856 |
msgid "Keep on top" |
34857 |
msgstr "ôÒÉÍÁÔÉ ÎÁÄ ×¦ËÎÁÍÉ" |
34858 |
|
34859 |
#: ../src/winmenu.c:413 |
34860 |
msgid "Keep at bottom" |
34861 |
msgstr "ôÒÉÍÁÔÉ Ð¦Ä ×¦ËÎÁÍÉ" |
34862 |
|
34863 |
#: ../src/winmenu.c:457 ../src/winmenu.c:600 |
34864 |
msgid "Shade" |
34865 |
msgstr "ú×ÅÒÎÕÔÉ × ÓÍÕÖËÕ" |
34866 |
|
34867 |
#: ../src/winmenu.c:473 |
34868 |
msgid "Hide Others" |
34869 |
msgstr "ðÒÉÈÏ×ÁÔÉ ¦ÎÛ¦" |
34870 |
|
34871 |
#: ../src/winmenu.c:481 |
34872 |
msgid "Resize/Move" |
34873 |
msgstr "úͦÎÉÔÉ ÒÏÚͦÒ/ÐÅÒÅͦÓÔÉÔÉ" |
34874 |
|
34875 |
#: ../src/winmenu.c:489 |
34876 |
msgid "Select" |
34877 |
msgstr "÷ÉÂÒÁÔÉ" |
34878 |
|
34879 |
#: ../src/winmenu.c:502 |
34880 |
msgid "Attributes..." |
34881 |
msgstr "áÔÒÉÂÕÔÉ..." |
34882 |
|
34883 |
#: ../src/winmenu.c:504 |
34884 |
msgid "Options" |
34885 |
msgstr "ïÐæ§" |
34886 |
|
34887 |
#: ../src/winmenu.c:595 |
34888 |
msgid "Unshade" |
34889 |
msgstr "÷ÉÔÑÇÔÉ ¦Ú ÓÍÕÖËÉ" |
34890 |
|
34891 |
#: ../src/winspector.c:387 |
34892 |
#, c-format |
34893 |
msgid "Could not find icon \"%s\" specified for this window" |
34894 |
msgstr "îÅÍÏÖÌÉ×Ï ÚÎÁÊÔÉ ¦ËÏÎËÕ \"%s\", ×ËÁÚÁÎÕ ÄÌÑ ÃØÏÇÏ ×¦ËÎÁ" |
34895 |
|
34896 |
#: ../src/winspector.c:404 |
34897 |
#, c-format |
34898 |
msgid "Could not open specified icon \"%s\":%s" |
34899 |
msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ×ËÁÚÁÎÉÊ ÆÁÊÌ ¦ËÏÎËÉ \"%s\":%s" |
34900 |
|
34901 |
#: ../src/winspector.c:1123 |
34902 |
#, c-format |
34903 |
msgid "Inspecting %s.%s" |
34904 |
msgstr "¶ÎÓÐÅËÔÕ¤ÔØÓÑ %s.%s" |
34905 |
|
34906 |
#: ../src/winspector.c:1149 |
34907 |
msgid "Click in the window you wish to inspect." |
34908 |
msgstr "îÁÔÉÓΦÔØ ÎÁ צËΦ, ÑËÅ ÈÏÞÅÔÅ ÐÒϦÎÓÐÅËÔÕ×ÁÔÉ." |
34909 |
|
34910 |
#: ../src/winspector.c:1188 |
34911 |
msgid "" |
34912 |
"The configuration will apply to all\n" |
34913 |
"windows that have their WM_CLASS\n" |
34914 |
"property set to the above selected\n" |
34915 |
"name, when saved." |
34916 |
msgstr "" |
34917 |
"ðÒÉ ÚÂÅÒÅÖÅÎΦ ËÏÎƦÇÕÒÁÃ¦Ñ ÂÕÄÅ ÚÁÓÔÏÓÏ×ÁÎÁ\n" |
34918 |
"ÄÏ ×Ó¦È ×¦ËÏÎ, Õ ÑËÉÈ WM_CLASS ×ÓÔÁÎÏ×ÌÅÎÏ Õ\n" |
34919 |
"×ÉÂÒÁÎÅ ÚÎÁÞÅÎÎÑ." |
34920 |
|
34921 |
#: ../src/winspector.c:1217 |
34922 |
msgid "Save" |
34923 |
msgstr "úÂÅÒÅÇÔÉ" |
34924 |
|
34925 |
#: ../src/winspector.c:1225 |
34926 |
msgid "Apply" |
34927 |
msgstr "úÁÓÔÏÓÕ×ÁÔÉ" |
34928 |
|
34929 |
#: ../src/winspector.c:1231 |
34930 |
msgid "Reload" |
34931 |
msgstr "ðÅÒÅÞÉÔÁÔÉ" |
34932 |
|
34933 |
#: ../src/winspector.c:1240 ../src/winspector.c:1250 |
34934 |
msgid "Window Specification" |
34935 |
msgstr "óÐÅÃÉƦËÁÃ¦Ñ ×¦ËÎÁ" |
34936 |
|
34937 |
#: ../src/winspector.c:1241 |
34938 |
msgid "Window Attributes" |
34939 |
msgstr "áÔÒÉÂÕÔÉ ×¦ËÎÁ" |
34940 |
|
34941 |
#: ../src/winspector.c:1242 |
34942 |
msgid "Advanced Options" |
34943 |
msgstr "äÏÄÁÔËÏצ ÏÐæ§" |
34944 |
|
34945 |
#: ../src/winspector.c:1243 |
34946 |
msgid "Icon and Initial Workspace" |
34947 |
msgstr "¶ËÏÎËÁ ¦ ÐÏÞÁÔËÏ×ÉÊ ÓÔ¦Ì" |
34948 |
|
34949 |
#: ../src/winspector.c:1244 |
34950 |
msgid "Application Specific" |
34951 |
msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦ ÐÒÏÇÒÁÍÉ" |
34952 |
|
34953 |
#: ../src/winspector.c:1258 |
34954 |
msgid "Defaults for all windows" |
34955 |
msgstr "õÍÏ×ÞÁÎÎÑ ÄÌÑ ×Ó¦È ×¦ËÏÎ" |
34956 |
|
34957 |
#: ../src/winspector.c:1312 |
34958 |
msgid "Select window" |
34959 |
msgstr "÷ÉÂÅÒ¦ÔØ ×¦ËÎÏ" |
34960 |
|
34961 |
#: ../src/winspector.c:1326 |
34962 |
msgid "Attributes" |
34963 |
msgstr "áÔÒÉÂÕÔÉ" |
34964 |
|
34965 |
#: ../src/winspector.c:1337 |
34966 |
msgid "Disable titlebar" |
34967 |
msgstr "ðÒÉÂÒÁÔÉ ÛÁÐËÕ ×¦ËÎÁ" |
34968 |
|
34969 |
#: ../src/winspector.c:1339 |
34970 |
msgid "" |
34971 |
"Remove the titlebar of this window.\n" |
34972 |
"To access the window commands menu of a window\n" |
34973 |
"without it's titlebar, press Control+Esc (or the\n" |
34974 |
"equivalent shortcut, if you changed the default\n" |
34975 |
"settings)." |
34976 |
msgstr "" |
34977 |
"ðÒÉÂÒÁÔÉ ÓÍÕÖËÕ ÚÁÇÏÌÏ×ËÁ ÃØÏÇÏ ×¦ËÎÁ.\n" |
34978 |
"äÌÑ ÄÏÓÔÕÐÕ ÄÏ ÍÅÎÀ ËÏÍÁÎÄ ×¦ËÎÁ ÐÒÉ ×¦ÄÓÕÔÎÏÓÔ¦\n" |
34979 |
"ÊÏÇÏ ÛÁÐËÉ, ÎÁÔÉÓΦÔØ Control+Esc (ÞÉ ÅËצ×ÁÌÅÎÔÎÕ\n" |
34980 |
"ËÏͦÎÁæÀ, ÑËÝÏ ÷É ÚͦÎÉÌÉ ÕÓÔÁÎÏ×ËÉ ÚÁ\n" |
34981 |
"ÕÍÏ×ÞÁÎÎÑÍ)." |
34982 |
|
34983 |
#: ../src/winspector.c:1346 |
34984 |
msgid "Disable resizebar" |
34985 |
msgstr "ðÒÉÂÒÁÔÉ ÓÍÕÖËÕ ÚͦÎÉ ÒÏÚͦÒÕ" |
34986 |
|
34987 |
#: ../src/winspector.c:1348 |
34988 |
msgid "Remove the resizebar of this window." |
34989 |
msgstr "ðÒÉÂÒÁÔÉ ÓÍÕÖËÕ ÚͦÎÉ ÒÏÚͦÒÕ ÃØÏÇÏ ×¦ËÎÁ." |
34990 |
|
34991 |
#: ../src/winspector.c:1351 |
34992 |
msgid "Disable close button" |
34993 |
msgstr "ðÒÉÂÒÁÔÉ ËÎÏÐËÕ ÚÁËÒÉÔÔÑ" |
34994 |
|
34995 |
#: ../src/winspector.c:1353 |
34996 |
msgid "Remove the `close window' button of this window." |
34997 |
msgstr "ðÒÉÂÒÁÔÉ ËÎÏÐËÕ ÚÁËÒÉÔÔÑ ÄÌÑ ÃØÏÇÏ ×¦ËÎÁ." |
34998 |
|
34999 |
#: ../src/winspector.c:1356 |
35000 |
msgid "Disable miniaturize button" |
35001 |
msgstr "ðÒÉÂÒÁÔÉ ËÎÏÐËÕ Í¦Î¦Í¦ÚÁæ§" |
35002 |
|
35003 |
#: ../src/winspector.c:1358 |
35004 |
msgid "Remove the `miniaturize window' button of the window." |
35005 |
msgstr "ðÒÉÂÒÁÔÉ ËÎÏÐËÕ Í¦Î¦Í¦ÚÁæ§ ÄÌÑ ÃØÏÇÏ ×¦ËÎÁ." |
35006 |
|
35007 |
#: ../src/winspector.c:1361 |
35008 |
msgid "Disable border" |
35009 |
msgstr "ðÒÉÂÒÁÔÉ ÂÏÒÄÀÒ ×¦ËÎÁ" |
35010 |
|
35011 |
#: ../src/winspector.c:1363 |
35012 |
msgid "Remove the 1 pixel black border around the window." |
35013 |
msgstr "ðÒÉÂÒÁÔÉ 1-ЦËÓÅÌØÎÉÊ ÞÏÒÎÉÊ ÂÏÒÄÀÒ ÎÁ×ËÏÌÏ ×¦ËÎÁ." |
35014 |
|
35015 |
#: ../src/winspector.c:1366 |
35016 |
msgid "Keep on top (floating)" |
35017 |
msgstr "úÁ×ÖÄÉ Ú×ÅÒÈÕ (ÐÌÁ×ÁÀÞÅ)" |
35018 |
|
35019 |
#: ../src/winspector.c:1368 |
35020 |
msgid "" |
35021 |
"Keep the window over other windows, not allowing\n" |
35022 |
"them to cover it." |
35023 |
msgstr "" |
35024 |
"õÔÒÉÍÕ×ÁÔÉ ×¦ËÎÏ ÐÏ×ÅÒÈ ¦ÎÛÉÈ ×¦ËÏÎ, ÎÅ ÄÏÚ×ÏÌÑÀÞÉ\n" |
35025 |
"§Í ÐÏËÒÉ×ÁÔÉ ÃŠצËÎÏ." |
35026 |
|
35027 |
#: ../src/winspector.c:1372 |
35028 |
msgid "Keep at bottom (sunken)" |
35029 |
msgstr "úÁ×ÖÄÉ ÚÎÉÚÕ (×ÔÏÐÌÅÎÅ)" |
35030 |
|
35031 |
#: ../src/winspector.c:1374 |
35032 |
msgid "Keep the window under all other windows." |
35033 |
msgstr "õÔÒÉÍÕ×ÁÔÉ ×¦ËÎÏ ÐÏËÒÉÔÉÍ ¦ÎÛÉÍÉ ÐÅÒÅËÒÉ×ÁÀÞÉÍÉ ×¦ËÎÁÍÉ." |
35034 |
|
35035 |
#: ../src/winspector.c:1379 |
35036 |
msgid "Make window present in all workspaces." |
35037 |
msgstr "úÒÏÂÉÔÉ ×¦ËÎÏ ÐÒÉÓÕÔÎ¦Í ÎÁ ×Ó¦È ÒÏÂÏÞÉÈ ÓÔÏÌÁÈ." |
35038 |
|
35039 |
#: ../src/winspector.c:1382 |
35040 |
msgid "Start miniaturized" |
35041 |
msgstr "úÁÐÕÓË Í¦Î¦Í¦ÚÏ×ÁÎÉÍ" |
35042 |
|
35043 |
#: ../src/winspector.c:1384 |
35044 |
msgid "" |
35045 |
"Make the window be automatically miniaturized when it's\n" |
35046 |
"first shown." |
35047 |
msgstr "" |
35048 |
"úÒÏÂÉÔÉ ×¦ËÎÏ Á×ÔÏÍÁÔÉÞÎÏ Í¦Î¦Í¦ÚÕÀÞÉÍÓÑ ÐÒÉ\n" |
35049 |
"ÐÏÞÁÔËÏ×ÏÍÕ ÒÏÚͦÝÅÎΦ." |
35050 |
|
35051 |
#: ../src/winspector.c:1388 |
35052 |
msgid "Start maximized" |
35053 |
msgstr "úÁÐÕÓË ÍÁËÓÉͦÚÏ×ÁÎÉÍ" |
35054 |
|
35055 |
#: ../src/winspector.c:1390 |
35056 |
msgid "" |
35057 |
"Make the window be automatically maximized when it's\n" |
35058 |
"first shown." |
35059 |
msgstr "" |
35060 |
"úÒÏÂÉÔÉ ×¦ËÎÏ Á×ÔÏÍÁÔÉÞÎÏ ÍÁËÓÉͦÚÕÀÞÉÍÓÑ ÐÒÉ\n" |
35061 |
"ÐÏÞÁÔËÏ×ÏÍÕ ÒÏÚͦÝÅÎΦ." |
35062 |
|
35063 |
#: ../src/winspector.c:1394 |
35064 |
msgid "Full screen maximization" |
35065 |
msgstr "íÁËÓÉͦÚÕ×ÁÔÉ ÎÁ ×ÅÓØ ÜËÒÁÎ" |
35066 |
|
35067 |
#: ../src/winspector.c:1396 |
35068 |
msgid "" |
35069 |
"Make the window use the whole screen space when it's\n" |
35070 |
"maximized. The titlebar and resizebar will be moved\n" |
35071 |
"to outside the screen." |
35072 |
msgstr "" |
35073 |
"úÒÏÂÉÔÉ ÃŠצËÎÏ ÚÁÊÍÁÀÞÉÍ Õ×ÅÓØ ÐÒÏÓÔ¦Ò ÅËÒÁÎÕ ÐÒÉ\n" |
35074 |
"ÍÁËÓÉͦÚÁæ§. óÍÕÖËÉ ÚÁÇÏÌÏ×ËÕ ¦ ÚͦÎÉ ÒÏÚͦÒÕ ÂÕÄÕÔØ\n" |
35075 |
"ÚͦÝÅΦ ÚÁ ÍÅÖ¦ ÅËÒÁÎÕ." |
35076 |
|
35077 |
#: ../src/winspector.c:1413 |
35078 |
msgid "Advanced" |
35079 |
msgstr "äÏÄÁÔËÏ×Ï" |
35080 |
|
35081 |
#: ../src/winspector.c:1430 |
35082 |
msgid "Do not bind keyboard shortcuts" |
35083 |
msgstr "îÅ ÐÒÉ×'ÑÚÕ×ÁÔÉ ËÏͦÎÁæ§ ËÌÁצÛ" |
35084 |
|
35085 |
#: ../src/winspector.c:1432 |
35086 |
msgid "" |
35087 |
"Do not bind keyboard shortcuts from Window Maker\n" |
35088 |
"when this window is focused. This will allow the\n" |
35089 |
"window to receive all key combinations regardless\n" |
35090 |
"of your shortcut configuration." |
35091 |
msgstr "" |
35092 |
"îÅ ÐÒÉ×'ÑÚÕ×ÁÔÉ ËÏͦÎÁæ§ ËÌÁ×¦Û Window Maker'Á\n" |
35093 |
"ÐÒÉ ÏÔÒÉÍÁÎΦ ÃÉÍ ×¦ËÎÏÍ ÆÏËÕÓÕ ××ÏÄÕ. ãÅ ÄÏÚ×ÏÌÉÔØ\n" |
35094 |
"צËÎÕ ÏÔÒÉÍÕ×ÁÔÉ ×Ó¦ ËÏͦÎÁæ§ ËÌÁצÛ, ÎÅÚÁÌÅÖÎÏ\n" |
35095 |
"×¦Ä ËÏÎƦÇÕÒÁæ§ §È ÐÒÉ×'ÑÚËÉ." |
35096 |
|
35097 |
#: ../src/winspector.c:1438 |
35098 |
msgid "Do not bind mouse clicks" |
35099 |
msgstr "îÅ ÐÒÉ×'ÑÚÕ×ÁÔÉ ÎÁÔÉÓËÁÎÎÑ ÍÉÛ¦" |
35100 |
|
35101 |
#: ../src/winspector.c:1440 |
35102 |
msgid "" |
35103 |
"Do not bind mouse actions, such as `Alt'+drag\n" |
35104 |
"in the window (when alt is the modifier you haveconfigured)." |
35105 |
msgstr "" |
35106 |
"îÅ ÐÒÉ×'ÑÚÕ×ÁÔÉ Ä¦§ ÍÉÛ¦, ÔÁ˦ ÑË `Alt'+ÂÕËÓÉÒÕ×ÁÎÎÑ\n" |
35107 |
"Õ ×¦ËΦ (ÐÒÉ ×ÓÔÁÎÏ×ÌÅÎÏÍÕ ÍÏÄÉƦËÁÔÏÒ¦ `Alt')." |
35108 |
|
35109 |
#: ../src/winspector.c:1445 |
35110 |
msgid "Do not show in the window list" |
35111 |
msgstr "îÅ ÐÏËÁÚÕ×ÁÔÉ ×¦ËÎÏ × ÓÐÉÓËÕ ×¦ËÏÎ." |
35112 |
|
35113 |
#: ../src/winspector.c:1447 |
35114 |
msgid "Do not list the window in the window list menu." |
35115 |
msgstr "îÅ ÐÏËÁÚÕ×ÁÔÉ ÃŠצËÎÏ × ÍÅÎÀ ÓÐÉÓËÕ ×¦ËÏÎ." |
35116 |
|
35117 |
#: ../src/winspector.c:1450 |
35118 |
msgid "Do not let it take focus" |
35119 |
msgstr "îÅ ÐÅÒÅÄÁ×ÁÔÉ ÆÏËÕÓ ××ÏÄÕ" |
35120 |
|
35121 |
#: ../src/winspector.c:1452 |
35122 |
msgid "" |
35123 |
"Do not let the window take keyboard focus when you\n" |
35124 |
"click on it." |
35125 |
msgstr "" |
35126 |
"îÅ ÄÁ×ÁÔÉ ×¦ËÎÕ ÏÔÒÉÍÕ×ÁÔÉ ÆÏËÕÓ ××ÏÄÕ Ú ËÌÁצÁÔÕÒÉ\n" |
35127 |
"ÐÒÉ ÎÁÔÉÓËÁÎΦ ÎÁ ÎØÏÍÕ ÍÉÛÏÀ." |
35128 |
|
35129 |
#: ../src/winspector.c:1456 |
35130 |
msgid "Keep inside screen" |
35131 |
msgstr "úÁ×ÖÄÉ ÕÓÅÒÅÄÉΦ ÅËÒÁÎÕ" |
35132 |
|
35133 |
#: ../src/winspector.c:1458 |
35134 |
msgid "" |
35135 |
"Do not allow the window to move itself completely\n" |
35136 |
"outside the screen. For bug compatibility.\n" |
35137 |
msgstr "" |
35138 |
"îÅ ÄÏÚ×ÏÌÑÔÉ ×¦ËÎÕ ÐÏ×ΦÓÔÀ ÐÅÒÅͦÓÔÉÔÉÓÑ\n" |
35139 |
"ÚÁ ÍÅÖ¦ ÅËÒÁÎÕ.\n" |
35140 |
|
35141 |
#: ../src/winspector.c:1462 |
35142 |
msgid "Ignore 'Hide Others'" |
35143 |
msgstr "¶ÇÎÏÒÕ×ÁÔÉ 'ðÒÉÈÏ×ÁÔÉ ¦ÎÛ¦'" |
35144 |
|
35145 |
#: ../src/winspector.c:1464 |
35146 |
msgid "" |
35147 |
"Do not hide the window when issuing the\n" |
35148 |
"`HideOthers' command." |
35149 |
msgstr "" |
35150 |
"îÅ ÐÒÉÈÏ×Õ×ÁÔÉ ÃŠצËÎÏ ÐÒÉ ×ÉËÏÎÁÎΦ\n" |
35151 |
"ËÏÍÁÎÄÉ `ðÒÉÈÏ×ÁÔÉ ¦ÎÛ¦'." |
35152 |
|
35153 |
#: ../src/winspector.c:1468 |
35154 |
msgid "Ignore 'Save Session'" |
35155 |
msgstr "¶ÇÎÏÒÕ×ÁÔÉ 'úÂÅÒÅÇÔÉ ÓÅÁÎÓ'" |
35156 |
|
35157 |
#: ../src/winspector.c:1470 |
35158 |
msgid "" |
35159 |
"Do not save the associated application in the\n" |
35160 |
"session's state, so that it won't be restarted\n" |
35161 |
"together with other applications when Window Maker\n" |
35162 |
"starts." |
35163 |
msgstr "" |
35164 |
"îÅ ÚÂÅÒ¦ÇÁÔÉ ÁÓÏæÊÏ×ÁÎÕ ÐÒÏÇÒÁÍÕ ×\n" |
35165 |
"ÓÔÁΦ ÓÅÁÎÓÕ, ÔÁË ÝÏ ×ÏÎÁ ÎÅ ÂÕÄÅ\n" |
35166 |
"ÐÅÒÅÚÁÐÕÝÅÎÁ ÒÁÚÏÍ Ú ¦ÎÛÉÍÉ ÐÒÏÇÒÁÍÁÍÉ\n" |
35167 |
"ÐÒÉ ÚÁÐÕÓËÕ Window Maker'Á." |
35168 |
|
35169 |
# |
35170 |
#: ../src/winspector.c:1476 |
35171 |
msgid "Emulate application icon" |
35172 |
msgstr "åÍÕÌÀ×ÁÔÉ ¦ËÏÎËÕ ÐÒÏÇÒÁÍÉ" |
35173 |
|
35174 |
#: ../src/winspector.c:1478 |
35175 |
msgid "" |
35176 |
"Make this window act as an application that provides\n" |
35177 |
"enough information to Window Maker for a dockable\n" |
35178 |
"application icon to be created." |
35179 |
msgstr "" |
35180 |
"úÒÏÂÉÔÉ ÃŠצËÎÏ ×ÅÄÕÞÉÍ ÓÅÂÅ ÑË ÐÒÏÇÒÁÍÁ, ÝÏ\n" |
35181 |
"ÎÁÄÁ¤ ÄÏÓÔÁÔÎØÏ ¦ÎÆÏÒÍÁæ§ Window Maker'Õ ÄÌÑ\n" |
35182 |
"ÓÔ×ÏÒÅÎÎÑ ¦ËÏÎËÉ ÐÒÏÇÒÁÍÉ, ÑËÁ ÚÁÎÏÓÉÔØÓÑ × äÏË." |
35183 |
|
35184 |
#: ../src/winspector.c:1484 |
35185 |
msgid "Disable language button" |
35186 |
msgstr "ðÒÉÂÒÁÔÉ ËÎÏÐËÕ ÍÏ×É" |
35187 |
|
35188 |
#: ../src/winspector.c:1486 |
35189 |
msgid "Remove the `toggle language' button of the window." |
35190 |
msgstr "ðÒÉÂÒÁÔÉ ËÎÏÐËÕ ÐÅÒÅÍÉËÁÎÎÑ ÍÏ×É ËÌÁצÁÔÕÒÉ ÄÌÑ ×¦ËÎÁ." |
35191 |
|
35192 |
#: ../src/winspector.c:1503 |
35193 |
msgid "Miniwindow Image" |
35194 |
msgstr "í¦Î¦ÁÔÀÒÎÅ úÏÂÒÁÖÅÎÎÑ" |
35195 |
|
35196 |
#: ../src/winspector.c:1530 |
35197 |
msgid "Icon filename:" |
35198 |
msgstr "¶Í'Ñ ÆÁÊÌÕ ¦ËÏÎËÉ:" |
35199 |
|
35200 |
#: ../src/winspector.c:1543 |
35201 |
msgid "Ignore client supplied icon" |
35202 |
msgstr "¶ÇÎÏÒÕ×ÁÔÉ ¦ËÏÎËÕ Ë̦¤ÎÔÁ" |
35203 |
|
35204 |
#: ../src/winspector.c:1550 |
35205 |
msgid "Initial Workspace" |
35206 |
msgstr "ðÏÞÁÔËÏ×ÉÊ òÏÂÏÞÉÊ ÓÔ¦Ì" |
35207 |
|
35208 |
#: ../src/winspector.c:1552 |
35209 |
msgid "The workspace to place the window when it'sfirst shown." |
35210 |
msgstr "òÏÂÏÞÉÊ ÓÔ¦Ì, ËÕÄÉ ÐÏͦÓÔÉÔÉ ×¦ËÎÏ ÐÒÉ ÐÏÞÁÔËÏ×¦Ê ÊÏÇÏ ÐÏÑצ." |
35211 |
|
35212 |
#: ../src/winspector.c:1558 |
35213 |
msgid "Nowhere in particular" |
35214 |
msgstr "îÅ ÚÁÄÁ¤ÔØÓÑ" |
35215 |
|
35216 |
#: ../src/winspector.c:1576 |
35217 |
msgid "Application Attributes" |
35218 |
msgstr "÷¦ÄÎÏÓÉÔØÓÑ ÄÏ ÐÒÏÇÒÁÍÉ" |
35219 |
|
35220 |
#: ../src/winspector.c:1587 |
35221 |
msgid "Start hidden" |
35222 |
msgstr "úÁÐÕÓËÁÔÉ ÐÒÉÈÏ×ÁÎÏÀ" |
35223 |
|
35224 |
#: ../src/winspector.c:1589 |
35225 |
msgid "Automatically hide application when it's started." |
35226 |
msgstr "á×ÔÏÍÁÔÉÞÎÏ ÐÒÉÈÏ×Õ×ÁÔÉ ÐÒÏÇÒÁÍÕ ÐÒÉ §§ ÚÁÐÕÓËÕ." |
35227 |
|
35228 |
#: ../src/winspector.c:1592 |
35229 |
msgid "No application icon" |
35230 |
msgstr "îÅ ÐÏËÁÚÕ×ÁÔÉ ¦ËÏÎËÕ" |
35231 |
|
35232 |
#: ../src/winspector.c:1594 |
35233 |
msgid "" |
35234 |
"Disable the application icon for the application.\n" |
35235 |
"Note that you won't be able to dock it anymore,\n" |
35236 |
"and any icons that are already docked will stop\n" |
35237 |
"working correctly." |
35238 |
msgstr "" |
35239 |
"úÁÂÏÒÏÎÉÔÉ ¦ËÏÎËÕ ÐÒÏÇÒÁÍÉ ÄÌÑ Ã¦¤§ ÐÒÏÇÒÁÍÉ.\n" |
35240 |
"õ×ÁÇÁ: ×É ÎÅ ÚÍÏÖÅÔŠЦÓÌÑ ÃØÏÇÏ ÐÏͦÓÔÉÔÉ §§ × äÏË,\n" |
35241 |
"¦ ×Ó¦ §§ ¦ËÏÎËÉ, ÝÏ ×ÖÅ × ÎØÏÍÕ ÚÎÁÈÏÄÑÔØÓÑ, ÐÒÉÐÉÎÑÔØ\n" |
35242 |
"ËÏÒÅËÔÎÏ ÐÒÁÃÀ×ÁÔÉ." |
35243 |
|
35244 |
# |
35245 |
#: ../src/winspector.c:1600 |
35246 |
msgid "Shared application icon" |
35247 |
msgstr "óЦÌØÎÁ ¦ËÏÎËÁ ÐÒÏÇÒÁÍÉ" |
35248 |
|
35249 |
#: ../src/winspector.c:1602 |
35250 |
msgid "" |
35251 |
"Use a single shared application icon for all of\n" |
35252 |
"the instances of this application.\n" |
35253 |
msgstr "" |
35254 |
"÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ¤ÄÉÎÕ ÓЦÌØÎÕ ¦ËÏÎËÕ ÐÒÏÇÒÁÍÉ ÄÌÑ\n" |
35255 |
"×Ó¦È ÅËÚÅÍÐÌÑÒ¦× Ã¦¤§ ÐÒÏÇÒÁÍÉ.\n" |
35256 |
|
35257 |
#: ../src/wmspec.c:277 |
35258 |
msgid "out of memory while updating wm hints" |
35259 |
msgstr "×ÉÞÅÒÐÁÎÁ ÐÁÍ'ÑÔØ ÐÒÉ ÏÎÏ×ÌÅÎΦ wm hints" |
35260 |
|
35261 |
#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:893 |
35262 |
#, c-format |
35263 |
msgid "Workspace %i" |
35264 |
msgstr "òÏÂÏÞÉÊ ÓÔ¦Ì %i" |
35265 |
|
35266 |
#: ../src/workspace.c:943 |
35267 |
msgid "Workspaces" |
35268 |
msgstr "òÏÂÏÞ¦ ÓÔÏÌÉ" |
35269 |
|
35270 |
#: ../src/workspace.c:945 |
35271 |
msgid "could not create Workspace menu" |
35272 |
msgstr "ÎÅ ×ÄÁ¤ÔØÓÑ ÓÔ×ÏÒÉÔÉ ÍÅÎÀ òÏÂÏÞÉÈ ÓÔÏ̦×" |
35273 |
|
35274 |
#: ../src/workspace.c:952 |
35275 |
msgid "New" |
35276 |
msgstr "óÔ×ÏÒÉÔÉ" |
35277 |
|
35278 |
#: ../src/workspace.c:953 |
35279 |
msgid "Destroy Last" |
35280 |
msgstr "úÎÉÝÉÔÉ ÏÓÔÁÎΦÊ" |